Skip to content

Commit f4ca726

Browse files
Fixed metadata for some fields that use id_from_name flattener (#16139) (#25789)
[upstream:207f3fc81eefc22855ccc219825ab2392759f6cf] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent d687699 commit f4ca726

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

google/services/bigqueryconnection/resource_bigquery_connection.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ func resourceBigqueryConnectionConnectionCreate(d *schema.ResourceData, meta int
415415
if err != nil {
416416
return err
417417
} else if v, ok := d.GetOkExists("connection_id"); !tpgresource.IsEmptyValue(reflect.ValueOf(connectionIdProp)) && (ok || !reflect.DeepEqual(v, connectionIdProp)) {
418-
obj["connection_id"] = connectionIdProp
418+
obj["connectionId"] = connectionIdProp
419419
}
420420
friendlyNameProp, err := expandBigqueryConnectionConnectionFriendlyName(d.Get("friendly_name"), d, config)
421421
if err != nil {
@@ -574,7 +574,7 @@ func resourceBigqueryConnectionConnectionRead(d *schema.ResourceData, meta inter
574574
if err := d.Set("name", flattenBigqueryConnectionConnectionName(res["name"], d, config)); err != nil {
575575
return fmt.Errorf("Error reading Connection: %s", err)
576576
}
577-
if err := d.Set("connection_id", flattenBigqueryConnectionConnectionConnectionId(res["connection_id"], d, config)); err != nil {
577+
if err := d.Set("connection_id", flattenBigqueryConnectionConnectionConnectionId(res["connectionId"], d, config)); err != nil {
578578
return fmt.Errorf("Error reading Connection: %s", err)
579579
}
580580
if err := d.Set("friendly_name", flattenBigqueryConnectionConnectionFriendlyName(res["friendlyName"], d, config)); err != nil {
@@ -1598,8 +1598,8 @@ func expandBigqueryConnectionConnectionSparkSparkHistoryServerConfigDataprocClus
15981598
}
15991599

16001600
func resourceBigqueryConnectionConnectionEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
1601-
// connection_id is needed to qualify the URL but cannot be sent in the body
1602-
delete(obj, "connection_id")
1601+
// connectionId is needed to qualify the URL but cannot be sent in the body
1602+
delete(obj, "connectionId")
16031603
return obj, nil
16041604
}
16051605

@@ -1611,7 +1611,7 @@ func resourceBigqueryConnectionConnectionPostCreateSetComputedFields(d *schema.R
16111611
}
16121612
// connection_id is set by API when unset
16131613
if tpgresource.IsEmptyValue(reflect.ValueOf(d.Get("connection_id"))) {
1614-
if err := d.Set("connection_id", flattenBigqueryConnectionConnectionConnectionId(res["connection_id"], d, config)); err != nil {
1614+
if err := d.Set("connection_id", flattenBigqueryConnectionConnectionConnectionId(res["connectionId"], d, config)); err != nil {
16151615
return fmt.Errorf(`Error setting computed identity field "connection_id": %s`, err)
16161616
}
16171617
}

google/services/bigqueryconnection/resource_bigquery_connection_generated_meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fields:
2727
- api_field: cloudSql.instanceId
2828
- api_field: cloudSql.serviceAccountId
2929
- api_field: cloudSql.type
30-
- api_field: connection_id
30+
- api_field: connectionId
3131
- api_field: description
3232
- api_field: friendlyName
3333
- api_field: hasCredential

0 commit comments

Comments
 (0)