rework connection pool

ovh/data_cloud_project_database_log_subscription.go

@@ -94,7 +94,7 @@ func dataSourceCloudProjectDatabaseLogSubscriptionRead(ctx context.Context, d *s
 	res := &CloudProjectDatabaseLogSubscriptionResponse{}
 
 	log.Printf("[DEBUG] Will read log subscrition %s from cluster %s from project %s", id, clusterID, serviceName)
-	if err := config.OVHClient.Get(endpoint, res); err != nil {
+	if err := config.OVHClient.GetWithContext(ctx, endpoint, res); err != nil {
 		return diag.FromErr(helpers.CheckDeleted(d, err, endpoint))
 	}
 

ovh/data_cloud_project_database_log_subscriptions.go

@@ -59,7 +59,7 @@ func dataSourceCloudProjectDatabaseLogSubscriptionsRead(ctx context.Context, d *
 	res := make([]string, 0)
 
 	log.Printf("[DEBUG] Will read log subscritions from cluster %s from project %s", clusterID, serviceName)
-	if err := config.OVHClient.Get(endpoint, &res); err != nil {
+	if err := config.OVHClient.GetWithContext(ctx, endpoint, &res); err != nil {
 		return diag.Errorf("Error calling GET %s:\n\t %q", endpoint, err)
 	}
 

ovh/data_cloud_project_database_postgresql_connection_pool.go

@@ -73,36 +73,36 @@ func dataSourceCloudProjectDatabasePostgresqlConnectionPool() *schema.Resource {
 func dataSourceCloudProjectDatabasePostgresqlConnectionPoolRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	config := meta.(*Config)
 	serviceName := d.Get("service_name").(string)
-	clusterId := d.Get("cluster_id").(string)
+	clusterID := d.Get("cluster_id").(string)
 	name := d.Get("name").(string)
 
 	listEndpoint := fmt.Sprintf("/cloud/project/%s/database/postgresql/%s/connectionPool",
 		url.PathEscape(serviceName),
-		url.PathEscape(clusterId),
+		url.PathEscape(clusterID),
 	)
 
 	listRes := make([]string, 0)
 
-	log.Printf("[DEBUG] Will read connectionPools from cluster %s from project %s", clusterId, serviceName)
+	log.Printf("[DEBUG] Will read connectionPools from cluster %s from project %s", clusterID, serviceName)
 	if err := config.OVHClient.GetWithContext(ctx, listEndpoint, &listRes); err != nil {
 		return diag.Errorf("Error calling GET %s:\n\t %q", listEndpoint, err)
 	}
 
 	for _, id := range listRes {
 		endpoint := fmt.Sprintf("/cloud/project/%s/database/postgresql/%s/connectionPool/%s",
 			url.PathEscape(serviceName),
-			url.PathEscape(clusterId),
+			url.PathEscape(clusterID),
 			url.PathEscape(id),
 		)
 		res := &CloudProjectDatabasePostgresqlConnectionPoolResponse{}
 
-		log.Printf("[DEBUG] Will read connectionPool %s from cluster %s from project %s", id, clusterId, serviceName)
+		log.Printf("[DEBUG] Will read connectionPool %s from cluster %s from project %s", id, clusterID, serviceName)
 		if err := config.OVHClient.GetWithContext(ctx, endpoint, res); err != nil {
 			return diag.Errorf("Error calling GET %s:\n\t %q", endpoint, err)
 		}
 
 		if res.Name == name {
-			for k, v := range res.ToMap() {
+			for k, v := range res.toMap() {
 				if k != "id" {
 					d.Set(k, v)
 				} else {
@@ -114,5 +114,5 @@ func dataSourceCloudProjectDatabasePostgresqlConnectionPoolRead(ctx context.Cont
 		}
 	}
 
-	return diag.Errorf("ConnectionPool name %s not found for cluster %s from project %s", name, clusterId, serviceName)
+	return diag.Errorf("ConnectionPool name %s not found for cluster %s from project %s", name, clusterID, serviceName)
 }

ovh/data_cloud_project_database_postgresql_connection_pools.go

@@ -0,0 +1,64 @@
+package ovh
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"net/url"
+	"sort"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/ovh/terraform-provider-ovh/ovh/helpers"
+	"github.com/ovh/terraform-provider-ovh/ovh/helpers/hashcode"
+)
+
+func dataSourceCloudProjectDatabasePostgresqlConnectionPools() *schema.Resource {
+	return &schema.Resource{
+		ReadContext: dataSourceCloudProjectDatabasePostgresqlConnectionPoolsRead,
+		Schema: map[string]*schema.Schema{
+			"service_name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				DefaultFunc: schema.EnvDefaultFunc("OVH_CLOUD_PROJECT_SERVICE", nil),
+			},
+			"cluster_id": {
+				Type:        schema.TypeString,
+				Description: "Cluster ID",
+				Required:    true,
+			},
+
+			//Computed
+			"connection_pool_ids": {
+				Type:        schema.TypeList,
+				Description: "List of connection pools ids",
+				Computed:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
+		},
+	}
+}
+
+func dataSourceCloudProjectDatabasePostgresqlConnectionPoolsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	config := meta.(*Config)
+	serviceName := d.Get("service_name").(string)
+	clusterID := d.Get("cluster_id").(string)
+
+	endpoint := fmt.Sprintf("/cloud/project/%s/database/postgresql/%s/connectionPool",
+		url.PathEscape(serviceName),
+		url.PathEscape(clusterID),
+	)
+	res := make([]string, 0)
+
+	log.Printf("[DEBUG] Will read connection pools from cluster %s from project %s", clusterID, serviceName)
+	if err := config.OVHClient.GetWithContext(ctx, endpoint, &res); err != nil {
+		return diag.FromErr(helpers.CheckDeleted(d, err, endpoint))
+	}
+
+	// sort.Strings sorts in place, returns nothing
+	sort.Strings(res)
+
+	d.SetId(hashcode.Strings(res))
+	d.Set("connection_pool_ids", res)
+	return nil
+}

ovh/data_cloud_project_database_postgresql_connection_pools_test.go

@@ -0,0 +1,64 @@
+package ovh
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+)
+
+const testAccCloudProjectDatabasePostgresqlConnectionPoolsDatasourceConfig = testAccCloudProjectDatabasePostgresqlConnectionPoolConfig + `
+
+data "ovh_cloud_project_database_postgresql_connection_pools" "connection_pools" {
+  service_name = ovh_cloud_project_database_postgresql_connection_pool.connection_pool.service_name
+  cluster_id   = ovh_cloud_project_database_postgresql_connection_pool.connection_pool.cluster_id
+}
+`
+
+func TestAccCloudProjectDatabasePostgresqlConnectionPoolsDataSource_basic(t *testing.T) {
+	serviceName := os.Getenv("OVH_CLOUD_PROJECT_SERVICE_TEST")
+	version := os.Getenv("OVH_CLOUD_PROJECT_DATABASE_POSTGRESQL_VERSION_TEST")
+	if version == "" {
+		version = os.Getenv("OVH_CLOUD_PROJECT_DATABASE_VERSION_TEST")
+	}
+	region := os.Getenv("OVH_CLOUD_PROJECT_DATABASE_REGION_TEST")
+	flavor := os.Getenv("OVH_CLOUD_PROJECT_DATABASE_FLAVOR_TEST")
+	description := acctest.RandomWithPrefix(test_prefix)
+	name := "johndoe"
+	replication := "replication"
+	connectionPoolName := "test_connection_pool"
+	mode := "session"
+	size := 13
+
+	config := fmt.Sprintf(
+		testAccCloudProjectDatabasePostgresqlConnectionPoolsDatasourceConfig,
+		serviceName,
+		description,
+		version,
+		region,
+		flavor,
+		name,
+		replication,
+		connectionPoolName,
+		mode,
+		size,
+	)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheckCloudDatabaseNoEngine(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"data.ovh_cloud_project_database_postgresql_connection_pools.connection_pools",
+						"connection_pool_ids.#",
+					),
+				),
+			},
+		},
+	})
+}

