Skip to content

Commit dbf1256

Browse files
authored
Fix for issue 4838 (IBM-Cloud#4840)
1 parent 5bb110d commit dbf1256

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

ibm/service/cos/data_source_ibm_cos_bucket.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -851,24 +851,21 @@ func dataSourceIBMCosBucketRead(d *schema.ResourceData, meta interface{}) error
851851
getBucketWebsiteConfigurationInput := &s3.GetBucketWebsiteInput{
852852
Bucket: aws.String(bucketName),
853853
}
854-
855-
outputBucketWebsite, err := s3Client.GetBucketWebsite(getBucketWebsiteConfigurationInput)
856-
var outputBucketWebsiteptr *s3.WebsiteConfiguration
857-
outputBucketWebsiteptr = (*s3.WebsiteConfiguration)(outputBucketWebsite)
858-
if err != nil && !strings.Contains(err.Error(), "AccessDenied: Access Denied") {
854+
outputwebsite, err := s3Client.GetBucketWebsite(getBucketWebsiteConfigurationInput)
855+
var outputptr *s3.WebsiteConfiguration
856+
outputptr = (*s3.WebsiteConfiguration)(outputwebsite)
857+
if err != nil && !strings.Contains(err.Error(), "AccessDenied: Access Denied") && !strings.Contains(err.Error(), "The specified bucket does not have a website configuration") {
859858
return err
860859
}
861-
862-
if outputBucketWebsite != nil {
863-
websiteConfiguration := flex.WebsiteConfigurationGet(outputBucketWebsiteptr)
860+
if outputwebsite.IndexDocument != nil || outputwebsite.RedirectAllRequestsTo != nil {
861+
websiteConfiguration := flex.WebsiteConfigurationGet(outputptr)
864862
if len(websiteConfiguration) > 0 {
865863
d.Set("website_configuration", websiteConfiguration)
866864
}
867865
websiteEndpoint := getWebsiteEndpoint(bucketName, bucketRegion)
868866
if websiteEndpoint != "" {
869867
d.Set("website_endpoint", websiteEndpoint)
870868
}
871-
872869
}
873870

874871
return nil

0 commit comments

Comments
 (0)