Upgrade terraform-provider-aiven to v4.9.0

patches/0001-Add-shim.NewProvider-to-expose-internal-provider.New.patch

@@ -1,7 +1,7 @@
-From 378d643426cf368254b56314f8593a952a40ff22 Mon Sep 17 00:00:00 2001
+From d276ae78f9d250343de08a48e4a93db4eba92cdc Mon Sep 17 00:00:00 2001
 From: Aaron Friel <[email protected]>
 Date: Mon, 6 Mar 2023 19:13:42 -0800
-Subject: [PATCH 1/2] Add `shim.NewProvider` to expose `internal/provider.New`
+Subject: [PATCH 1/3] Add `shim.NewProvider` to expose `internal/provider.New`
 
 ---
  shim/shim.go | 17 +++++++++++++++++
@@ -32,5 +32,5 @@ index 0000000..796cd94
 +	return pfProvider.New(version)()
 +}
 -- 
-2.41.0
+2.39.3 (Apple Git-145)
 

patches/0002-Avoid-panic-in-custom_diff.patch

@@ -1,7 +1,7 @@
-From 1549e8211905cfe8fb432a8fdd3c82f70bb26f89 Mon Sep 17 00:00:00 2001
+From 7e63e0bf8f44415fcfad9c3f204cac4ae4b0b399 Mon Sep 17 00:00:00 2001
 From: Anton Tayanovskyy <[email protected]>
 Date: Thu, 20 Apr 2023 16:24:38 -0400
-Subject: [PATCH 2/2] Avoid panic in custom_diff
+Subject: [PATCH 2/3] Avoid panic in custom_diff
 
 ---
  internal/schemautil/custom_diff.go | 4 ++++
