Skip to content

Commit 51f5b72

Browse files
modular-magicianmodular-magician
authored
Reconcile Dataproc Metastore Autoscaling Configs w/ API status (#13325) (#9560)
[upstream:5cafcdc10f44306a5c4441671b074120d91bcbf6] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 174983d commit 51f5b72

File tree

5 files changed

+35
-13
lines changed

5 files changed

+35
-13
lines changed

‎.changelog/13325.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
metastore: promoted `scaling_config` field to GA
3+
```

‎google-beta/services/dataprocmetastore/resource_dataproc_metastore_service.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,11 @@ There must be at least one IP address available in the subnet's primary range. T
365365
},
366366
},
367367
},
368+
"autoscaling_factor": {
369+
Type: schema.TypeFloat,
370+
Computed: true,
371+
Description: `Output only. The scaling factor of a service with autoscaling enabled.`,
372+
},
368373
},
369374
},
370375
},
@@ -1140,6 +1145,8 @@ func flattenDataprocMetastoreServiceScalingConfigAutoscalingConfig(v interface{}
11401145
transformed := make(map[string]interface{})
11411146
transformed["autoscaling_enabled"] =
11421147
flattenDataprocMetastoreServiceScalingConfigAutoscalingConfigAutoscalingEnabled(original["autoscalingEnabled"], d, config)
1148+
transformed["autoscaling_factor"] =
1149+
flattenDataprocMetastoreServiceScalingConfigAutoscalingConfigAutoscalingFactor(original["autoscalingFactor"], d, config)
11431150
transformed["limit_config"] =
11441151
flattenDataprocMetastoreServiceScalingConfigAutoscalingConfigLimitConfig(original["limitConfig"], d, config)
11451152
return []interface{}{transformed}
@@ -1148,6 +1155,10 @@ func flattenDataprocMetastoreServiceScalingConfigAutoscalingConfigAutoscalingEna
11481155
return v
11491156
}
11501157

1158+
func flattenDataprocMetastoreServiceScalingConfigAutoscalingConfigAutoscalingFactor(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1159+
return v
1160+
}
1161+
11511162
func flattenDataprocMetastoreServiceScalingConfigAutoscalingConfigLimitConfig(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
11521163
if v == nil {
11531164
return nil
@@ -1555,6 +1566,13 @@ func expandDataprocMetastoreServiceScalingConfigAutoscalingConfig(v interface{},
15551566
transformed["autoscalingEnabled"] = transformedAutoscalingEnabled
15561567
}
15571568

1569+
transformedAutoscalingFactor, err := expandDataprocMetastoreServiceScalingConfigAutoscalingConfigAutoscalingFactor(original["autoscaling_factor"], d, config)
1570+
if err != nil {
1571+
return nil, err
1572+
} else if val := reflect.ValueOf(transformedAutoscalingFactor); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1573+
transformed["autoscalingFactor"] = transformedAutoscalingFactor
1574+
}
1575+
15581576
transformedLimitConfig, err := expandDataprocMetastoreServiceScalingConfigAutoscalingConfigLimitConfig(original["limit_config"], d, config)
15591577
if err != nil {
15601578
return nil, err
@@ -1569,6 +1587,10 @@ func expandDataprocMetastoreServiceScalingConfigAutoscalingConfigAutoscalingEnab
15691587
return v, nil
15701588
}
15711589

1590+
func expandDataprocMetastoreServiceScalingConfigAutoscalingConfigAutoscalingFactor(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1591+
return v, nil
1592+
}
1593+
15721594
func expandDataprocMetastoreServiceScalingConfigAutoscalingConfigLimitConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
15731595
l := v.([]interface{})
15741596
if len(l) == 0 || l[0] == nil {

‎google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_meta.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ fields:
3535
- field: 'port'
3636
- field: 'release_channel'
3737
- field: 'scaling_config.autoscaling_config.autoscaling_enabled'
38+
- field: 'scaling_config.autoscaling_config.autoscaling_factor'
3839
- field: 'scaling_config.autoscaling_config.limit_config.max_scaling_factor'
3940
- field: 'scaling_config.autoscaling_config.limit_config.min_scaling_factor'
4041
- field: 'scaling_config.instance_size'

‎google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMaxScali
577577

578578
acctest.VcrTest(t, resource.TestCase{
579579
PreCheck: func() { acctest.AccTestPreCheck(t) },
580-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
580+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
581581
CheckDestroy: testAccCheckDataprocMetastoreServiceDestroyProducer(t),
582582
Steps: []resource.TestStep{
583583
{
@@ -596,7 +596,6 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMaxScali
596596
func testAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMaxScalingFactorExample(context map[string]interface{}) string {
597597
return acctest.Nprintf(`
598598
resource "google_dataproc_metastore_service" "test_resource" {
599-
provider = google-beta
600599
service_id = "tf-test-test-service%{random_suffix}"
601600
location = "us-central1"
602601
@@ -629,7 +628,7 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMinAndMa
629628

630629
acctest.VcrTest(t, resource.TestCase{
631630
PreCheck: func() { acctest.AccTestPreCheck(t) },
632-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
631+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
633632
CheckDestroy: testAccCheckDataprocMetastoreServiceDestroyProducer(t),
634633
Steps: []resource.TestStep{
635634
{
@@ -648,7 +647,6 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMinAndMa
648647
func testAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMinAndMaxScalingFactorExample(context map[string]interface{}) string {
649648
return acctest.Nprintf(`
650649
resource "google_dataproc_metastore_service" "test_resource" {
651-
provider = google-beta
652650
service_id = "tf-test-test-service%{random_suffix}"
653651
location = "us-central1"
654652
@@ -682,7 +680,7 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMinScali
682680

683681
acctest.VcrTest(t, resource.TestCase{
684682
PreCheck: func() { acctest.AccTestPreCheck(t) },
685-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
683+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
686684
CheckDestroy: testAccCheckDataprocMetastoreServiceDestroyProducer(t),
687685
Steps: []resource.TestStep{
688686
{
@@ -701,7 +699,6 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMinScali
701699
func testAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingMinScalingFactorExample(context map[string]interface{}) string {
702700
return acctest.Nprintf(`
703701
resource "google_dataproc_metastore_service" "test_resource" {
704-
provider = google-beta
705702
service_id = "tf-test-test-service%{random_suffix}"
706703
location = "us-central1"
707704
@@ -734,7 +731,7 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingNoLimitC
734731

735732
acctest.VcrTest(t, resource.TestCase{
736733
PreCheck: func() { acctest.AccTestPreCheck(t) },
737-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
734+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
738735
CheckDestroy: testAccCheckDataprocMetastoreServiceDestroyProducer(t),
739736
Steps: []resource.TestStep{
740737
{
@@ -753,7 +750,6 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingNoLimitC
753750
func testAccDataprocMetastoreService_dataprocMetastoreServiceAutoscalingNoLimitConfigExample(context map[string]interface{}) string {
754751
return acctest.Nprintf(`
755752
resource "google_dataproc_metastore_service" "test_resource" {
756-
provider = google-beta
757753
service_id = "tf-test-test-service%{random_suffix}"
758754
location = "us-central1"
759755

‎website/docs/r/dataproc_metastore_service.html.markdown‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ resource "google_storage_bucket" "bucket" {
292292

293293
```hcl
294294
resource "google_dataproc_metastore_service" "test_resource" {
295-
provider = google-beta
296295
service_id = "test-service"
297296
location = "us-central1"
298297
@@ -324,7 +323,6 @@ resource "google_dataproc_metastore_service" "test_resource" {
324323

325324
```hcl
326325
resource "google_dataproc_metastore_service" "test_resource" {
327-
provider = google-beta
328326
service_id = "test-service"
329327
location = "us-central1"
330328
@@ -357,7 +355,6 @@ resource "google_dataproc_metastore_service" "test_resource" {
357355

358356
```hcl
359357
resource "google_dataproc_metastore_service" "test_resource" {
360-
provider = google-beta
361358
service_id = "test-service"
362359
location = "us-central1"
363360
@@ -389,7 +386,6 @@ resource "google_dataproc_metastore_service" "test_resource" {
389386

390387
```hcl
391388
resource "google_dataproc_metastore_service" "test_resource" {
392-
provider = google-beta
393389
service_id = "test-service"
394390
location = "us-central1"
395391
@@ -524,7 +520,7 @@ The following arguments are supported:
524520
Scaling factor, in increments of 0.1 for values less than 1.0, and increments of 1.0 for values greater than 1.0.
525521

526522
* `autoscaling_config` -
527-
(Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
523+
(Optional)
528524
Represents the autoscaling configuration of a metastore service.
529525
Structure is [documented below](#nested_scaling_config_autoscaling_config).
530526

@@ -535,6 +531,10 @@ The following arguments are supported:
535531
(Optional)
536532
Defines whether autoscaling is enabled. The default value is false.
537533

534+
* `autoscaling_factor` -
535+
(Output)
536+
Output only. The scaling factor of a service with autoscaling enabled.
537+
538538
* `limit_config` -
539539
(Optional)
540540
Represents the limit configuration of a metastore service.

0 commit comments

Comments
 (0)