Skip to content

Commit a940fb9

Browse files
updates
1 parent 14baee5 commit a940fb9

File tree

4 files changed

+634
-28
lines changed

4 files changed

+634
-28
lines changed

mmv1/third_party/terraform/services/storage/resource_storage_bucket.go.tmpl

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func ResourceStorageBucket() *schema.Resource {
4747
Read: schema.DefaultTimeout(4 * time.Minute),
4848
},
4949

50-
SchemaVersion: 3,
50+
SchemaVersion: 4,
5151
StateUpgraders: []schema.StateUpgrader{
5252
{
5353
Type: resourceStorageBucketV0().CoreConfigSchema().ImpliedType(),
@@ -64,6 +64,11 @@ func ResourceStorageBucket() *schema.Resource {
6464
Upgrade: ResourceStorageBucketStateUpgradeV2,
6565
Version: 2,
6666
},
67+
{
68+
Type: resourceStorageBucketV3().CoreConfigSchema().ImpliedType(),
69+
Upgrade: ResourceStorageBucketStateUpgradeV3,
70+
Version: 3,
71+
},
6772
},
6873

6974
Schema: map[string]*schema.Schema{
@@ -1536,15 +1541,7 @@ func flattenBucketAutoclass(bucketAutoclass *storage.BucketAutoclass) []map[stri
15361541
return autoclassList
15371542
}
15381543

1539-
func flattenBucketLifecycle(d *schema.ResourceData, lifecycle *storage.BucketLifecycle) []map[string]interface{} {
1540-
1541-
// if lifecycle_rule is not configured donot set in state file even if API returns
1542-
lifecycle_rules := d.Get("lifecycle_rule")
1543-
1544-
if lifecycle_rules == nil || len(lifecycle_rules.([]interface{})) == 0 {
1545-
return []map[string]interface{}{}
1546-
}
1547-
1544+
func flattenBucketLifecycle(d *schema.ResourceData, lifecycle *storage.BucketLifecycle) []map[string]interface{} {
15481545
if lifecycle == nil || lifecycle.Rule == nil {
15491546
return []map[string]interface{}{}
15501547
}

0 commit comments

Comments
 (0)