Skip to content

Commit 35bdea3

Browse files
authored
feat(object): add support for exporting endpoint url (#653)
1 parent 5175d20 commit 35bdea3

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

docs/resources/object_bucket.md

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ The following arguments are supported:
3434
In addition to all above arguments, the following attribute is exported:
3535

3636
* `id` - The unique name of the bucket.
37+
* `endpoint` - The endpoint URL of the bucket
3738

3839
## Import
3940

scaleway/resource_object_bucket.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ func resourceScalewayObjectBucket() *schema.Resource {
4646
Optional: true,
4747
Description: "The tags associated with this bucket",
4848
},
49+
"endpoint": {
50+
Type: schema.TypeString,
51+
Description: "Endpoint of the bucket",
52+
Computed: true,
53+
},
4954
"region": regionSchema(),
5055
},
5156
}
@@ -88,7 +93,7 @@ func resourceScalewayObjectBucketCreate(d *schema.ResourceData, m interface{}) e
8893
}
8994

9095
func resourceScalewayObjectBucketRead(d *schema.ResourceData, m interface{}) error {
91-
s3Client, _, bucketName, err := s3ClientWithRegionAndName(m, d.Id())
96+
s3Client, region, bucketName, err := s3ClientWithRegionAndName(m, d.Id())
9297
if err != nil {
9398
return err
9499
}
@@ -131,6 +136,8 @@ func resourceScalewayObjectBucketRead(d *schema.ResourceData, m interface{}) err
131136

132137
_ = d.Set("tags", flattenObjectBucketTags(tagsSet))
133138

139+
_ = d.Set("endpoint", fmt.Sprintf("https://%s.s3.%s.scw.cloud", bucketName, region))
140+
134141
return nil
135142
}
136143

scaleway/resource_object_bucket_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,13 @@ func TestAccScalewayObjectBucket(t *testing.T) {
6969
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "acl", testBucketACL),
7070
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "tags.%", "1"),
7171
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "tags.foo", "bar"),
72+
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "endpoint", fmt.Sprintf("https://%s.s3.%s.scw.cloud", testBucketName, "fr-par")),
73+
7274
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "name", testBucketNameAms),
75+
resource.TestCheckResourceAttr("scaleway_object_bucket.ams-bucket", "endpoint", fmt.Sprintf("https://%s.s3.%s.scw.cloud", testBucketNameAms, "nl-ams")),
76+
7377
resource.TestCheckResourceAttr("scaleway_object_bucket.par-bucket", "name", testBucketNamePar),
78+
resource.TestCheckResourceAttr("scaleway_object_bucket.par-bucket", "endpoint", fmt.Sprintf("https://%s.s3.%s.scw.cloud", testBucketNamePar, "fr-par")),
7479
),
7580
},
7681
{

0 commit comments

Comments
 (0)