Add OpenSearch service

.changelog/23902.txt

@@ -0,0 +1,15 @@
+```release-note:new-data-source
+aws_opensearch_domain
+```
+
+```release-note:new-resource
+aws_opensearch_domain_policy
+```
+
+```release-note:new-resource
+aws_opensearch_domain_saml_options
+```
+
+```release-note:new-resource
+aws_opensearch_domain
+```

.github/labeler-issue-triage.yml

@@ -276,6 +276,8 @@ service/networkfirewall:
   - '((\*|-) ?`?|(data|resource) "?)aws_networkfirewall_'
 service/networkmanager:
   - '((\*|-) ?`?|(data|resource) "?)aws_networkmanager_'
+service/opensearch:
+  - '((\*|-) ?`?|(data|resource) "?)aws_opensearch_'
 service/opsworks:
   - '((\*|-) ?`?|(data|resource) "?)aws_opsworks_'
 service/organizations:

.github/labeler-pr-triage.yml

@@ -475,6 +475,9 @@ service/networkfirewall:
 service/networkmanager:
   - 'internal/service/networkmanager/**/*'
   - 'website/**/networkmanager_*'
+service/opensearch:
+  - 'internal/service/opensearch/**/*'
+  - 'website/**/opensearch_*'
 service/opsworks:
   - 'internal/service/opsworks/**/*'
   - 'website/**/opsworks_*'

infrastructure/repository/labels-service.tf

@@ -154,6 +154,7 @@ variable "service_labels" {
     "neptune",
     "networkfirewall",
     "networkmanager",
+    "opensearch",
     "opsworks",
     "opsworkscm",
     "organizations",

internal/conns/conns.go

@@ -199,6 +199,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/networkfirewall"
 	"github.com/aws/aws-sdk-go/service/networkmanager"
 	"github.com/aws/aws-sdk-go/service/nimblestudio"
+	"github.com/aws/aws-sdk-go/service/opensearchservice"
 	"github.com/aws/aws-sdk-go/service/opsworks"
 	"github.com/aws/aws-sdk-go/service/opsworkscm"
 	"github.com/aws/aws-sdk-go/service/organizations"
@@ -519,6 +520,7 @@ type AWSClient struct {
 	NetworkFirewallConn               *networkfirewall.NetworkFirewall
 	NetworkManagerConn                *networkmanager.NetworkManager
 	NimbleStudioConn                  *nimblestudio.NimbleStudio
+	OpenSearchConn                    *opensearchservice.OpenSearchService
 	OpsWorksCMConn                    *opsworkscm.OpsWorksCM
 	OpsWorksConn                      *opsworks.OpsWorks
 	OrganizationsConn                 *organizations.Organizations
@@ -918,6 +920,7 @@ func (c *Config) Client(ctx context.Context) (interface{}, diag.Diagnostics) {
 		NetworkFirewallConn:               networkfirewall.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints[names.NetworkFirewall])})),
 		NetworkManagerConn:                networkmanager.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints[names.NetworkManager])})),
 		NimbleStudioConn:                  nimblestudio.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints[names.NimbleStudio])})),
+		OpenSearchConn:                    opensearchservice.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints[names.OpenSearch])})),
 		OpsWorksCMConn:                    opsworkscm.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints[names.OpsWorksCM])})),
 		OpsWorksConn:                      opsworks.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints[names.OpsWorks])})),
 		OrganizationsConn:                 organizations.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints[names.Organizations])})),

internal/generate/listpages/main.go

@@ -548,6 +548,7 @@ func init() {
 	awsServiceNames["networkfirewall"] = "NetworkFirewall"
 	awsServiceNames["networkmanager"] = "NetworkManager"
 	awsServiceNames["nimblestudio"] = "NimbleStudio"
+	awsServiceNames["opensearchservice"] = "OpenSearchService"
 	awsServiceNames["opsworks"] = "OpsWorks"
 	awsServiceNames["opsworkscm"] = "OpsWorksCM"
 	awsServiceNames["organizations"] = "Organizations"

internal/generate/namevaluesfilters/generators/servicefilters/main.go

@@ -29,6 +29,7 @@ var sliceServiceNames = []string{
 	"imagebuilder",
 	"licensemanager",
 	"neptune",
+	"opensearchservice",
 	"rds",
 	"resourcegroupstaggingapi",
 	"route53resolver",

internal/generate/tags/main.go

@@ -1051,6 +1051,7 @@ func init() {
 	awsServiceNames["networkfirewall"] = "NetworkFirewall"
 	awsServiceNames["networkmanager"] = "NetworkManager"
 	awsServiceNames["nimblestudio"] = "NimbleStudio"
+	awsServiceNames["opensearchservice"] = "OpenSearchService"
 	awsServiceNames["opsworks"] = "OpsWorks"
 	awsServiceNames["opsworkscm"] = "OpsWorksCM"
 	awsServiceNames["organizations"] = "Organizations"

internal/provider/provider.go

@@ -120,6 +120,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/service/neptune"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/networkfirewall"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/networkmanager"
+	"github.com/hashicorp/terraform-provider-aws/internal/service/opensearch"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/opsworks"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/organizations"
 	"github.com/hashicorp/terraform-provider-aws/internal/service/outposts"
@@ -736,6 +737,8 @@ func Provider() *schema.Provider {
 			"aws_networkmanager_site":            networkmanager.DataSourceSite(),
 			"aws_networkmanager_sites":           networkmanager.DataSourceSites(),
 
+			"aws_opensearch_domain": opensearch.DataSourceDomain(),
+
 			"aws_organizations_delegated_administrators": organizations.DataSourceDelegatedAdministrators(),
 			"aws_organizations_delegated_services":       organizations.DataSourceDelegatedServices(),
 			"aws_organizations_organization":             organizations.DataSourceOrganization(),
@@ -1623,6 +1626,10 @@ func Provider() *schema.Provider {
 			"aws_networkmanager_transit_gateway_connect_peer_association": networkmanager.ResourceTransitGatewayConnectPeerAssociation(),
 			"aws_networkmanager_transit_gateway_registration":             networkmanager.ResourceTransitGatewayRegistration(),
 
+			"aws_opensearch_domain":              opensearch.ResourceDomain(),
+			"aws_opensearch_domain_policy":       opensearch.ResourceDomainPolicy(),
+			"aws_opensearch_domain_saml_options": opensearch.ResourceDomainSAMLOptions(),
+
 			"aws_opsworks_application":       opsworks.ResourceApplication(),
 			"aws_opsworks_custom_layer":      opsworks.ResourceCustomLayer(),
 			"aws_opsworks_ecs_cluster_layer": opsworks.ResourceECSClusterLayer(),

internal/service/ec2/sweep.go

@@ -215,6 +215,7 @@ func init() {
 			"aws_msk_cluster",
 			"aws_network_interface",
 			"aws_networkfirewall_firewall",
+			"aws_opensearch_domain",
 			"aws_redshift_cluster",
 			"aws_route53_resolver_endpoint",
 			"aws_sagemaker_notebook_instance",

internal/service/elasticsearch/domain_policy_test.go

@@ -58,7 +58,7 @@ func TestAccElasticsearchDomainPolicy_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("aws_elasticsearch_domain.example", "elasticsearch_version", "2.3"),
 					func(s *terraform.State) error {
 						awsClient := acctest.Provider.Meta().(*conns.AWSClient)
-						expectedArn, err := buildESDomainArn(name, awsClient.Partition, awsClient.AccountID, awsClient.Region)
+						expectedArn, err := buildDomainARN(name, awsClient.Partition, awsClient.AccountID, awsClient.Region)
 						if err != nil {
 							return err
 						}
@@ -72,7 +72,7 @@ func TestAccElasticsearchDomainPolicy_basic(t *testing.T) {
 	})
 }
 
-func buildESDomainArn(name, partition, accId, region string) (string, error) {
+func buildDomainARN(name, partition, accId, region string) (string, error) {
 	if partition == "" {
 		return "", fmt.Errorf("Unable to construct ES Domain ARN because of missing AWS partition")
 	}

internal/service/opensearch/README.md

@@ -0,0 +1,13 @@
+# Terraform AWS Provider OpenSearch Package
+
+This area is primarily for AWS provider contributors and maintainers. For information on _using_ Terraform and the AWS provider, see the links below.
+
+OpenSearch is a continuation of the Elasticsearch service.
+
+
+## Handy Links
+
+* [Find out about contributing](../../../docs/contributing) to the AWS provider!
+* AWS Provider Docs: [Home](https://registry.terraform.io/providers/hashicorp/aws/latest/docs)
+* AWS Provider Docs: [One of the OpenSearch resources](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/opensearch_domain)
+* AWS Docs: [AWS SDK for Go OpenSearch](https://docs.aws.amazon.com/sdk-for-go/api/service/opensearchservice/)