Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bq table - add geojson support #10215

Merged
merged 3 commits into from
Mar 22, 2024
Merged

bq table - add geojson support #10215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b044c9
bq table - add geojson support
DrFaust92 Mar 16, 2024
b12d4b7
bq table - add geojson support
DrFaust92 Mar 16, 2024
2f99d4e
CR comments
DrFaust92 Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions mmv1/third_party/terraform/services/bigquery/resource_bigquery_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,13 @@ func ResourceBigQueryTable() *schema.Resource {
},
},

"json_extension": {
DrFaust92 marked this conversation as resolved.
Show resolved Hide resolved
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{"GEOJSON"}, false),
Description: `Load option to be used together with sourceFormat newline-delimited JSON to indicate that a variant of JSON is being loaded. To load newline-delimited GeoJSON, specify GEOJSON (and sourceFormat must be set to NEWLINE_DELIMITED_JSON).`,
},

"parquet_options": {
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -1784,6 +1791,10 @@ func expandExternalDataConfiguration(cfg interface{}) (*bigquery.ExternalDataCon
edc.Compression = v.(string)
}

if v, ok := raw["json_extension"]; ok {
edc.JsonExtension = v.(string)
}

if v, ok := raw["csv_options"]; ok {
edc.CsvOptions = expandCsvOptions(v)
}
Expand Down Expand Up @@ -1851,6 +1862,10 @@ func flattenExternalDataConfiguration(edc *bigquery.ExternalDataConfiguration) (
result["compression"] = edc.Compression
}

if edc.JsonExtension != "" {
result["json_extension"] = edc.JsonExtension
}

if edc.CsvOptions != nil {
result["csv_options"] = flattenCsvOptions(edc.CsvOptions)
}
Expand Down
2 changes: 2 additions & 0 deletions mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2953,6 +2953,8 @@ resource "google_bigquery_table" "test" {
encoding = "%s"
}

json_extension = "GEOJSON"

hive_partitioning_options {
mode = "CUSTOM"
source_uri_prefix = "gs://${google_storage_bucket.test.name}/{key1:STRING}"
Expand Down
2 changes: 2 additions & 0 deletions mmv1/third_party/terraform/website/docs/r/bigquery_table.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ in Terraform state, a `terraform destroy` or `terraform apply` that would delete
* `json_options` (Optional) - Additional properties to set if
`source_format` is set to "JSON". Structure is [documented below](#nested_json_options).

* `json_extension` (Optional) - Used to indicate that a JSON variant, rather than normal JSON, is being used as the sourceFormat. This should only be used in combination with the `JSON` source format. Valid values are: `GEOJSON`.

* `parquet_options` (Optional) - Additional properties to set if
`source_format` is set to "PARQUET". Structure is [documented below](#nested_parquet_options).

Expand Down