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

[OBS]: Fix bucket creation for Swisscloud #1904

Merged
merged 4 commits into from Aug 26, 2022
Merged

[OBS]: Fix bucket creation for Swisscloud #1904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f48544c
[OBS]: swiss fix
Aug 25, 2022
d24df40
[OBS]: swiss fix#2
Aug 25, 2022
3293b3e
[OBS]: release notes
Aug 26, 2022
c21c3c2
[OBS]: reno
Aug 26, 2022
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
15 changes: 11 additions & 4 deletions opentelekomcloud/services/obs/resource_opentelekomcloud_obs_bucket.go
View file
Open in desktop
Expand Up @@ -324,7 +324,12 @@ func resourceObsBucketCreate(ctx context.Context, d *schema.ResourceData, meta i

bucket := d.Get("bucket").(string)
acl := d.Get("acl").(string)
class := d.Get("storage_class").(string)

var class string
if config.GetRegion(d) != "eu-ch2" {
class = d.Get("storage_class").(string)
}

opts := &obs.CreateBucketInput{
Bucket: bucket,
ACL: obs.AclType(acl),
Expand Down Expand Up @@ -357,7 +362,7 @@ func resourceObsBucketUpdate(ctx context.Context, d *schema.ResourceData, meta i
}
}

if d.HasChange("storage_class") && !d.IsNewResource() {
if d.HasChange("storage_class") && !d.IsNewResource() && config.GetRegion(d) != "eu-ch2" {
if err := resourceObsBucketClassUpdate(client, d); err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -454,8 +459,10 @@ func resourceObsBucketRead(_ context.Context, d *schema.ResourceData, meta inter
}

// Read storage class
if err := setObsBucketStorageClass(client, d); err != nil {
return diag.FromErr(err)
if region != "eu-ch2" {
if err := setObsBucketStorageClass(client, d); err != nil {
return diag.FromErr(err)
}
}

// Read the versioning
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/obs_swisscloud_fix-47c9d9c86fb69827.yaml
View file
Open in desktop
@@ -0,0 +1,4 @@
---
fixes:
- |
**[OBS]** Fix bucket creation on Swisscloud for ``resource/opentelekomcloud_obs_bucket`` (`#1904 <https://github.com/opentelekomcloud/terraform-provider-opentelekomcloud/pull/1904>`_)