use generic polling source instead of regular one

Author: apoorv-garg

sumologic/provider.go

@@ -44,6 +44,7 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_s3_source":                          resourceSumologicGenericPollingSource(),
 			"sumologic_s3_audit_source":                    resourceSumologicGenericPollingSource(),
 			"sumologic_cloudwatch_source":                  resourceSumologicGenericPollingSource(),
+			"sumologic_aws_xray_source":                    resourceSumologicGenericPollingSource(),
 			"sumologic_cloudtrail_source":                  resourceSumologicGenericPollingSource(),
 			"sumologic_elb_source":                         resourceSumologicGenericPollingSource(),
 			"sumologic_cloudfront_source":                  resourceSumologicGenericPollingSource(),

sumologic/resource_sumologic_generic_polling_source.go

@@ -19,10 +19,11 @@ func resourceSumologicGenericPollingSource() *schema.Resource {
 	}
 
 	pollingSource.Schema["content_type"] = &schema.Schema{
-		Type:         schema.TypeString,
-		Required:     true,
-		ForceNew:     true,
-		ValidateFunc: validation.StringInSlice([]string{"AwsS3Bucket", "AwsElbBucket", "AwsCloudFrontBucket", "AwsCloudTrailBucket", "AwsS3AuditBucket", "AwsCloudWatch"}, false),
+		Type:     schema.TypeString,
+		Required: true,
+		ForceNew: true,
+		ValidateFunc: validation.StringInSlice([]string{"AwsS3Bucket", "AwsElbBucket", "AwsCloudFrontBucket",
+			"AwsCloudTrailBucket", "AwsS3AuditBucket", "AwsCloudWatch", "AwsXRay"}, false),
 	}
 	pollingSource.Schema["scan_interval"] = &schema.Schema{
 		Type:     schema.TypeInt,
@@ -73,9 +74,10 @@ func resourceSumologicGenericPollingSource() *schema.Resource {
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"type": {
-					Type:         schema.TypeString,
-					Required:     true,
-					ValidateFunc: validation.StringInSlice([]string{"S3BucketPathExpression", "CloudWatchPath"}, false),
+					Type:     schema.TypeString,
+					Required: true,
+					ValidateFunc: validation.StringInSlice([]string{"S3BucketPathExpression", "CloudWatchPath",
+						"AwsXRayPath"}, false),
 				},
 				"bucket_name": {
 					Type:     schema.TypeString,
@@ -327,6 +329,14 @@ func getPollingPathSettings(d *schema.ResourceData) PollingPath {
 			pathSettings.LimitToRegions = LimitToRegions
 			pathSettings.LimitToNamespaces = LimitToNamespaces
 			pathSettings.TagFilters = getPollingTagFilters(d)
+		case "AwsXRayPath":
+			pathSettings.Type = "AwsXRayPath"
+			rawLimitToRegions := path["limit_to_regions"].([]interface{})
+			LimitToRegions := make([]string, len(rawLimitToRegions))
+			for i, v := range rawLimitToRegions {
+				LimitToRegions[i] = v.(string)
+			}
+			pathSettings.LimitToRegions = LimitToRegions
 		default:
 			log.Printf("[ERROR] Unknown resourceType in path: %v", pathType)
 		}

sumologic/resource_sumologic_polling_source.go

@@ -21,11 +21,10 @@ func resourceSumologicPollingSource() *schema.Resource {
 		"We are deprecating the generic sumologic polling source and in turn creating individual sources for each of the content_type currently supported."
 
 	pollingSource.Schema["content_type"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Required: true,
-		ForceNew: true,
-		ValidateFunc: validation.StringInSlice([]string{"AwsS3Bucket", "AwsElbBucket", "AwsCloudFrontBucket",
-			"AwsCloudTrailBucket", "AwsS3AuditBucket", "AwsCloudWatch", "AwsXRay"}, false),
+		Type:         schema.TypeString,
+		Required:     true,
+		ForceNew:     true,
+		ValidateFunc: validation.StringInSlice([]string{"AwsS3Bucket", "AwsElbBucket", "AwsCloudFrontBucket", "AwsCloudTrailBucket", "AwsS3AuditBucket", "AwsCloudWatch"}, false),
 	}
 	pollingSource.Schema["scan_interval"] = &schema.Schema{
 		Type:     schema.TypeInt,
@@ -76,10 +75,9 @@ func resourceSumologicPollingSource() *schema.Resource {
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"type": {
-					Type:     schema.TypeString,
-					Required: true,
-					ValidateFunc: validation.StringInSlice([]string{"S3BucketPathExpression", "CloudWatchPath",
-						"AwsXRayPath"}, false),
+					Type:         schema.TypeString,
+					Required:     true,
+					ValidateFunc: validation.StringInSlice([]string{"S3BucketPathExpression", "CloudWatchPath"}, false),
 				},
 				"bucket_name": {
 					Type:     schema.TypeString,
@@ -331,14 +329,6 @@ func getPathSettings(d *schema.ResourceData) PollingPath {
 			pathSettings.LimitToRegions = LimitToRegions
 			pathSettings.LimitToNamespaces = LimitToNamespaces
 			pathSettings.TagFilters = getTagFilters(d)
-		case "AwsXRayPath":
-			pathSettings.Type = "AwsXRayPath"
-			rawLimitToRegions := path["limit_to_regions"].([]interface{})
-			LimitToRegions := make([]string, len(rawLimitToRegions))
-			for i, v := range rawLimitToRegions {
-				LimitToRegions[i] = v.(string)
-			}
-			pathSettings.LimitToRegions = LimitToRegions
 		default:
 			log.Printf("[ERROR] Unknown resourceType in path: %v", pathType)
 		}