Merge pull request #218 from SumoLogic/ssain-aws-test-changes

seansain · web-flow · commit a3b4003a6cd7 · 2021-06-29T10:08:00.000-07:00
do not require aws creds for all acc tests
diff --git a/sumologic/data_source_sumologic_admin_recommended_folder_test.go b/sumologic/data_source_sumologic_admin_recommended_folder_test.go
@@ -8,6 +8,7 @@ import (
 
 func TestAccDataSourceAdminRecommendedFolder_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
diff --git a/sumologic/data_source_sumologic_collector_test.go b/sumologic/data_source_sumologic_collector_test.go
@@ -8,6 +8,7 @@ import (
 
 func TestAccDataSourcSumologicCollector_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
diff --git a/sumologic/data_source_sumologic_role_test.go b/sumologic/data_source_sumologic_role_test.go
@@ -8,6 +8,7 @@ import (
 
 func TestAccDataSourcSumologicRole_basic(t *testing.T) {
 	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
diff --git a/sumologic/provider_test.go b/sumologic/provider_test.go
@@ -38,6 +38,10 @@ func testAccPreCheck(t *testing.T) {
 	if v := os.Getenv("SUMOLOGIC_ENVIRONMENT"); v == "" {
 		t.Fatal("SUMOLOGIC_ENVIRONMENT must be set for acceptance tests")
 	}
+}
+
+func testAccPreCheckWithAWS(t *testing.T) {
+	testAccPreCheck(t)
 	if v := os.Getenv("SUMOLOGIC_TEST_AWS_ID"); v == "" {
 		t.Fatal("SUMOLOGIC_TEST_AWS_ID must be set for polling source acceptance tests")
 	}
diff --git a/sumologic/resource_sumologic_cloudfront_source_test.go b/sumologic/resource_sumologic_cloudfront_source_test.go
@@ -20,7 +20,7 @@ func TestAccSumologicCloudFrontSource_create(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudFrontSourceDestroy,
 		Steps: []resource.TestStep{
@@ -52,7 +52,7 @@ func TestAccSumologicCloudFrontSource_update(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{
diff --git a/sumologic/resource_sumologic_cloudtrail_source_test.go b/sumologic/resource_sumologic_cloudtrail_source_test.go
@@ -20,7 +20,7 @@ func TestAccSumologicCloudTrailSource_create(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudTrailSourceDestroy,
 		Steps: []resource.TestStep{
@@ -52,7 +52,7 @@ func TestAccSumologicCloudTrailSource_update(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{
diff --git a/sumologic/resource_sumologic_cloudwatch_source_test.go b/sumologic/resource_sumologic_cloudwatch_source_test.go
@@ -19,7 +19,7 @@ func TestAccSumologicCloudWatchSource_create(t *testing.T) {
 	testAwsID := os.Getenv("SUMOLOGIC_TEST_AWS_ID")
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckCloudWatchSourceDestroy,
 		Steps: []resource.TestStep{
@@ -50,7 +50,7 @@ func TestAccSumologicCloudWatchSource_update(t *testing.T) {
 	testAwsID := os.Getenv("SUMOLOGIC_TEST_AWS_ID")
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{
diff --git a/sumologic/resource_sumologic_elb_source_test.go b/sumologic/resource_sumologic_elb_source_test.go
@@ -20,7 +20,7 @@ func TestAccSumologicElbSource_create(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckElbSourceDestroy,
 		Steps: []resource.TestStep{
@@ -52,7 +52,7 @@ func TestAccSumologicElbSource_update(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{
diff --git a/sumologic/resource_sumologic_kinesis_metrics_source_test.go b/sumologic/resource_sumologic_kinesis_metrics_source_test.go
@@ -19,7 +19,7 @@ func TestAccSumologicKinesisMetricsSource_create(t *testing.T) {
 	testAwsID := os.Getenv("SUMOLOGIC_TEST_AWS_ID")
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckKinesisMetricsSourceDestroy,
 		Steps: []resource.TestStep{
@@ -50,7 +50,7 @@ func TestAccSumologicKinesisMetricsSource_update(t *testing.T) {
 	testAwsID := os.Getenv("SUMOLOGIC_TEST_AWS_ID")
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{
diff --git a/sumologic/resource_sumologic_metadata_source_test.go b/sumologic/resource_sumologic_metadata_source_test.go
@@ -19,7 +19,7 @@ func TestAccSumologicMetadataSource_create(t *testing.T) {
 	testAwsID := os.Getenv("SUMOLOGIC_TEST_AWS_ID")
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckMetadataSourceDestroy,
 		Steps: []resource.TestStep{
@@ -50,7 +50,7 @@ func TestAccSumologicMetadataSource_update(t *testing.T) {
 	testAwsID := os.Getenv("SUMOLOGIC_TEST_AWS_ID")
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{
diff --git a/sumologic/resource_sumologic_s3_audit_source_test.go b/sumologic/resource_sumologic_s3_audit_source_test.go
@@ -20,7 +20,7 @@ func TestAccSumologicS3AuditSource_create(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckS3AuditSourceDestroy,
 		Steps: []resource.TestStep{
@@ -52,7 +52,7 @@ func TestAccSumologicS3AuditSource_update(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{
diff --git a/sumologic/resource_sumologic_s3_source_test.go b/sumologic/resource_sumologic_s3_source_test.go
@@ -27,7 +27,7 @@ func TestAccSumologicS3Source_create(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckS3SourceDestroy,
 		Steps: []resource.TestStep{
@@ -59,7 +59,7 @@ func TestAccSumologicS3Source_update(t *testing.T) {
 	testAwsKey := os.Getenv("SUMOLOGIC_TEST_AWS_KEY")
 	testAwsBucket := os.Getenv("SUMOLOGIC_TEST_BUCKET_NAME")
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
+		PreCheck:     func() { testAccPreCheckWithAWS(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHTTPSourceDestroy,
 		Steps: []resource.TestStep{

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`func TestAccDataSourceAdminRecommendedFolder_basic(t *testing.T) {`
`10`	`10`	`resource.Test(t, resource.TestCase{`
	`11`	`+ PreCheck: func() { testAccPreCheck(t) },`
`11`	`12`	`Providers: testAccProviders,`
`12`	`13`	`Steps: []resource.TestStep{`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`func TestAccDataSourcSumologicCollector_basic(t *testing.T) {`
`10`	`10`	`resource.Test(t, resource.TestCase{`
	`11`	`+ PreCheck: func() { testAccPreCheck(t) },`
`11`	`12`	`Providers: testAccProviders,`
`12`	`13`	`Steps: []resource.TestStep{`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`func TestAccDataSourcSumologicRole_basic(t *testing.T) {`
`10`	`10`	`resource.Test(t, resource.TestCase{`
	`11`	`+ PreCheck: func() { testAccPreCheck(t) },`
`11`	`12`	`Providers: testAccProviders,`
`12`	`13`	`Steps: []resource.TestStep{`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ func testAccPreCheck(t *testing.T) {`
`38`	`38`	`if v := os.Getenv("SUMOLOGIC_ENVIRONMENT"); v == "" {`
`39`	`39`	`t.Fatal("SUMOLOGIC_ENVIRONMENT must be set for acceptance tests")`
`40`	`40`	`}`
	`41`	`+}`
	`42`	`+`
	`43`	`+func testAccPreCheckWithAWS(t *testing.T) {`
	`44`	`+ testAccPreCheck(t)`
`41`	`45`	`if v := os.Getenv("SUMOLOGIC_TEST_AWS_ID"); v == "" {`
`42`	`46`	`t.Fatal("SUMOLOGIC_TEST_AWS_ID must be set for polling source acceptance tests")`
`43`	`47`	`}`