Merge pull request #19165 from coderGo93/macie2-classification-job

New resource for Macie2 Classification Job
hashicorp · May 5, 2021 · 522bd3b · 522bd3b
2 parents dd8f598 + 6262302
commit 522bd3b
Show file tree

Hide file tree

Showing 9 changed files with 1,591 additions and 5 deletions.
diff --git a/.changelog/19165.txt b/.changelog/19165.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_macie2_classification_job
+```
diff --git a/aws/internal/keyvaluetags/generators/servicetags/main.go b/aws/internal/keyvaluetags/generators/servicetags/main.go
@@ -130,6 +130,7 @@ var mapServiceNames = []string{
 	"kinesisvideo",
 	"imagebuilder",
 	"lambda",
+	"macie2",
 	"mediaconnect",
 	"mediaconvert",
 	"medialive",

diff --git a/aws/internal/keyvaluetags/service_tags_gen.go b/aws/internal/keyvaluetags/service_tags_gen.go
diff --git a/aws/provider.go b/aws/provider.go
@@ -842,6 +842,7 @@ func Provider() *schema.Provider {
 			"aws_load_balancer_listener_policy":                       resourceAwsLoadBalancerListenerPolicies(),
 			"aws_lb_ssl_negotiation_policy":                           resourceAwsLBSSLNegotiationPolicy(),
 			"aws_macie2_account":                                      resourceAwsMacie2Account(),
+			"aws_macie2_classification_job":                           resourceAwsMacie2ClassificationJob(),
 			"aws_macie_member_account_association":                    resourceAwsMacieMemberAccountAssociation(),
 			"aws_macie_s3_bucket_association":                         resourceAwsMacieS3BucketAssociation(),
 			"aws_main_route_table_association":                        resourceAwsMainRouteTableAssociation(),

diff --git a/aws/resource_aws_macie2_account_test.go b/aws/resource_aws_macie2_account_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccAwsMacie2Account_basic(t *testing.T) {
+func testAccAwsMacie2Account_basic(t *testing.T) {
 	var macie2Output macie2.GetMacieSessionOutput
 	resourceName := "aws_macie2_account.test"
 
@@ -40,7 +40,7 @@ func TestAccAwsMacie2Account_basic(t *testing.T) {
 	})
 }
 
-func TestAccAwsMacie2Account_FindingPublishingFrequency(t *testing.T) {
+func testAccAwsMacie2Account_FindingPublishingFrequency(t *testing.T) {
 	var macie2Output macie2.GetMacieSessionOutput
 	resourceName := "aws_macie2_account.test"
 
@@ -81,7 +81,7 @@ func TestAccAwsMacie2Account_FindingPublishingFrequency(t *testing.T) {
 	})
 }
 
-func TestAccAwsMacie2Account_WithStatus(t *testing.T) {
+func testAccAwsMacie2Account_WithStatus(t *testing.T) {
 	var macie2Output macie2.GetMacieSessionOutput
 	resourceName := "aws_macie2_account.test"
 
@@ -122,7 +122,7 @@ func TestAccAwsMacie2Account_WithStatus(t *testing.T) {
 	})
 }
 
-func TestAccAwsMacie2Account_WithFindingAndStatus(t *testing.T) {
+func testAccAwsMacie2Account_WithFindingAndStatus(t *testing.T) {
 	var macie2Output macie2.GetMacieSessionOutput
 	resourceName := "aws_macie2_account.test"
 
@@ -163,7 +163,7 @@ func TestAccAwsMacie2Account_WithFindingAndStatus(t *testing.T) {
 	})
 }
 
-func TestAccAwsMacie2Account_disappears(t *testing.T) {
+func testAccAwsMacie2Account_disappears(t *testing.T) {
 	var macie2Output macie2.GetMacieSessionOutput
 	resourceName := "aws_macie2_account.test"