Add excluded_regions to datadog_integration_aws

datadog/resource_datadog_integration_aws.go

@@ -55,6 +55,11 @@ func resourceDatadogIntegrationAws() *schema.Resource {
 				Optional: true,
 				Elem:     schema.TypeBool,
 			},
+			"excluded_regions": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"external_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -92,7 +97,6 @@ func buildDatadogIntegrationAwsStruct(d *schema.ResourceData, accountID string,
 	iaws.SetRoleName(roleName)
 
 	filterTags := make([]string, 0)
-
 	if attr, ok := d.GetOk("filter_tags"); ok {
 		for _, s := range attr.([]interface{}) {
 			filterTags = append(filterTags, s.(string))
@@ -101,7 +105,6 @@ func buildDatadogIntegrationAwsStruct(d *schema.ResourceData, accountID string,
 	}
 
 	hostTags := make([]string, 0)
-
 	if attr, ok := d.GetOk("host_tags"); ok {
 		for _, s := range attr.([]interface{}) {
 			hostTags = append(hostTags, s.(string))
@@ -110,7 +113,6 @@ func buildDatadogIntegrationAwsStruct(d *schema.ResourceData, accountID string,
 	}
 
 	accountSpecificNamespaceRules := make(map[string]bool)
-
 	if attr, ok := d.GetOk("account_specific_namespace_rules"); ok {
 		// TODO: this is not very defensive, test if we can fail on non bool input
 		for k, v := range attr.(map[string]interface{}) {
@@ -119,6 +121,14 @@ func buildDatadogIntegrationAwsStruct(d *schema.ResourceData, accountID string,
 		iaws.SetAccountSpecificNamespaceRules(accountSpecificNamespaceRules)
 	}
 
+	excludedRegions := make([]string, 0)
+	if attr, ok := d.GetOk("excluded_regions"); ok {
+		for _, s := range attr.([]interface{}) {
+			excludedRegions = append(excludedRegions, s.(string))
+		}
+		iaws.SetExcludedRegions(excludedRegions)
+	}
+
 	return iaws
 }
 
@@ -166,7 +176,8 @@ func resourceDatadogIntegrationAwsRead(d *schema.ResourceData, meta interface{})
 			d.Set("role_name", integration.GetRoleName())
 			d.Set("filter_tags", integration.GetFilterTags())
 			d.Set("host_tags", integration.GetHostTags())
-			d.Set("account_specific_namespace_rules", integration.AccountSpecificNamespaceRules)
+			d.Set("account_specific_namespace_rules", integration.GetAccountSpecificNamespaceRules())
+			d.Set("excluded_regions", integration.GetExcludedRegions())
 			return nil
 		}
 	}

datadog/resource_datadog_integration_aws_test.go

@@ -44,21 +44,22 @@ func TestAccountAndRoleFromID(t *testing.T) {
 
 const testAccDatadogIntegrationAWSConfig = `
 resource "datadog_integration_aws" "account" {
-  account_id                       = "001234567888"
-  role_name                        = "testacc-datadog-integration-role"
+  	account_id                       = "001234567888"
+  	role_name                        = "testacc-datadog-integration-role"
 }
 `
 
 const testAccDatadogIntegrationAWSUpdateConfig = `
 resource "datadog_integration_aws" "account" {
-  account_id                       = "001234567889"
-  role_name                        = "testacc-datadog-integration-role"
-  filter_tags                      = ["key:value"]
-  host_tags                        = ["key:value", "key2:value2"]
-  account_specific_namespace_rules = {
-    auto_scaling = false
-    opsworks = true
-  }
+  	account_id                       = "001234567889"
+  	role_name                        = "testacc-datadog-integration-role"
+	filter_tags                      = ["key:value"]
+  	host_tags                        = ["key:value", "key2:value2"]
+  	account_specific_namespace_rules = {
+    	auto_scaling = false
+    	opsworks = true
+  	}
+  	excluded_regions                 = ["us-east-1", "us-west-2"]
 }
 `
 
@@ -108,6 +109,12 @@ func TestAccDatadogIntegrationAWS(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"datadog_integration_aws.account",
 						"account_specific_namespace_rules.opsworks", "true"),
+					resource.TestCheckResourceAttr(
+						"datadog_integration_aws.account",
+						"excluded_regions.0", "us-east-1"),
+					resource.TestCheckResourceAttr(
+						"datadog_integration_aws.account",
+						"excluded_regions.1", "us-west-2"),
 				),
 			},
 		},

website/docs/r/integration_aws.html.markdown

@@ -23,6 +23,7 @@ resource "datadog_integration_aws" "sandbox" {
         auto_scaling = false
         opsworks = false
     }
+    excluded_regions = ["us-east-1", "us-west-2"]
 }
 ```
 
@@ -40,6 +41,7 @@ The following arguments are supported:
 
 * `host_tags` - (Optional) Array of tags (in the form key:value) to add to all hosts and metrics reporting through this integration.
 * `account_specific_namespace_rules` - (Optional) Enables or disables metric collection for specific AWS namespaces for this AWS account only. A list of namespaces can be found at the [available namespace rules API endpoint](https://docs.datadoghq.com/api/v1/aws-integration/#list-namespace-rules).
+* `excluded_regions` - (Optional) An array of AWS regions to exclude from metrics collection.
 
 ### See also
 * [Datadog API Reference > Integrations > AWS](https://docs.datadoghq.com/api/v1/aws-integration/)