ovh/provider.go

@@ -73,6 +73,7 @@ func Provider() *schema.Provider {
 			"ovh_cloud_project_database_opensearch_user":                     dataSourceCloudProjectDatabaseOpensearchUser(),
 			"ovh_cloud_project_database_postgresql_user":                     dataSourceCloudProjectDatabasePostgresqlUser(),
 			"ovh_cloud_project_database_postgresql_connection_pool":          dataSourceCloudProjectDatabasePostgresqlConnectionPool(),
+			"ovh_cloud_project_database_postgresql_connection_pools":         dataSourceCloudProjectDatabasePostgresqlConnectionPools(),
 			"ovh_cloud_project_database_redis_user":                          dataSourceCloudProjectDatabaseRedisUser(),
 			"ovh_cloud_project_database_user":                                dataSourceCloudProjectDatabaseUser(),
 			"ovh_cloud_project_database_users":                               dataSourceCloudProjectDatabaseUsers(),

ovh/resource_cloud_project_database.go

@@ -371,7 +371,7 @@ func resourceCloudProjectDatabaseUpdate(ctx context.Context, d *schema.ResourceD
 		return diag.Errorf("service update failed : %q", err)
 	}
 	log.Printf("[DEBUG] Will update database: %+v", params)
-	err = config.OVHClient.Put(endpoint, params, nil)
+	err = config.OVHClient.PutWithContext(ctx, endpoint, params, nil)
 	if err != nil {
 		return diag.Errorf("calling Put %s with params %v:\n\t %q", endpoint, params, err)
 	}
@@ -387,7 +387,7 @@ func resourceCloudProjectDatabaseUpdate(ctx context.Context, d *schema.ResourceD
 
 		advancedConfigEndpoint := fmt.Sprintf("%s/advancedConfiguration", endpoint)
 
-		err = config.OVHClient.Put(advancedConfigEndpoint, acParams, nil)
+		err = config.OVHClient.PutWithContext(ctx, advancedConfigEndpoint, acParams, nil)
 		if err != nil {
 			return diag.Errorf("calling Put %s with params %v:\n\t %q", advancedConfigEndpoint, acParams, err)
 		}

ovh/resource_cloud_project_database_log_subscription.go

@@ -131,7 +131,7 @@ func resourceCloudProjectDatabaseLogSubscriptionCreate(ctx context.Context, d *s
 	res := &CloudProjectDatabaseLogSubscriptionResponse{}
 
 	log.Printf("[DEBUG] Will create Log subscrition : %+v for cluster %s from project %s", params, clusterID, serviceName)
-	err := config.OVHClient.Post(endpoint, params, res)
+	err := config.OVHClient.PostWithContext(ctx, endpoint, params, res)
 	if err != nil {
 		diag.Errorf("calling Post %s with params %+v:\n\t %q", endpoint, params, err)
 	}
@@ -165,7 +165,7 @@ func resourceCloudProjectDatabaseLogSubscriptionRead(ctx context.Context, d *sch
 	res := &CloudProjectDatabaseLogSubscriptionResponse{}
 
 	log.Printf("[DEBUG] Will read log subscrition %s from cluster %s from project %s", id, clusterID, serviceName)
-	if err := config.OVHClient.Get(endpoint, res); err != nil {
+	if err := config.OVHClient.GetWithContext(ctx, endpoint, res); err != nil {
 		return diag.FromErr(helpers.CheckDeleted(d, err, endpoint))
 	}
 
@@ -200,7 +200,7 @@ func resourceCloudProjectDatabaseLogSubscriptionDelete(ctx context.Context, d *s
 	res := &CloudProjectDatabaseLogSubscriptionResponse{}
 
 	log.Printf("[DEBUG] Will delete Log subscrition %s from cluster %s from project %s", id, clusterID, serviceName)
-	err := config.OVHClient.Delete(endpoint, res)
+	err := config.OVHClient.DeleteWithContext(ctx, endpoint, res)
 	if err != nil {
 		diag.Errorf("calling DELETE %s:\n\t %q", endpoint, err)
 	}

ovh/resource_cloud_project_database_m3db_namespace.go

@@ -209,7 +209,7 @@ func resourceCloudProjectDatabaseM3dbNamespaceUpdate(ctx context.Context, d *sch
 	params := (&CloudProjectDatabaseM3dbNamespaceUpdateOpts{}).FromResource(d)
 
 	log.Printf("[DEBUG] Will update namespace: %+v from cluster %s from project %s", params, clusterId, serviceName)
-	err := config.OVHClient.Put(endpoint, params, nil)
+	err := config.OVHClient.PutWithContext(ctx, endpoint, params, nil)
 	if err != nil {
 		return diag.Errorf("calling Put %s with params %+v:\n\t %q", endpoint, params, err)
 	}

ovh/resource_cloud_project_database_mongodb_user.go

@@ -194,7 +194,7 @@ func resourceCloudProjectDatabaseMongodbUserUpdate(ctx context.Context, d *schem
 		retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate),
 			func() *retry.RetryError {
 				log.Printf("[DEBUG] Will update user: %+v from cluster %s from project %s", params, clusterId, serviceName)
-				rErr := config.OVHClient.Put(endpoint, params, nil)
+				rErr := config.OVHClient.PutWithContext(ctx, endpoint, params, nil)
 				if rErr != nil {
 					if errOvh, ok := rErr.(*ovh.APIError); ok && (errOvh.Code == 409) {
 						return retry.RetryableError(rErr)