Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add connection_mode field to OpenSearch outbound connection resource #32990

Merged
merged 11 commits into from
Sep 26, 2023
Merged

Add connection_mode field to OpenSearch outbound connection resource #32990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0714f93
feat: added connection_mode attribute + tests
DanielRieske Aug 13, 2023
82c1de4
feat: changed type
DanielRieske Aug 13, 2023
491e69a
feat: added accept_connection feature
DanielRieske Aug 13, 2023
7e4cb34
feat: added documentation
DanielRieske Aug 14, 2023
a2c97ce
feat: changed expected connection_status in tests
DanielRieske Aug 14, 2023
2b84f51
chore: added changelog
DanielRieske Aug 14, 2023
4beb5c4
chore: removed whitespaces
DanielRieske Aug 14, 2023
372c29b
chore: removed whitespace
DanielRieske Aug 14, 2023
4c07e38
Merge branch 'main' into HEAD
ewbankkit Sep 25, 2023
a0693f0
r/aws_opensearch_outbound_connection: Cosmetics.
ewbankkit Sep 25, 2023
8361bb1
Fix golangci-lint 'unparam'.
ewbankkit Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/32990.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_opensearch_outbound_connection: Add `connection_properties`, `connection_mode` and `accept_connection` arguments
```
6 changes: 3 additions & 3 deletions internal/service/opensearch/inbound_connection_accepter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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},
Expand Down
Loading
Loading