feat(cloud): added AWS AutoDiscovery Slug for configure-integration API (#2898)

Co-authored-by: pchawla-NR <[email protected]>

Author: vinay-newrelic

examples/modules/cloud-integrations/aws/main.tf

@@ -262,6 +262,7 @@ resource "newrelic_cloud_aws_integrations" "newrelic_cloud_integration_pull" {
   aws_transit_gateway {}
   aws_waf {}
   aws_wafv2 {}
+  aws_auto_discovery {}
   cloudfront {}
   dynamodb {}
   ec2 {}

newrelic/resource_newrelic_cloud_aws_integrations.go

@@ -262,6 +262,13 @@ func resourceNewRelicCloudAwsIntegrations() *schema.Resource {
 				Elem:        cloudAwsIntegrationCommonSchemaElem(),
 				MaxItems:    1,
 			},
+			"aws_auto_discovery": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "Aws Auto Discovery Integration",
+				Elem:        cloudAwsIntegrationCommonSchemaElem(),
+				MaxItems:    1,
+			},
 			"cloudfront": {
 				Type:        schema.TypeList,
 				Optional:    true,

newrelic/resource_newrelic_cloud_aws_integrations_test.go

@@ -710,6 +710,10 @@ func testAccNewRelicAwsIntegrationsConfigUpdated(AWSIntegrationsTestConfig map[s
 		  fetch_extended_inventory = true
 		  metrics_polling_interval = 6000
 		}
+		aws_auto_discovery {
+			aws_regions              = ["us-east-1"]
+			metrics_polling_interval = 6000
+		}
 	  }
 `)
 }

newrelic/structures_newrelic_cloud_aws_integrations.go

@@ -281,6 +281,14 @@ func expandCloudAwsIntegrationsInput(d *schema.ResourceData) (cloud.CloudIntegra
 				cloudDisableAwsIntegration.AwsWafv2 = []cloud.CloudDisableAccountIntegrationInput{{LinkedAccountId: id}}
 			},
 		},
+		"aws_auto_discovery": {
+			enableFunc: func(a []interface{}, id int) {
+				cloudAwsIntegration.AwsAutoDiscovery = expandCloudAwsIntegrationAutoDiscoveryInput(a, id)
+			},
+			disableFunc: func(id int) {
+				cloudDisableAwsIntegration.AwsAutoDiscovery = []cloud.CloudDisableAccountIntegrationInput{{LinkedAccountId: id}}
+			},
+		},
 		"cloudfront": {
 			enableFunc: func(a []interface{}, id int) {
 				cloudAwsIntegration.Cloudfront = expandCloudAwsIntegrationCloudfrontInput(a, id)
@@ -529,6 +537,8 @@ func flattenCloudAwsLinkedAccount(d *schema.ResourceData, linkedAccount *cloud.C
 			_ = d.Set("aws_waf", flattenCloudAwsWafIntegration(t))
 		case *cloud.CloudAwsWafv2Integration:
 			_ = d.Set("aws_wafv2", flattenCloudAwsWafv2Integration(t))
+		case *cloud.CloudAwsAutoDiscoveryIntegration:
+			_ = d.Set("aws_auto_discovery", flattenCloudAwsAutoDiscoveryIntegration(t))
 		case *cloud.CloudCloudfrontIntegration:
 			_ = d.Set("cloudfront", flattenCloudCloudfrontIntegration(t))
 		case *cloud.CloudDynamodbIntegration:
@@ -715,6 +725,10 @@ func buildDeleteInput(d *schema.ResourceData) cloud.CloudDisableIntegrationsInpu
 		cloudDisableAwsIntegration.AwsWafv2 = []cloud.CloudDisableAccountIntegrationInput{{LinkedAccountId: linkedAccountID}}
 	}
 
+	if _, ok := d.GetOk("aws_auto_discovery"); ok {
+		cloudDisableAwsIntegration.AwsAutoDiscovery = []cloud.CloudDisableAccountIntegrationInput{{LinkedAccountId: linkedAccountID}}
+	}
+
 	if _, ok := d.GetOk("cloudfront"); ok {
 		cloudDisableAwsIntegration.Cloudfront = []cloud.CloudDisableAccountIntegrationInput{{LinkedAccountId: linkedAccountID}}
 	}
@@ -2990,6 +3004,43 @@ func expandCloudAwsIntegrationSnsInput(b []interface{}, linkedAccountID int) []c
 	return expanded
 }
 
+// Expanding the Aws Auto Discovery input
+
+func expandCloudAwsIntegrationAutoDiscoveryInput(b []interface{}, linkedAccountID int) []cloud.CloudAwsAutoDiscoveryIntegrationInput {
+	expanded := make([]cloud.CloudAwsAutoDiscoveryIntegrationInput, len(b))
+
+	for i, iot := range b {
+		var autoDiscoveryInput cloud.CloudAwsAutoDiscoveryIntegrationInput
+
+		if iot == nil {
+			autoDiscoveryInput.LinkedAccountId = linkedAccountID
+			expanded[i] = autoDiscoveryInput
+			return expanded
+		}
+
+		in := iot.(map[string]interface{})
+
+		autoDiscoveryInput.LinkedAccountId = linkedAccountID
+
+		if a, ok := in["aws_regions"]; ok {
+			awsRegions := a.([]interface{})
+			var regions []string
+
+			for _, region := range awsRegions {
+				regions = append(regions, region.(string))
+			}
+			autoDiscoveryInput.AwsRegions = regions
+		}
+
+		if m, ok := in["metrics_polling_interval"]; ok {
+			autoDiscoveryInput.MetricsPollingInterval = m.(int)
+		}
+		expanded[i] = autoDiscoveryInput
+	}
+
+	return expanded
+}
+
 // flatten for Billing integration
 
 func flattenCloudAwsBillingIntegration(in *cloud.CloudBillingIntegration) []interface{} {
@@ -3830,3 +3881,17 @@ func flattenCloudSnsIntegration(in *cloud.CloudSnsIntegration) []interface{} {
 
 	return flattened
 }
+
+// flatten for Auto Discovery integration
+func flattenCloudAwsAutoDiscoveryIntegration(in *cloud.CloudAwsAutoDiscoveryIntegration) []interface{} {
+	flattened := make([]interface{}, 1)
+
+	out := make(map[string]interface{})
+
+	out["aws_regions"] = in.AwsRegions
+	out["metrics_polling_interval"] = in.MetricsPollingInterval
+
+	flattened[0] = out
+
+	return flattened
+}

website/docs/guides/aws_auto_discovery_integration_with_terraform.html.markdown

@@ -0,0 +1,84 @@
+---
+layout: "newrelic"
+page_title: "New Relic Integration with AWS AutoDiscovery"
+sidebar_current: "docs-newrelic-provider-aws-auto-discovery-integration-guide"
+description: |-
+  Use this guide to set up the New Relic AWS Auto Discovery fully automated through Terraform.
+---
+
+# NewRelic Integration with AWS AutoDiscovery
+The below guide provides reference on how to integrate with AWS Auto-Discovery via terraform.
+
+## Documentation Reference
+* [AWS Auto Discovery](https://docs.newrelic.com/docs/infrastructure/amazon-integrations/connect/set-up-auto-discovery-of-aws-entities/)
+
+## Pre-Requisites
+The below integration process presumes that the client has already integrated with either of the New Relic's integration for monitoring their cloud-infrastructure on AWS, which is either of API Polling or Cloudwatch Metrics Streams integration.
+
+## Variables -
+* **New Relic Region** ```new_relic_region``` - The region where your New Relic account is hosted
+ *  **Type** - String
+ *  **Allowed Values** - US or EU
+
+* **New Relic Account Id** ```new_relic_account_id``` - The account id associated with your organisation's New Relic Account.
+ * **Type** - Integer
+ * **Example** - 1234567
+
+* **AWS IAM Role Name** ```aws_iam_role_name``` - The IAM role-name that has been used to integrate cloud monitoring with New Relic.
+ * **Type** - String
+ * **Example** - "NewRelicInfrastructureIntegrationRole"
+
+* **AWS Account Id** ```aws_account_id``` - The AWS Account Id which has been integrated with New Relic on which Auto-Discovery has to be enabled.
+ * **Type** - Integer
+ * **Example** - 123456789012
+
+* **Metric Polling Interval** ```metric_polling_interval``` - The interval at which the auto-discovery scans are to be triggered on the integrated AWS account in seconds
+ * **Type** - Integer
+ * **Allowed Values** - 28800, 43200, 86400
+
+* **aws_regions** ```aws_regions``` - The list of regions at which the auto-discovery scans are to be triggered on the integrated AWS account.
+ * **Type** - StringList
+ * **Allowed Values** - ["af-south-1", "ap-east-1", "ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ca-central-1", "eu-north-1", "eu-south-1", "eu-west-1", "eu-west-2", "eu-west-3", "me-south-1", "sa-east-1",
+  "us-east-1" "us-east-2", "us-west-1", "us-west-2"]
+
+## Integrating with AWS Auto-Discovery via Terraform
+```
+provider "newrelic" {
+  region = var.new_relic_region
+  account_id = var.newrelic_account_id
+}
+
+resource "aws_iam_policy" "newrelic_aws_autodiscovery_permissions" {
+  name        = "NewRelicAwsAutoDiscoveryPermissions"
+  description = "IAM Policy for Auto-Discovery Permissions"
+  policy      = << EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": [
+        "cloudformation:StartResourceScan"
+      ],
+      "Effect": "Allow",
+      "Resource": "*"
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy_attachment" "newrelic_aws_policy_attach" {
+  role       = "var.aws_iam_role_name"
+  policy_arn = aws_iam_policy.newrelic_aws_autodiscovery_permissions.arn
+}
+
+resource "newrelic_cloud_aws_integrations" "auto_discovery_integrations" {
+  linked_account_id = var.aws_account_id
+  aws_auto_discovery = {
+    metric_polling_interval = var.metric_polling_interval
+    aws_regions = var.aws_regions
+  }
+}
+```
+
+