Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for COS issue 4844 #4919

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fix for COS issue 4844 #4919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions ibm/service/cos/data_source_ibm_cos_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,9 @@ func dataSourceIBMCosBucketRead(d *schema.ResourceData, meta interface{}) error
if endpointType == "private" {
sess.SetServiceURL("https://config.private.cloud-object-storage.cloud.ibm.com/v1")
}
if endpointType == "direct" {
sess.SetServiceURL("https://config.direct.cloud-object-storage.cloud.ibm.com/v1")
}

if bucketType == "sl" {
satconfig := fmt.Sprintf("https://config.%s.%s.cloud-object-storage.appdomain.cloud/v1", serviceID, satlc_id)
Expand Down
6 changes: 6 additions & 0 deletions ibm/service/cos/resource_ibm_cos_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,9 @@ func resourceIBMCOSBucketUpdate(d *schema.ResourceData, meta interface{}) error
if endpointType == "private" {
sess.SetServiceURL("https://config.private.cloud-object-storage.cloud.ibm.com/v1")
}
if endpointType == "direct" {
sess.SetServiceURL("https://config.direct.cloud-object-storage.cloud.ibm.com/v1")
}

if apiType == "sl" {
satconfig := fmt.Sprintf("https://config.%s.%s.cloud-object-storage.appdomain.cloud/v1", serviceID, bLocation)
Expand Down Expand Up @@ -1153,6 +1156,9 @@ func resourceIBMCOSBucketRead(d *schema.ResourceData, meta interface{}) error {
if endpointType == "private" {
sess.SetServiceURL("https://config.private.cloud-object-storage.cloud.ibm.com/v1")
}
if endpointType == "direct" {
sess.SetServiceURL("https://config.direct.cloud-object-storage.cloud.ibm.com/v1")
}

if apiType == "sl" {

Expand Down
24 changes: 12 additions & 12 deletions ibm/service/cos/resource_ibm_cos_bucket_website_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

func TestAccIBMCosBucket_Website_Configuration_Bucket_Basic(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -41,7 +41,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_Basic(t *testing.T) {

func TestAccIBMCosBucket_Website_Configuration_Bucket_Without_Public_Access(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -69,7 +69,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_Without_Public_Access(t *t
}
func TestAccIBMCosBucket_Website_Configuration_Bucket_Index_Document_Only(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand All @@ -96,7 +96,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_Index_Document_Only(t *tes

func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Routing_Rule(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -133,7 +133,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Routing_Rule(t *testi

func TestAccIBMCosBucket_Website_Configuration_Bucket_With_JSON_Routing_Rule(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_With_JSON_Routing_Rule(t *
}
func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Routing_Rule_Condition_Only(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -192,7 +192,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Routing_Rule_Conditio

func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Routing_Rule_Redirect_Only(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Routing_Rule_Redirect

func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Multiple_Routing_Rules(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -263,7 +263,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_With_Multiple_Routing_Rule

func TestAccIBMCosBucket_Website_Configuration_Bucket_Upload_Object_With_Redirect(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down Expand Up @@ -293,7 +293,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_Upload_Object_With_Redirec

func TestAccIBMCosBucket_Website_Configuration_Bucket_Empty_Config(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand All @@ -312,7 +312,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_Empty_Config(t *testing.T)

func TestAccIBMCosBucket_Website_Configuration_Bucket_Index_And_Redirect_Together(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand All @@ -333,7 +333,7 @@ func TestAccIBMCosBucket_Website_Configuration_Bucket_Index_And_Redirect_Togethe

func TestAccIBMCosBucket_Website_Configuration_Bucket_No_Config(t *testing.T) {
serviceName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraformStaticWebHosting%d", acctest.RandIntRange(10, 100))
bucketName := fmt.Sprintf("terraform-static-web-hosting%d", acctest.RandIntRange(10, 100))
bucketRegion := "us"
bucketClass := "standard"
bucketRegionType := "cross_region_location"
Expand Down