Merge branch 'master' into apoorv-inventory-source

Author: apoorv-garg

.github/CODEOWNERS

@@ -6,3 +6,12 @@
 # @seansain, @sumovishal will be requested for
 # review when someone opens a pull request.
 *       @seansain @sumovishal
+
+# Code owners for collection sources
+/sumologic/*_source.go        @maimaisie @vsinghal13
+/sumologic/*_source_test.go   @maimaisie @vsinghal13
+/sumologic/*_ingest_budget*   @maimaisie @vsinghal13
+/sumologic/*_collector*       @maimaisie @vsinghal13
+/website/docs/r/collector*    @maimaisie @vsinghal13
+/website/docs/r/ingest_*      @maimaisie @vsinghal13
+/website/docs/r/*_source*     @maimaisie @vsinghal13

CHANGELOG.md

@@ -1,4 +1,19 @@
-## 2.1.3 (Unreleased)
+## 2.2.0 (Unreleased)
+DEPRECATIONS:
+
+* resource/sumologic_polling_source: Deprecated in faovur of having individul sources for each content type currently supported. (GH-64)
+
+FEATURES:
+
+* **New Resource:** sumologic_s3_source (GH-64)
+* **New Resource:** sumologic_s3_audit_source (GH-64)
+* **New Resource:** sumologic_cloudwatch_source (GH-64)
+* **New Resource:** sumologic_cloudtrail_source (GH-64)
+* **New Resource:** sumologic_elb_source (GH-64)
+* **New Resource:** sumologic_cloudfront_source (GH-64)
+* **New Resource:** sumologic_metadata_source (GH-61)
+
+## 2.1.3 (July 30, 2020)
 ENHANCEMENTS:
 * Allow updates to content resources so that dashboard links do not exprie. This creates a known bug - do not update the name of a resource.
 

sumologic/data_sumologic_source_caller_identity.go

@@ -1,8 +1,6 @@
 package sumologic
 
 import (
-	"time"
-
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
@@ -27,7 +25,7 @@ func dataSourceSumologicCallerIdentity() *schema.Resource {
 func dataSourceSumologicCallerIdentityRead(d *schema.ResourceData, meta interface{}) error {
 	c := meta.(*Client)
 
-	d.SetId(time.Now().UTC().String())
+	d.SetId("access_id")
 	d.Set("access_id", c.AccessID)
 	d.Set("environment", c.Environment)
 

sumologic/provider.go

@@ -41,6 +41,13 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_collector":                          resourceSumologicCollector(),
 			"sumologic_http_source":                        resourceSumologicHTTPSource(),
 			"sumologic_polling_source":                     resourceSumologicPollingSource(),
+			"sumologic_s3_source":                          resourceSumologicGenericPollingSource(),
+			"sumologic_s3_audit_source":                    resourceSumologicGenericPollingSource(),
+			"sumologic_cloudwatch_source":                  resourceSumologicGenericPollingSource(),
+			"sumologic_cloudtrail_source":                  resourceSumologicGenericPollingSource(),
+			"sumologic_elb_source":                         resourceSumologicGenericPollingSource(),
+			"sumologic_cloudfront_source":                  resourceSumologicGenericPollingSource(),
+			"sumologic_metadata_source":                    resourceSumologicMetadataSource(),
 			"sumologic_cloudsyslog_source":                 resourceSumologicCloudsyslogSource(),
 			"sumologic_role":                               resourceSumologicRole(),
 			"sumologic_user":                               resourceSumologicUser(),