Merge pull request hashicorp#38901 from DanielRieske/f/migrate-opense…

…arch-sdkv2 Migrate `Opensearch` resources to AWS SDK v2
DanielRieske · Aug 19, 2024 · 1956579 · 1956579
2 parents 8e9f949 + 2a87984
commit 1956579
Show file tree

Hide file tree

Showing 38 changed files with 1,113 additions and 985 deletions.
diff --git a/go.mod b/go.mod
@@ -165,6 +165,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.41.1
 	github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.5.4
 	github.com/aws/aws-sdk-go-v2/service/oam v1.13.5
+	github.com/aws/aws-sdk-go-v2/service/opensearch v1.39.3
 	github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.13.4
 	github.com/aws/aws-sdk-go-v2/service/organizations v1.30.3
 	github.com/aws/aws-sdk-go-v2/service/osis v1.12.4

diff --git a/go.sum b/go.sum
@@ -360,6 +360,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.5.4 h1:u/vDkh3lVqFHavOO2u
 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.5.4/go.mod h1:kLZ+wCSQ04+zCjbymFTlNmlB78Mxi7dORmfbeChB7CY=
 github.com/aws/aws-sdk-go-v2/service/oam v1.13.5 h1:51VYR5C0+/QEUrFURnwIGvT1eyiaKwnfQCoXVMRKtmg=
 github.com/aws/aws-sdk-go-v2/service/oam v1.13.5/go.mod h1:dwn0suVbD6cdXDZQsEr5iYf4dhxDVr5wEAKSiCLSSQ8=
+github.com/aws/aws-sdk-go-v2/service/opensearch v1.39.3 h1:EoXdh45m+CNUmP1tRFz+SD78qvsR4i5u7bFnMljgRV0=
+github.com/aws/aws-sdk-go-v2/service/opensearch v1.39.3/go.mod h1:dt1En8oUmuPUz5AZjWi+fBeekG3O8WejKi1wgoafwNk=
 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.13.4 h1:3Y4N61NHpii/6m38masM+VYJgnHhGtktEyJVZcTv0nc=
 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.13.4/go.mod h1:pQOhum5PBwXCSspA6bT4EZLhpawWF2aHTToUu/5vIBg=
 github.com/aws/aws-sdk-go-v2/service/organizations v1.30.3 h1:gYS53GRIaSesL04BlZA9MEBzDlENidWR/JDBXhZonFs=

diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
diff --git a/internal/service/opensearch/consts.go b/internal/service/opensearch/consts.go
@@ -10,5 +10,5 @@ import (
 const (
 	// OpenSearch sometimes needs a longer IAM propagation time than most services,
 	// especially with acceptance tests
-	propagationTimeout = 10 * time.Minute
+	propagationTimeout = 30 * time.Minute
 )