provider: Add Macie2 service client (hashicorp#13432)

mattburgess · Sep 30, 2020 · ba4f284 · ba4f284
1 parent d722fd4
commit ba4f284
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 0 deletions.
diff --git a/.hashibot.hcl b/.hashibot.hcl
@@ -392,6 +392,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/macie" = [
       "aws_macie_",
     ],
+    "service/macie2" = [
+      "aws_macie2_",
+    ],
     "service/marketplacecatalog" = [
       "aws_marketplace_catalog_",
     ],

diff --git a/aws/config.go b/aws/config.go
@@ -97,6 +97,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/licensemanager"
 	"github.com/aws/aws-sdk-go/service/lightsail"
 	"github.com/aws/aws-sdk-go/service/macie"
+	"github.com/aws/aws-sdk-go/service/macie2"
 	"github.com/aws/aws-sdk-go/service/managedblockchain"
 	"github.com/aws/aws-sdk-go/service/marketplacecatalog"
 	"github.com/aws/aws-sdk-go/service/mediaconnect"
@@ -285,6 +286,7 @@ type AWSClient struct {
 	licensemanagerconn                  *licensemanager.LicenseManager
 	lightsailconn                       *lightsail.Lightsail
 	macieconn                           *macie.Macie
+	macie2conn                          *macie2.Macie2
 	managedblockchainconn               *managedblockchain.ManagedBlockchain
 	marketplacecatalogconn              *marketplacecatalog.MarketplaceCatalog
 	mediaconnectconn                    *mediaconnect.MediaConnect
@@ -515,6 +517,7 @@ func (c *Config) Client() (interface{}, error) {
 		licensemanagerconn:                  licensemanager.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["licensemanager"])})),
 		lightsailconn:                       lightsail.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["lightsail"])})),
 		macieconn:                           macie.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["macie"])})),
+		macie2conn:                          macie2.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["macie2"])})),
 		managedblockchainconn:               managedblockchain.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["managedblockchain"])})),
 		marketplacecatalogconn:              marketplacecatalog.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["marketplacecatalog"])})),
 		mediaconnectconn:                    mediaconnect.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["mediaconnect"])})),

diff --git a/aws/provider.go b/aws/provider.go
@@ -1138,6 +1138,7 @@ func init() {
 		"licensemanager",
 		"lightsail",
 		"macie",
+		"macie2",
 		"managedblockchain",
 		"marketplacecatalog",
 		"mediaconnect",

diff --git a/infrastructure/repository/labels-service.tf b/infrastructure/repository/labels-service.tf
@@ -122,6 +122,7 @@ variable "service_labels" {
     "lightsail",
     "machinelearning",
     "macie",
+    "macie2",
     "managedblockchain",
     "marketplacecatalog",
     "mediaconnect",

diff --git a/website/allowed-subcategories.txt b/website/allowed-subcategories.txt
@@ -70,6 +70,7 @@ Lex
 License Manager
 Lightsail
 MQ
+Macie
 Macie Classic
 Managed Streaming for Kafka (MSK)
 MediaConvert

diff --git a/website/docs/guides/custom-service-endpoints.html.md b/website/docs/guides/custom-service-endpoints.html.md
@@ -140,6 +140,7 @@ The Terraform AWS Provider allows the following endpoints to be customized:
   <li><code>licensemanager</code></li>
   <li><code>lightsail</code></li>
   <li><code>macie</code></li>
+  <li><code>macie2</code></li>
   <li><code>managedblockchain</code></li>
   <li><code>marketplacecatalog</code></li>
   <li><code>mediaconnect</code></li>