Merge pull request #32990 from DanielRieske/f-aws_opensearch_outbound…

…_connection_mode_attribute Add connection_mode field to OpenSearch outbound connection resource
hashicorp · Sep 26, 2023 · c15b512 · c15b512
2 parents cba3ed6 + 8361bb1
commit c15b512
Show file tree

Hide file tree

Showing 6 changed files with 458 additions and 113 deletions.
diff --git a/.changelog/32990.txt b/.changelog/32990.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_opensearch_outbound_connection: Add `connection_properties`, `connection_mode` and `accept_connection` arguments
+```
diff --git a/internal/service/opensearch/inbound_connection_accepter.go b/internal/service/opensearch/inbound_connection_accepter.go
@@ -35,8 +35,8 @@ func ResourceInboundConnectionAccepter() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Create: schema.DefaultTimeout(1 * time.Minute),
-			Delete: schema.DefaultTimeout(1 * time.Minute),
+			Create: schema.DefaultTimeout(5 * time.Minute),
+			Delete: schema.DefaultTimeout(5 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{
@@ -216,7 +216,7 @@ func statusInboundConnection(ctx context.Context, conn *opensearchservice.OpenSe
 	}
 }
 
-func waitInboundConnectionAccepted(ctx context.Context, conn *opensearchservice.OpenSearchService, id string, timeout time.Duration) (*opensearchservice.InboundConnection, error) {
+func waitInboundConnectionAccepted(ctx context.Context, conn *opensearchservice.OpenSearchService, id string, timeout time.Duration) (*opensearchservice.InboundConnection, error) { //nolint:unparam
 	stateConf := &retry.StateChangeConf{
 		Pending: []string{opensearchservice.InboundConnectionStatusCodeProvisioning, opensearchservice.InboundConnectionStatusCodeApproved},
 		Target:  []string{opensearchservice.InboundConnectionStatusCodeActive},