[CLOUDGA-25427] Remove GOOGLECLOUD integration Feature flag and add d…

…ocumentation (#146) Remove GCP integration FF
yugabyte · Jan 3, 2025 · cf43d9d · cf43d9d
1 parent 7c17d25
commit cf43d9d
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 11 deletions.
diff --git a/docs/resources/integration.md b/docs/resources/integration.md
@@ -82,6 +82,28 @@ resource "ybm_integration" "victoriametrics" {
 }
 ```
 
+To create GoogleCloud integration
+
+```terraform
+resource "ybm_integration" "gcp" {
+  config_name = "gcp-example"
+  type        = "GOOGLECLOUD"
+  googlecloud_spec = {
+    type                        = "service_account"
+    project_id                  = "<project_id>"
+    private_key_id              = "<private_key_id>"
+    private_key                 = "<private_key>"
+    client_email                = "<client_email>"
+    client_id                   = "<client_id>"
+    auth_uri                    = "<auth_uri>"
+    token_uri                   = "<token_uri>"
+    auth_provider_x509_cert_url = "<auth_provider_x509_cert_url>"
+    client_x509_cert_url        = "<client_x509_cert_url>"
+    universe_domain             = "<universe_domain>"
+  }
+}
+```
+
 <!-- schema generated by tfplugindocs -->
 ## Schema
 

diff --git a/examples/resources/ybm_integration/googlecloud-integration.tf b/examples/resources/ybm_integration/googlecloud-integration.tf
@@ -0,0 +1,17 @@
+resource "ybm_integration" "gcp" {
+  config_name = "gcp-example"
+  type        = "GOOGLECLOUD"
+  googlecloud_spec = {
+    type                        = "service_account"
+    project_id                  = "<project_id>"
+    private_key_id              = "<private_key_id>"
+    private_key                 = "<private_key>"
+    client_email                = "<client_email>"
+    client_id                   = "<client_id>"
+    auth_uri                    = "<auth_uri>"
+    token_uri                   = "<token_uri>"
+    auth_provider_x509_cert_url = "<auth_provider_x509_cert_url>"
+    client_x509_cert_url        = "<client_x509_cert_url>"
+    universe_domain             = "<universe_domain>"
+  }
+}
diff --git a/managed/fflags/feature_flags.go b/managed/fflags/feature_flags.go
@@ -13,15 +13,13 @@ import (
 type FeatureFlag string
 
 const (
-	GOOGLECLOUD_INTEGRATION_ENABLED FeatureFlag = "GOOGLECLOUD_INTEGRATION_ENABLED"
-	CONNECTION_POOLING              FeatureFlag = "CONNECTION_POOLING"
-	DR                              FeatureFlag = "DR"
+	CONNECTION_POOLING FeatureFlag = "CONNECTION_POOLING"
+	DR                 FeatureFlag = "DR"
 )
 
 var flagEnabled = map[FeatureFlag]bool{
-	GOOGLECLOUD_INTEGRATION_ENABLED: false,
-	CONNECTION_POOLING:              false,
-	DR:                              false,
+	CONNECTION_POOLING: false,
+	DR:                 false,
 }
 
 func (f FeatureFlag) String() string {

diff --git a/managed/resource_integration.go b/managed/resource_integration.go
@@ -16,7 +16,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
-	"github.com/yugabyte/terraform-provider-ybm/managed/fflags"
 	planmodifier "github.com/yugabyte/terraform-provider-ybm/managed/plan_modifier"
 	openapiclient "github.com/yugabyte/yugabytedb-managed-go-client-internal"
 )
@@ -329,10 +328,6 @@ func (r resourceIntegration) Create(ctx context.Context, req tfsdk.CreateResourc
 		resp.Diagnostics.AddError(GetApiErrorDetails(err), "")
 		return
 	}
-	if *telemetrySinkTypeEnum == openapiclient.TELEMETRYPROVIDERTYPEENUM_GOOGLECLOUD && !fflags.IsFeatureFlagEnabled(fflags.GOOGLECLOUD_INTEGRATION_ENABLED) {
-		resp.Diagnostics.AddError("Invalid integration type", "Integration of type GOOGLECLOUD is currently not supported")
-		return
-	}
 
 	apiClient := r.p.client
 

diff --git a/templates/resources/integration.md.tmpl b/templates/resources/integration.md.tmpl
@@ -31,4 +31,8 @@ To create VictoriaMetrics integration
 
 {{ tffile "examples/resources/ybm_integration/victoriametrics-integration.tf" }}
 
+To create GoogleCloud integration
+
+{{ tffile "examples/resources/ybm_integration/googlecloud-integration.tf" }}
+
 {{ .SchemaMarkdown | trimspace }}