@@ -23,5 +23,5 @@ index 5019feb..ed27976 100644
  		if strings.Contains(k, "_user_config") { // we only care about *_user_config
  			if err := checkForMultipleValues(v); err != nil {
 -- 
-2.41.0
+2.39.3 (Apple Git-145)
 

patches/0003-Internal-provider-has-moved-update-shim.patch

@@ -0,0 +1,25 @@
+From 08b1e731685c88d95465f1245562dac997424d88 Mon Sep 17 00:00:00 2001
+From: Thomas Kappler <[email protected]>
+Date: Thu, 28 Sep 2023 20:48:51 +0200
+Subject: [PATCH 3/3] Internal provider has moved, update shim
+
+---
+ shim/shim.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shim/shim.go b/shim/shim.go
+index 796cd94..53e4cf3 100644
+--- a/shim/shim.go
++++ b/shim/shim.go
+@@ -4,7 +4,7 @@ import (
+ 	pf "github.com/hashicorp/terraform-plugin-framework/provider"
+ 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+-	pfProvider "github.com/aiven/terraform-provider-aiven/internal/provider"
++	pfProvider "github.com/aiven/terraform-provider-aiven/internal/plugin"
+ 	"github.com/aiven/terraform-provider-aiven/internal/sdkprovider/provider"
+ )
+
+-- 
+2.39.3 (Apple Git-145)
+

provider/cmd/pulumi-resource-aiven/bridge-metadata.json

@@ -966,6 +966,10 @@
                 "current": "aiven:index/openSearchAclRule:OpenSearchAclRule",
                 "majorVersion": 6
             },
+            "aiven_opensearch_security_plugin_config": {
+                "current": "aiven:index/opensearchSecurityPluginConfig:OpensearchSecurityPluginConfig",
+                "majorVersion": 6
+            },
             "aiven_opensearch_user": {
                 "current": "aiven:index/opensearchUser:OpensearchUser",
                 "majorVersion": 6
@@ -2339,6 +2343,10 @@
                 "current": "aiven:index/getOpenSearchAclRule:getOpenSearchAclRule",
                 "majorVersion": 6
             },
+            "aiven_opensearch_security_plugin_config": {
+                "current": "aiven:index/getOpensearchSecurityPluginConfig:getOpensearchSecurityPluginConfig",
+                "majorVersion": 6
+            },
             "aiven_opensearch_user": {
                 "current": "aiven:index/getOpensearchUser:getOpensearchUser",
                 "majorVersion": 6
@@ -2778,6 +2786,7 @@
             "aiven:index/openSearch:OpenSearch": 0,
             "aiven:index/openSearchAclConfig:OpenSearchAclConfig": 0,
             "aiven:index/openSearchAclRule:OpenSearchAclRule": 0,
+            "aiven:index/opensearchSecurityPluginConfig:OpensearchSecurityPluginConfig": 0,
             "aiven:index/opensearchUser:OpensearchUser": 0,
             "aiven:index/organization:Organization": 1,
             "aiven:index/organizationUser:OrganizationUser": 0,
@@ -2843,6 +2852,7 @@
             "aiven:index/getOpenSearch:getOpenSearch": 0,
             "aiven:index/getOpenSearchAclConfig:getOpenSearchAclConfig": 0,
             "aiven:index/getOpenSearchAclRule:getOpenSearchAclRule": 0,
+            "aiven:index/getOpensearchSecurityPluginConfig:getOpensearchSecurityPluginConfig": 0,
             "aiven:index/getOpensearchUser:getOpensearchUser": 0,
             "aiven:index/getOrganization:getOrganization": 1,
             "aiven:index/getOrganizationUser:getOrganizationUser": 0,
@@ -2914,6 +2924,7 @@
             "aiven:index/openSearch:OpenSearch": "aiven_opensearch",
             "aiven:index/openSearchAclConfig:OpenSearchAclConfig": "aiven_opensearch_acl_config",
             "aiven:index/openSearchAclRule:OpenSearchAclRule": "aiven_opensearch_acl_rule",
+            "aiven:index/opensearchSecurityPluginConfig:OpensearchSecurityPluginConfig": "aiven_opensearch_security_plugin_config",
             "aiven:index/opensearchUser:OpensearchUser": "aiven_opensearch_user",
             "aiven:index/organization:Organization": "aiven_organization",
             "aiven:index/organizationUser:OrganizationUser": "aiven_organization_user",
@@ -2979,6 +2990,7 @@
             "aiven:index/getOpenSearch:getOpenSearch": "aiven_opensearch",
             "aiven:index/getOpenSearchAclConfig:getOpenSearchAclConfig": "aiven_opensearch_acl_config",
             "aiven:index/getOpenSearchAclRule:getOpenSearchAclRule": "aiven_opensearch_acl_rule",
+            "aiven:index/getOpensearchSecurityPluginConfig:getOpensearchSecurityPluginConfig": "aiven_opensearch_security_plugin_config",
             "aiven:index/getOpensearchUser:getOpensearchUser": "aiven_opensearch_user",
             "aiven:index/getOrganization:getOrganization": "aiven_organization",
             "aiven:index/getOrganizationUser:getOrganizationUser": "aiven_organization_user",
@@ -5460,6 +5472,11 @@
                 "integrationType": "integration_type",
                 "sourceServiceName": "source_service_name"
             },
+            "aiven:index/getOpensearchSecurityPluginConfig:getOpensearchSecurityPluginConfig": {
+                "adminEnabled": "admin_enabled",
+                "adminPassword": "admin_password",
+                "serviceName": "service_name"
+            },
             "aiven:index/getOpensearchUser:getOpensearchUser": {
                 "serviceName": "service_name"
             },
@@ -6207,6 +6224,11 @@
             "aiven:index/openSearchAclRule:OpenSearchAclRule": {
                 "serviceName": "service_name"
             },
+            "aiven:index/opensearchSecurityPluginConfig:OpensearchSecurityPluginConfig": {
+                "adminEnabled": "admin_enabled",
+                "adminPassword": "admin_password",
+                "serviceName": "service_name"
+            },
             "aiven:index/opensearchUser:OpensearchUser": {
                 "serviceName": "service_name"
             },

provider/go.mod

@@ -4,14 +4,14 @@ go 1.21
 
 replace (
 	github.com/aiven/terraform-provider-aiven => ../upstream
-	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230710100801-03a71d0fca3d
+	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20230912190043-e6d96b3b8f7e
 	github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
 )
 
 require (
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.27.0 // indirect
-	github.com/pulumi/pulumi-terraform-bridge/pf v0.16.0
-	github.com/pulumi/pulumi-terraform-bridge/v3 v3.59.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.28.0 // indirect
+	github.com/pulumi/pulumi-terraform-bridge/pf v0.16.1
+	github.com/pulumi/pulumi-terraform-bridge/v3 v3.60.1
 	github.com/pulumi/pulumi/pkg/v3 v3.81.0 // indirect
 	github.com/pulumi/pulumi/sdk/v3 v3.81.0
 )
@@ -27,6 +27,7 @@ require (
 	cloud.google.com/go/logging v1.7.0 // indirect
 	cloud.google.com/go/longrunning v0.5.1 // indirect
 	cloud.google.com/go/storage v1.30.1 // indirect
+	dario.cat/mergo v1.0.0 // indirect
 	github.com/AlecAivazis/survey/v2 v2.0.5 // indirect
 	github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1 // indirect
@@ -49,15 +50,15 @@ require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
-	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/aiven/aiven-go-client v1.35.0 // indirect
+	github.com/aiven/aiven-go-client v1.36.0 // indirect
 	github.com/aiven/go-api-schemas v1.27.1-0.20230823111901-1e0306909d02 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/armon/go-metrics v0.4.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/atotto/clipboard v0.1.4 // indirect
@@ -103,9 +104,9 @@ require (
 	github.com/ettle/strcase v0.1.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
-	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.4.1 // indirect
-	github.com/go-git/go-git/v5 v5.6.1 // indirect
+	github.com/go-git/go-git/v5 v5.8.1 // indirect
 	github.com/gofrs/uuid v4.2.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
@@ -132,7 +133,7 @@ require (
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.10 // indirect
+	github.com/hashicorp/go-plugin v1.5.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-safetemp v1.0.0 // indirect
@@ -143,28 +144,29 @@ require (
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/hashicorp/hc-install v0.5.2 // indirect
+	github.com/hashicorp/hc-install v0.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.17.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.18.0 // indirect
 	github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.18.1 // indirect
+	github.com/hashicorp/terraform-exec v0.19.0 // indirect
 	github.com/hashicorp/terraform-json v0.17.1 // indirect
-	github.com/hashicorp/terraform-plugin-framework v1.3.5 // indirect
+	github.com/hashicorp/terraform-plugin-framework v1.4.0 // indirect
 	github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 // indirect
-	github.com/hashicorp/terraform-plugin-framework-validators v0.11.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.18.0 // indirect
+	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.19.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
-	github.com/hashicorp/terraform-plugin-testing v1.4.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.2.1 // indirect
+	github.com/hashicorp/terraform-plugin-mux v0.12.0 // indirect
+	github.com/hashicorp/terraform-plugin-testing v1.5.1 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.2 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/vault/api v1.8.2 // indirect
 	github.com/hashicorp/vault/sdk v0.6.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/iancoleman/strcase v0.2.0 // indirect
 	github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -207,7 +209,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/pulumi/pulumi-java/pkg v0.9.6 // indirect
-	github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 // indirect
+	github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.6 // indirect
 	github.com/pulumi/pulumi-yaml v1.2.2 // indirect
 	github.com/pulumi/schema-tools v0.1.2 // indirect
 	github.com/pulumi/terraform-diff-reader v0.0.2 // indirect
@@ -221,7 +223,7 @@ require (
 	github.com/segmentio/encoding v0.3.5 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/skeema/knownhosts v1.1.0 // indirect
+	github.com/skeema/knownhosts v1.2.0 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
@@ -239,21 +241,22 @@ require (
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/zclconf/go-cty v1.13.2 // indirect
+	github.com/zclconf/go-cty v1.14.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	gocloud.dev v0.27.0 // indirect
 	gocloud.dev/secrets/hashivault v0.27.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.11.0 // indirect
+	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.13.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.9.3 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect