fix: read endpoint type from schema (IBM-Cloud#5552)

* fix: read endpoint type from schema * add empty string check * update code --------- Co-authored-by: Deeksha Sharma <deekshasharma@Deekshas-MacBook-Pro.local>
powervs-ibm · Aug 9, 2024 · 59a6f73 · 59a6f73
1 parent 5a74d81
commit 59a6f73
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/ibm/service/cos/data_source_ibm_cos_bucket.go b/ibm/service/cos/data_source_ibm_cos_bucket.go
@@ -729,7 +729,9 @@ func dataSourceIBMCosBucketRead(d *schema.ResourceData, meta interface{}) error
 		// User is expected to define both private and direct url type under "private" in endpoints file since visibility type "direct" is not supported.
 		cosConfigURL := conns.FileFallBack(rsConClient.Config.EndpointsFile, "private", "IBMCLOUD_COS_CONFIG_ENDPOINT", bucketRegion, cosConfigUrls[endpointType])
 		cosConfigURL = conns.EnvFallBack([]string{"IBMCLOUD_COS_CONFIG_ENDPOINT"}, cosConfigURL)
-		sess.SetServiceURL(cosConfigURL)
+		if cosConfigURL != "" {
+			sess.SetServiceURL(cosConfigURL)
+		}
 	}
 
 	if bucketType == "sl" {

diff --git a/ibm/service/cos/resource_ibm_cos_bucket.go b/ibm/service/cos/resource_ibm_cos_bucket.go
@@ -743,6 +743,9 @@ func resourceIBMCOSBucketUpdate(d *schema.ResourceData, meta interface{}) error
 	bucketName := parseBucketId(d.Id(), "bucketName")
 	serviceID := parseBucketId(d.Id(), "serviceID")
 	endpointType := parseBucketId(d.Id(), "endpointType")
+	if endpointType == "" {
+		endpointType = d.Get("endpoint_type").(string)
+	}
 	bLocation := parseBucketId(d.Id(), "bLocation")
 	apiType := parseBucketId(d.Id(), "apiType")
 	if apiType == "sl" {
@@ -939,7 +942,9 @@ func resourceIBMCOSBucketUpdate(d *schema.ResourceData, meta interface{}) error
 		// User is expected to define both private and direct url type under "private" in endpoints file since visibility type "direct" is not supported.
 		cosConfigURL := conns.FileFallBack(rsConClient.Config.EndpointsFile, "private", "IBMCLOUD_COS_CONFIG_ENDPOINT", bLocation, cosConfigUrls[endpointType])
 		cosConfigURL = conns.EnvFallBack([]string{"IBMCLOUD_COS_CONFIG_ENDPOINT"}, cosConfigURL)
-		sess.SetServiceURL(cosConfigURL)
+		if cosConfigURL != "" {
+			sess.SetServiceURL(cosConfigURL)
+		}
 	}
 
 	if apiType == "sl" {
@@ -1087,6 +1092,9 @@ func resourceIBMCOSBucketRead(d *schema.ResourceData, meta interface{}) error {
 	bucketName := parseBucketId(d.Id(), "bucketName")
 	serviceID := parseBucketId(d.Id(), "serviceID")
 	endpointType := parseBucketId(d.Id(), "endpointType")
+	if endpointType == "" {
+		endpointType = d.Get("endpoint_type").(string)
+	}
 	apiType := parseBucketId(d.Id(), "apiType")
 	bLocation := parseBucketId(d.Id(), "bLocation")
 
@@ -1208,7 +1216,9 @@ func resourceIBMCOSBucketRead(d *schema.ResourceData, meta interface{}) error {
 		// User is expected to define both private and direct url type under "private" in endpoints file since visibility type "direct" is not supported.
 		cosConfigURL := conns.FileFallBack(rsConClient.Config.EndpointsFile, "private", "IBMCLOUD_COS_CONFIG_ENDPOINT", bLocation, cosConfigUrls[endpointType])
 		cosConfigURL = conns.EnvFallBack([]string{"IBMCLOUD_COS_CONFIG_ENDPOINT"}, cosConfigURL)
-		sess.SetServiceURL(cosConfigURL)
+		if cosConfigURL != "" {
+			sess.SetServiceURL(cosConfigURL)
+		}
 	}
 
 	if apiType == "sl" {
@@ -1513,7 +1523,9 @@ func resourceIBMCOSBucketDelete(d *schema.ResourceData, meta interface{}) error
 	}
 
 	endpointType := parseBucketId(d.Id(), "endpointType")
-
+	if endpointType == "" {
+		endpointType = d.Get("endpoint_type").(string)
+	}
 	var apiEndpoint, apiEndpointPrivate, directApiEndpoint, visibility string
 
 	if apiType == "sl" {
@@ -1638,8 +1650,11 @@ func resourceIBMCOSBucketExists(d *schema.ResourceData, meta interface{}) (bool,
 
 	apiType := parseBucketId(d.Id(), "apiType")
 	bLocation := parseBucketId(d.Id(), "bLocation")
-	endpointType := parseBucketId(d.Id(), "endpointType")
 
+	endpointType := parseBucketId(d.Id(), "endpointType")
+	if endpointType == "" {
+		endpointType = d.Get("endpoint_type").(string)
+	}
 	if apiType == "sl" {
 		satloc_guid := strings.Split(serviceID, ":")
 		bucketsatcrn := satloc_guid[0]