feat: TLS configuration for ESS (#7)

* Enable ESS Signed-off-by: I534922 <[email protected]> * secret store TLS internals Signed-off-by: I534922 <[email protected]> * update provider to latest tf version, fix ESS Signed-off-by: I534922 <[email protected]> --------- Signed-off-by: I534922 <[email protected]>
crossplane-contrib · Nov 3, 2023 · 1b97f75 · 1b97f75
1 parent 6c558b4
commit 1b97f75
Show file tree

Hide file tree

Showing 16 changed files with 501 additions and 36 deletions.
diff --git a/Makefile b/Makefile
@@ -8,10 +8,10 @@ export TERRAFORM_VERSION ?= 1.3.3
 
 export TERRAFORM_PROVIDER_SOURCE := confluentinc/confluent
 export TERRAFORM_PROVIDER_REPO := https://github.com/confluentinc/terraform-provider-confluent
-export TERRAFORM_PROVIDER_VERSION := 1.28.0
+export TERRAFORM_PROVIDER_VERSION := 1.55.0
 export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-confluent
 export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX ?= $(TERRAFORM_PROVIDER_REPO)/releases/download/v$(TERRAFORM_PROVIDER_VERSION)
-export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-confluent_1.28.0
+export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-confluent_1.55.0
 export TERRAFORM_DOCS_PATH := docs/resources
 
 PLATFORMS ?= linux_amd64 linux_arm64
@@ -127,6 +127,7 @@ pull-docs:
 	@git -C "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" sparse-checkout set "$(TERRAFORM_DOCS_PATH)"
 generate.init: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs
 
+
 .PHONY: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs
 # ====================================================================================
 # Targets

diff --git a/apis/confluent/v1alpha1/zz_cluster_types.go b/apis/confluent/v1alpha1/zz_cluster_types.go
diff --git a/apis/confluent/v1alpha1/zz_generated.deepcopy.go b/apis/confluent/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/provider/main.go b/cmd/provider/main.go
@@ -97,7 +97,7 @@ func main() {
 		o.SecretStoreConfigGVK = &v1alpha1.StoreConfigGroupVersionKind
 		log.Info("Alpha feature enabled", "flag", features.EnableAlphaExternalSecretStores)
 
-		o.ESSOptions = &xpcontroller.ESSOptions{}
+		o.ESSOptions = &tjcontroller.ESSOptions{}
 		if *essTLSCertsPath != "" {
 			log.Info("ESS TLS certificates path is set. Loading mTLS configuration.")
 			tCfg, err := certificates.LoadMTLSConfig(filepath.Join(*essTLSCertsPath, "ca.crt"), filepath.Join(*essTLSCertsPath, "tls.crt"), filepath.Join(*essTLSCertsPath, "tls.key"), false)