Merge pull request #33925 from mikekinlock/f-elasticsearch-adding-vpc…

…-endpoint

Elasticsearch adding vpc endpoint resource

.changelog/33925.txt

@@ -0,0 +1,4 @@
+
+```release-note:new-resource
+aws_elasticsearch_vpc_endpoint
+```

internal/service/elasticsearch/domain.go

@@ -807,7 +807,7 @@ func resourceDomainRead(ctx context.Context, d *schema.ResourceData, meta interf
 	}
 
 	if ds.VPCOptions != nil {
-		if err := d.Set("vpc_options", flattenVPCDerivedInfo(ds.VPCOptions)); err != nil {
+		if err := d.Set("vpc_options", []interface{}{flattenVPCDerivedInfo(ds.VPCOptions)}); err != nil {
 			return sdkdiag.AppendErrorf(diags, "setting vpc_options: %s", err)
 		}
 

internal/service/elasticsearch/domain_data_source.go

@@ -419,7 +419,7 @@ func dataSourceDomainRead(ctx context.Context, d *schema.ResourceData, meta inte
 	}
 
 	if ds.VPCOptions != nil {
-		if err := d.Set("vpc_options", flattenVPCDerivedInfo(ds.VPCOptions)); err != nil {
+		if err := d.Set("vpc_options", []interface{}{flattenVPCDerivedInfo(ds.VPCOptions)}); err != nil {
 			return sdkdiag.AppendErrorf(diags, "setting vpc_options: %s", err)
 		}
 

internal/service/elasticsearch/exports_test.go

@@ -0,0 +1,9 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+package elasticsearch
+
+// Exports for use in tests only.
+var (
+	FindVPCEndpointByID = findVPCEndpointByID
+	VPCEndpointsError   = vpcEndpointsError
+)

internal/service/elasticsearch/flex.go

@@ -113,13 +113,17 @@ func expandEncryptAtRestOptions(m map[string]interface{}) *elasticsearch.Encrypt
 }
 
 func expandVPCOptions(m map[string]interface{}) *elasticsearch.VPCOptions {
+	if m == nil {
+		return nil
+	}
+
 	options := elasticsearch.VPCOptions{}
 
-	if v, ok := m["security_group_ids"]; ok {
-		options.SecurityGroupIds = flex.ExpandStringSet(v.(*schema.Set))
+	if v, ok := m["security_group_ids"].(*schema.Set); ok && v.Len() > 0 {
+		options.SecurityGroupIds = flex.ExpandStringSet(v)
 	}
-	if v, ok := m["subnet_ids"]; ok {
-		options.SubnetIds = flex.ExpandStringSet(v.(*schema.Set))
+	if v, ok := m["subnet_ids"].(*schema.Set); ok && v.Len() > 0 {
+		options.SubnetIds = flex.ExpandStringSet(v)
 	}
 
 	return &options
@@ -215,7 +219,11 @@ func flattenSnapshotOptions(snapshotOptions *elasticsearch.SnapshotOptions) []ma
 	return []map[string]interface{}{m}
 }
 
-func flattenVPCDerivedInfo(o *elasticsearch.VPCDerivedInfo) []map[string]interface{} {
+func flattenVPCDerivedInfo(o *elasticsearch.VPCDerivedInfo) map[string]interface{} {
+	if o == nil {
+		return nil
+	}
+
 	m := map[string]interface{}{}
 
 	if o.AvailabilityZones != nil {
@@ -231,5 +239,5 @@ func flattenVPCDerivedInfo(o *elasticsearch.VPCDerivedInfo) []map[string]interfa
 		m["vpc_id"] = aws.StringValue(o.VPCId)
 	}
 
-	return []map[string]interface{}{m}
+	return m
 }