Revert "Revert "add snsTopicArn field in polling sources (#303)" (#309)" (#311)

This reverts commit 170cae6.

Author: vsinghal13

sumologic/resource_sumologic_generic_polling_source.go

@@ -130,6 +130,22 @@ func resourceSumologicGenericPollingSource() *schema.Resource {
 						},
 					},
 				},
+				"sns_topic_or_subscription_arn": {
+					Type:     schema.TypeList,
+					Computed: true,
+					Elem: &schema.Resource{
+						Schema: map[string]*schema.Schema{
+							"is_success": {
+								Type:     schema.TypeBool,
+								Computed: true,
+							},
+							"arn": {
+								Type:     schema.TypeString,
+								Computed: true,
+							},
+						},
+					},
+				},
 			},
 		},
 	}
@@ -252,12 +268,13 @@ func getPollingThirdPartyPathAttributes(pollingResource []PollingResource) []map
 
 	for _, t := range pollingResource {
 		mapping := map[string]interface{}{
-			"type":                t.Path.Type,
-			"bucket_name":         t.Path.BucketName,
-			"path_expression":     t.Path.PathExpression,
-			"limit_to_regions":    t.Path.LimitToRegions,
-			"limit_to_namespaces": t.Path.LimitToNamespaces,
-			"tag_filters":         flattenPollingTagFilters(t.Path.TagFilters),
+			"type":                          t.Path.Type,
+			"bucket_name":                   t.Path.BucketName,
+			"path_expression":               t.Path.PathExpression,
+			"limit_to_regions":              t.Path.LimitToRegions,
+			"limit_to_namespaces":           t.Path.LimitToNamespaces,
+			"tag_filters":                   flattenPollingTagFilters(t.Path.TagFilters),
+			"sns_topic_or_subscription_arn": flattenPollingSnsTopicOrSubscriptionArn(t.Path.SnsTopicOrSubscriptionArn),
 		}
 		s = append(s, mapping)
 	}
@@ -319,6 +336,32 @@ func getPollingTagFilters(d *schema.ResourceData) []TagFilter {
 	return filters
 }
 
+func flattenPollingSnsTopicOrSubscriptionArn(v PollingSnsTopicOrSubscriptionArn) []map[string]interface{} {
+	var snsTopicOrSubscriptionArn []map[string]interface{}
+	snsTopic := map[string]interface{}{
+		"is_success": v.IsSuccess,
+		"arn":        v.Arn,
+	}
+	snsTopicOrSubscriptionArn = append(snsTopicOrSubscriptionArn, snsTopic)
+	return snsTopicOrSubscriptionArn
+}
+
+func getPollingSnsTopicOrSubscriptionArn(d *schema.ResourceData) PollingSnsTopicOrSubscriptionArn {
+	paths := d.Get("path").([]interface{})
+	path := paths[0].(map[string]interface{})
+	snsConfig := path["sns_topic_or_subscription_arn"].([]interface{})
+	snsTopicOrSubscriptionArn := PollingSnsTopicOrSubscriptionArn{}
+
+	if len(snsConfig) > 0 {
+		for _, rawConfig := range snsConfig {
+			config := rawConfig.(map[string]interface{})
+			snsTopicOrSubscriptionArn.IsSuccess = config["is_success"].(bool)
+			snsTopicOrSubscriptionArn.Arn = config["arn"].(string)
+		}
+	}
+	return snsTopicOrSubscriptionArn
+}
+
 func getPollingAuthentication(d *schema.ResourceData) (PollingAuthentication, error) {
 	auths := d.Get("authentication").([]interface{})
 	authSettings := PollingAuthentication{}
@@ -364,6 +407,7 @@ func getPollingPathSettings(d *schema.ResourceData) (PollingPath, error) {
 			pathSettings.Type = "S3BucketPathExpression"
 			pathSettings.BucketName = path["bucket_name"].(string)
 			pathSettings.PathExpression = path["path_expression"].(string)
+			pathSettings.SnsTopicOrSubscriptionArn = getPollingSnsTopicOrSubscriptionArn(d)
 		case "CloudWatchPath", "AwsInventoryPath":
 			pathSettings.Type = pathType
 			rawLimitToRegions := path["limit_to_regions"].([]interface{})

sumologic/sumologic_polling_source.go

@@ -33,12 +33,13 @@ type PollingAuthentication struct {
 }
 
 type PollingPath struct {
-	Type              string      `json:"type"`
-	BucketName        string      `json:"bucketName,omitempty"`
-	PathExpression    string      `json:"pathExpression,omitempty"`
-	LimitToRegions    []string    `json:"limitToRegions,omitempty"`
-	LimitToNamespaces []string    `json:"limitToNamespaces,omitempty"`
-	TagFilters        []TagFilter `json:"tagFilters,omitempty"`
+	Type                      string                           `json:"type"`
+	BucketName                string                           `json:"bucketName,omitempty"`
+	PathExpression            string                           `json:"pathExpression,omitempty"`
+	LimitToRegions            []string                         `json:"limitToRegions,omitempty"`
+	LimitToNamespaces         []string                         `json:"limitToNamespaces,omitempty"`
+	TagFilters                []TagFilter                      `json:"tagFilters,omitempty"`
+	SnsTopicOrSubscriptionArn PollingSnsTopicOrSubscriptionArn `json:"snsTopicOrSubscriptionArn,omitempty"`
 }
 
 type TagFilter struct {
@@ -47,6 +48,11 @@ type TagFilter struct {
 	Tags      []string `json:"tags"`
 }
 
+type PollingSnsTopicOrSubscriptionArn struct {
+	IsSuccess bool   `json:"isSuccess"`
+	Arn       string `json:"arn"`
+}
+
 func (s *Client) CreatePollingSource(source PollingSource, collectorID int) (int, error) {
 
 	type PollingSourceMessage struct {

website/docs/index.html.markdown

@@ -130,4 +130,20 @@ The following properties are common to ALL sources and can be used to configure
 - `cutoff_relative_time` - (Optional) Can be specified instead of cutoffTimestamp to provide a relative offset with respect to the current time. Example: use -1h, -1d, or -1w to collect data that's less than one hour, one day, or one week old, respectively.
 - `fields` - (Optional) Map containing key/value pairs.
 
+## Configuring SNS Subscription
+This is supported in the following resources.
+ - `sumologic_cloudfront_source`
+ - `sumologic_cloudtrail_source`
+ - `sumologic_elb_source`
+ - `sumologic_s3_audit_source`
+ - `sumologic_s3_source`
+
+Steps to configure SNS subscription and sync the state in terrform:
+     - Step 1: Create the source via terraform.
+     - Step 2: Setup [SNS subscription][3] outside of terraform on Sumologic UI.
+     - Step 3: Run `terraform plan -refresh-only` to review the changes and verify the state with the SNS subscription information. Make sure only `sns_topic_or_subscription_arn` is updated. If SNS has been successfully configured and has received a subscription confirmation request `isSuccess` parameter will be true.
+     - Step 4: Apply the changes with `terraform apply -refresh-only`.
+
 [2]: https://en.wikipedia.org/wiki/Tz_database
+[3]: https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/Amazon-Web-Services/AWS_Sources#set-up-sns-in-aws-highly-recommended
+

website/docs/r/cloudfront_source.html.markdown

@@ -58,9 +58,11 @@ In addition to the common properties, the following arguments are supported:
      + `type` - (Required) type of polling source. This has to be `S3BucketPathExpression` for `CloudFront` source.
      + `bucket_name` - (Required) The name of the bucket. This is needed if using type `S3BucketPathExpression`. 
      + `path_expression` - (Required) The path to the data. This is needed if using type `S3BucketPathExpression`.
+     + `sns_topic_or_subscription_arn` - (Computed) This is a computed field for SNS topic/subscription ARN.
 
 ### See also
    * [Common Source Properties](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#common-source-properties)
+   * [Configuring SNS Subscription](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#configuring-sns-subscription)
 
 ## Attributes Reference
 The following attributes are exported:
@@ -82,4 +84,4 @@ terraform import sumologic_cloudfront_source.test my-test-collector/my-test-sour
 ```
 
 [1]: https://help.sumologic.com/Send_Data/Sources/03Use_JSON_to_Configure_Sources/JSON_Parameters_for_Hosted_Sources
-[2]: https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/Amazon-Web-Services/Amazon-CloudFront-Source
+[2]: https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/Amazon-Web-Services/Amazon-CloudFront-Source

website/docs/r/cloudtrail_source.html.markdown

@@ -58,9 +58,12 @@ In addition to the common properties, the following arguments are supported:
      + `type` - (Required) type of polling source. This has to be `S3BucketPathExpression` for `CloudTrail` source.
      + `bucket_name` - (Required) The name of the bucket.
      + `path_expression` - (Required) The path to the data.
+     + `sns_topic_or_subscription_arn` - (Computed) This is a computed field for SNS topic/subscription ARN.
+     
 
 ### See also
    * [Common Source Properties](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#common-source-properties)
+   * [Configuring SNS Subscription](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#configuring-sns-subscription)
 
 ## Attributes Reference
 The following attributes are exported:
@@ -82,4 +85,4 @@ terraform import sumologic_cloudtrail_source.test my-test-collector/my-test-sour
 ```
 
 [1]: https://help.sumologic.com/Send_Data/Sources/03Use_JSON_to_Configure_Sources/JSON_Parameters_for_Hosted_Sources
-[2]: https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/Amazon-Web-Services/AWS-CloudTrail-Source
+[2]: https://help.sumologic.com/03Send-Data/Sources/02Sources-for-Hosted-Collectors/Amazon-Web-Services/AWS-CloudTrail-Source

website/docs/r/elb_source.html.markdown

@@ -58,9 +58,11 @@ In addition to the common properties, the following arguments are supported:
      + `type` - (Required) type of polling source. This has to be `S3BucketPathExpression` for `ELB` source.
      + `bucket_name` - (Required) The name of the bucket.
      + `path_expression` - (Required) The path to the data.
+     + `sns_topic_or_subscription_arn` - (Computed) This is a computed field for SNS topic/subscription ARN.
 
 ### See also
    * [Common Source Properties](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#common-source-properties)
+   * [Configuring SNS Subscription](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#configuring-sns-subscription)
 
 ## Attributes Reference
 The following attributes are exported:

website/docs/r/s3_audit_source.markdown

@@ -58,9 +58,11 @@ In addition to the common properties, the following arguments are supported:
      + `type` - (Required) type of polling source. This has to be `S3BucketPathExpression` for `S3 Audit source`.
      + `bucket_name` - (Required) The name of the bucket. 
      + `path_expression` - (Required) The path to the data.
+     + `sns_topic_or_subscription_arn` - (Computed) This is a computed field for SNS topic/subscription ARN.
 
 ### See also
    * [Common Source Properties](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#common-source-properties)
+   * [Configuring SNS Subscription](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#configuring-sns-subscription)
 
 ## Attributes Reference
 The following attributes are exported:

website/docs/r/s3_source.html.markdown

@@ -58,9 +58,11 @@ In addition to the common properties, the following arguments are supported:
      + `type` - (Required) type of polling source. This has to be `S3BucketPathExpression` for `S3 source`.
      + `bucket_name` - (Required) The name of the bucket. 
      + `path_expression` - (Required) The path to the data.
+     + `sns_topic_or_subscription_arn` - (Computed) This is a computed field for SNS topic/subscription ARN.
 
 ### See also
   * [Common Source Properties](https://github.com/SumoLogic/tree/master/website#common-source-properties)
+  * [Configuring SNS Subscription](https://registry.terraform.io/providers/SumoLogic/sumologic/latest/docs#configuring-sns-subscription)
 
 ## Attributes Reference
 The following attributes are exported: