Skip to content

Commit 4bb5881

Browse files
ewbankkitewbankkit
committed
Cosmetics.
1 parent a70236a commit 4bb5881

8 files changed

+43
-43
lines changed

‎internal/service/rds/cluster.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -228,18 +228,18 @@ func ResourceCluster() *schema.Resource {
228228
validation.StringInSlice(ClusterEngine_Values(), false),
229229
),
230230
},
231-
"engine_mode": {
231+
"engine_lifecycle_support": {
232232
Type: schema.TypeString,
233233
Optional: true,
234-
ForceNew: true,
235-
Default: EngineModeProvisioned,
236-
ValidateFunc: validation.StringInSlice(EngineMode_Values(), false),
234+
Computed: true,
235+
ValidateFunc: validation.StringInSlice(engineLifecycleSupport_Values(), false),
237236
},
238-
"engine_lifecycle_support": {
237+
"engine_mode": {
239238
Type: schema.TypeString,
240239
Optional: true,
241-
Computed: true,
242-
ValidateFunc: validation.StringInSlice(EngineLifecycleSupport_Values(), false),
240+
ForceNew: true,
241+
Default: engineModeProvisioned,
242+
ValidateFunc: validation.StringInSlice(engineMode_Values(), false),
243243
},
244244
names.AttrEngineVersion: {
245245
Type: schema.TypeString,
@@ -1240,8 +1240,8 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
12401240
d.Set("enable_http_endpoint", dbc.HttpEndpointEnabled)
12411241
d.Set(names.AttrEndpoint, dbc.Endpoint)
12421242
d.Set(names.AttrEngine, dbc.Engine)
1243-
d.Set("engine_mode", dbc.EngineMode)
12441243
d.Set("engine_lifecycle_support", dbc.EngineLifecycleSupport)
1244+
d.Set("engine_mode", dbc.EngineMode)
12451245
clusterSetResourceDataEngineVersionFromCluster(d, dbc)
12461246
d.Set(names.AttrHostedZoneID, dbc.HostedZoneId)
12471247
d.Set("iam_database_authentication_enabled", dbc.IAMDatabaseAuthenticationEnabled)
@@ -1303,7 +1303,7 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter
13031303
// Fetch and save Global Cluster if engine mode global
13041304
d.Set("global_cluster_identifier", "")
13051305

1306-
if aws.StringValue(dbc.EngineMode) == EngineModeGlobal || aws.StringValue(dbc.EngineMode) == EngineModeProvisioned {
1306+
if aws.StringValue(dbc.EngineMode) == engineModeGlobal || aws.StringValue(dbc.EngineMode) == engineModeProvisioned {
13071307
globalCluster, err := FindGlobalClusterByDBClusterARN(ctx, conn, aws.StringValue(dbc.DBClusterArn))
13081308

13091309
if err == nil {

‎internal/service/rds/cluster_migrate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func resourceClusterResourceV0() *schema.Resource {
143143
Type: schema.TypeString,
144144
Optional: true,
145145
ForceNew: true,
146-
Default: EngineModeProvisioned,
146+
Default: engineModeProvisioned,
147147
},
148148
names.AttrEngineVersion: {
149149
Type: schema.TypeString,

‎internal/service/rds/cluster_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ func TestAccRDSCluster_engineVersion(t *testing.T) {
13871387
Check: resource.ComposeTestCheckFunc(
13881388
testAccCheckClusterExists(ctx, resourceName, &dbCluster),
13891389
resource.TestCheckResourceAttr(resourceName, names.AttrEngine, tfrds.ClusterEngineAuroraPostgreSQL),
1390-
resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", tfrds.EngineLifecycleSupport),
1390+
resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", "open-source-rds-extended-support"),
13911391
resource.TestCheckResourceAttrPair(resourceName, names.AttrEngineVersion, dataSourceName, names.AttrVersion),
13921392
),
13931393
},
@@ -2630,7 +2630,7 @@ func TestAccRDSCluster_engineLifecycleSupport_disabled(t *testing.T) {
26302630
resource.TestCheckResourceAttr(resourceName, "backtrack_window", acctest.Ct0),
26312631
resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName),
26322632
resource.TestCheckResourceAttr(resourceName, names.AttrEngine, tfrds.ClusterEngineAuroraPostgreSQL),
2633-
resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", tfrds.EngineLifecycleSupportDisabled),
2633+
resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", "open-source-rds-extended-support-disabled"),
26342634
),
26352635
},
26362636
testAccClusterImportStep(resourceName),
@@ -5262,7 +5262,7 @@ resource "aws_rds_cluster" "test" {
52625262
master_username = "tfacctest"
52635263
master_password = "avoid-plaintext-passwords"
52645264
skip_final_snapshot = true
5265-
engine_lifecycle_support = %[3]q
5265+
engine_lifecycle_support = "open-source-rds-extended-support-disabled"
52665266
}
5267-
`, rName, tfrds.ClusterEngineAuroraPostgreSQL, tfrds.EngineLifecycleSupportDisabled)
5267+
`, rName, tfrds.ClusterEngineAuroraPostgreSQL)
52685268
}

‎internal/service/rds/consts.go

+23-23
Original file line numberDiff line numberDiff line change
@@ -158,46 +158,46 @@ func ClusterInstanceEngine_Values() []string {
158158
}
159159

160160
const (
161-
GlobalClusterEngineAurora = "aurora"
162-
GlobalClusterEngineAuroraMySQL = "aurora-mysql"
163-
GlobalClusterEngineAuroraPostgreSQL = "aurora-postgresql"
161+
globalClusterEngineAurora = "aurora"
162+
globalClusterEngineAuroraMySQL = "aurora-mysql"
163+
globalClusterEngineAuroraPostgreSQL = "aurora-postgresql"
164164
)
165165

166-
func GlobalClusterEngine_Values() []string {
166+
func globalClusterEngine_Values() []string {
167167
return []string{
168-
GlobalClusterEngineAurora,
169-
GlobalClusterEngineAuroraMySQL,
170-
GlobalClusterEngineAuroraPostgreSQL,
168+
globalClusterEngineAurora,
169+
globalClusterEngineAuroraMySQL,
170+
globalClusterEngineAuroraPostgreSQL,
171171
}
172172
}
173173

174174
const (
175-
EngineModeGlobal = "global"
176-
EngineModeMultiMaster = "multimaster"
177-
EngineModeParallelQuery = "parallelquery"
178-
EngineModeProvisioned = "provisioned"
179-
EngineModeServerless = "serverless"
175+
engineModeGlobal = "global"
176+
engineModeMultiMaster = "multimaster"
177+
engineModeParallelQuery = "parallelquery"
178+
engineModeProvisioned = "provisioned"
179+
engineModeServerless = "serverless"
180180
)
181181

182-
func EngineMode_Values() []string {
182+
func engineMode_Values() []string {
183183
return []string{
184-
EngineModeGlobal,
185-
EngineModeMultiMaster,
186-
EngineModeParallelQuery,
187-
EngineModeProvisioned,
188-
EngineModeServerless,
184+
engineModeGlobal,
185+
engineModeMultiMaster,
186+
engineModeParallelQuery,
187+
engineModeProvisioned,
188+
engineModeServerless,
189189
}
190190
}
191191

192192
const (
193-
EngineLifecycleSupport = "open-source-rds-extended-support"
194-
EngineLifecycleSupportDisabled = "open-source-rds-extended-support-disabled"
193+
engineLifecycleSupport = "open-source-rds-extended-support"
194+
engineLifecycleSupportDisabled = "open-source-rds-extended-support-disabled"
195195
)
196196

197-
func EngineLifecycleSupport_Values() []string {
197+
func engineLifecycleSupport_Values() []string {
198198
return []string{
199-
EngineLifecycleSupport,
200-
EngineLifecycleSupportDisabled,
199+
engineLifecycleSupport,
200+
engineLifecycleSupportDisabled,
201201
}
202202
}
203203

‎internal/service/rds/global_cluster.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ func ResourceGlobalCluster() *schema.Resource {
6464
Computed: true,
6565
ForceNew: true,
6666
ConflictsWith: []string{"source_db_cluster_identifier"},
67-
ValidateFunc: validation.StringInSlice(GlobalClusterEngine_Values(), false),
67+
ValidateFunc: validation.StringInSlice(globalClusterEngine_Values(), false),
6868
},
6969
"engine_lifecycle_support": {
7070
Type: schema.TypeString,
7171
Optional: true,
7272
Computed: true,
73-
ValidateFunc: validation.StringInSlice(EngineLifecycleSupport_Values(), false),
73+
ValidateFunc: validation.StringInSlice(engineLifecycleSupport_Values(), false),
7474
},
7575
names.AttrEngineVersion: {
7676
Type: schema.TypeString,
@@ -170,7 +170,7 @@ func resourceGlobalClusterCreate(ctx context.Context, d *schema.ResourceData, me
170170
// since we cannot have Engine default after adding SourceDBClusterIdentifier:
171171
// InvalidParameterValue: When creating standalone global cluster, value for engineName should be specified
172172
if input.Engine == nil && input.SourceDBClusterIdentifier == nil {
173-
input.Engine = aws.String(GlobalClusterEngineAurora)
173+
input.Engine = aws.String(globalClusterEngineAurora)
174174
}
175175

176176
output, err := conn.CreateGlobalClusterWithContext(ctx, input)

‎internal/service/rds/instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ func ResourceInstance() *schema.Resource {
312312
Type: schema.TypeString,
313313
Optional: true,
314314
Computed: true,
315-
ValidateFunc: validation.StringInSlice(EngineLifecycleSupport_Values(), false),
315+
ValidateFunc: validation.StringInSlice(engineLifecycleSupport_Values(), false),
316316
},
317317
names.AttrEngineVersion: {
318318
Type: schema.TypeString,

‎internal/service/rds/instance_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func TestAccRDSInstance_engineLifecycleSupport_disabled(t *testing.T) {
236236
testAccCheckInstanceAttributes(&v),
237237
acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`db:.+`)),
238238
resource.TestCheckResourceAttr(resourceName, names.AttrEngine, tfrds.InstanceEngineMySQL),
239-
resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", tfrds.EngineLifecycleSupportDisabled),
239+
resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", "open-source-rds-extended-support-disabled"),
240240
resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion),
241241
),
242242
},

‎internal/service/rds/sweep.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func sweepClusters(region string) error {
238238
d.Set(names.AttrDeletionProtection, false)
239239
d.Set("skip_final_snapshot", true)
240240

241-
if engineMode := aws.StringValue(v.EngineMode); engineMode == EngineModeGlobal || engineMode == EngineModeProvisioned {
241+
if engineMode := aws.StringValue(v.EngineMode); engineMode == engineModeGlobal || engineMode == engineModeProvisioned {
242242
globalCluster, err := FindGlobalClusterByDBClusterARN(ctx, conn, arn)
243243
if err != nil {
244244
if !tfresource.NotFound(err) {

0 commit comments

Comments
 (0)