Skip to content

Commit 6fb8dc4

Browse files
committed
chore: remove auto_minor_version_upgrade from terraform schema and CRUD operations
1 parent 6c9e3b2 commit 6fb8dc4

File tree

4 files changed

+3
-29
lines changed

4 files changed

+3
-29
lines changed

provider/pro/resource_rediscloud_pro_database.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -297,12 +297,6 @@ func ResourceRedisCloudProDatabase() *schema.Resource {
297297
Optional: true,
298298
Default: true,
299299
},
300-
"auto_minor_version_upgrade": {
301-
Description: "When 'true', enables auto minor version upgrades for this database. Default: 'true'",
302-
Type: schema.TypeBool,
303-
Optional: true,
304-
Default: true,
305-
},
306300
"port": {
307301
Description: "TCP port on which the database is available",
308302
Type: schema.TypeInt,
@@ -453,9 +447,6 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource
453447
createDatabase.RespVersion = s
454448
})
455449

456-
utils.SetBool(d, "auto_minor_version_upgrade", func(b *bool) {
457-
createDatabase.AutoMinorVersionUpgrade = b
458-
})
459450

460451
// Confirm sub is ready to accept a db request
461452
if err := utils.WaitForSubscriptionToBeActive(ctx, subId, api); err != nil {
@@ -679,9 +670,6 @@ func resourceRedisCloudProDatabaseRead(ctx context.Context, d *schema.ResourceDa
679670
}
680671
}
681672

682-
if err := d.Set("auto_minor_version_upgrade", redis.BoolValue(db.AutoMinorVersionUpgrade)); err != nil {
683-
return diag.FromErr(err)
684-
}
685673

686674
if err := ReadTags(ctx, api, subId, dbId, d); err != nil {
687675
return diag.FromErr(err)
@@ -765,7 +753,6 @@ func resourceRedisCloudProDatabaseUpdate(ctx context.Context, d *schema.Resource
765753
Alerts: &alerts,
766754
RemoteBackup: BuildBackupPlan(d.Get("remote_backup").([]interface{}), d.Get("periodic_backup_path")),
767755
EnableDefaultUser: utils.GetBool(d, "enable_default_user"),
768-
AutoMinorVersionUpgrade: utils.GetBool(d, "auto_minor_version_upgrade"),
769756
}
770757

771758
// One of the following fields must be set, validation is handled in the schema (ExactlyOneOf)

provider/rediscloud_active_active_database_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ resource "rediscloud_active_active_subscription_database" "example" {
520520
func TestAccResourceRedisCloudActiveActiveDatabase_autoMinorVersionUpgrade(t *testing.T) {
521521

522522
utils.AccRequiresEnvVar(t, "EXECUTE_TESTS")
523+
t.Skip("auto_minor_version_upgrade feature temporarily removed")
523524

524525
subscriptionName := acctest.RandomWithPrefix(testResourcePrefix) + "-subscription"
525526
name := acctest.RandomWithPrefix(testResourcePrefix) + "-database"

provider/resource_rediscloud_active_active_database.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,6 @@ func resourceRedisCloudActiveActiveDatabase() *schema.Resource {
205205
Description: "When 'true', enables connecting to the database with the 'default' user across all regions. Default: 'true'",
206206
Type: schema.TypeBool,
207207
Optional: true,
208-
Default: true,
209-
},
210-
"auto_minor_version_upgrade": {
211-
Description: "When 'true', enables auto minor version upgrades for this database. Default: 'true'",
212-
Type: schema.TypeBool,
213-
Optional: true,
214208
Default: true,
215209
},
216210
"override_region": {
@@ -269,7 +263,7 @@ func resourceRedisCloudActiveActiveDatabase() *schema.Resource {
269263
Description: "When 'true', enables connecting to the database with the 'default' user. Default: 'true'",
270264
Type: schema.TypeBool,
271265
Optional: true,
272-
Default: true,
266+
Default: true,
273267
},
274268
"remote_backup": {
275269
Description: "An object that specifies the backup options for the database in this region",
@@ -455,9 +449,6 @@ func resourceRedisCloudActiveActiveDatabaseCreate(ctx context.Context, d *schema
455449
createDatabase.RedisVersion = s
456450
})
457451

458-
utils.SetBool(d, "auto_minor_version_upgrade", func(b *bool) {
459-
createDatabase.AutoMinorVersionUpgrade = b
460-
})
461452

462453
// Confirm Subscription Active status before creating database
463454
err = utils.WaitForSubscriptionToBeActive(ctx, subId, api)
@@ -669,9 +660,6 @@ func resourceRedisCloudActiveActiveDatabaseRead(ctx context.Context, d *schema.R
669660
return diag.FromErr(err)
670661
}
671662

672-
if err := d.Set("auto_minor_version_upgrade", redis.BoolValue(db.AutoMinorVersionUpgrade)); err != nil {
673-
return diag.FromErr(err)
674-
}
675663

676664
// Read global_enable_default_user from API response
677665
if db.GlobalEnableDefaultUser != nil {
@@ -836,9 +824,6 @@ func resourceRedisCloudActiveActiveDatabaseUpdate(ctx context.Context, d *schema
836824
update.GlobalEnableDefaultUser = redis.Bool(v.(bool))
837825
}
838826

839-
if v, ok := d.GetOk("auto_minor_version_upgrade"); ok {
840-
update.AutoMinorVersionUpgrade = redis.Bool(v.(bool))
841-
}
842827

843828
if v, ok := d.GetOk("support_oss_cluster_api"); ok {
844829
update.SupportOSSClusterAPI = redis.Bool(v.(bool))

provider/resource_rediscloud_pro_database_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ func TestAccResourceRedisCloudProDatabase_respversion(t *testing.T) {
278278
func TestAccResourceRedisCloudProDatabase_autoMinorVersionUpgrade(t *testing.T) {
279279

280280
utils.AccRequiresEnvVar(t, "EXECUTE_TESTS")
281+
t.Skip("auto_minor_version_upgrade feature temporarily removed")
281282

282283
name := acctest.RandomWithPrefix(testResourcePrefix)
283284
const resourceName = "rediscloud_subscription_database.example"

0 commit comments

Comments
 (0)