Skip to content
This repository was archived by the owner on Dec 11, 2022. It is now read-only.

Commit bb0b450

Browse files
authored
Merge pull request #282 from lukesaint/fix/update-dataset-locations-list
Fixes: #277 Update dataset locations list to include all currently supported BigQuery dataset locations
2 parents cc96ba1 + f130ab1 commit bb0b450

File tree

2 files changed

+35
-18
lines changed

2 files changed

+35
-18
lines changed

src/config_ctrl.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,37 @@ export class BigQueryConfigCtrl {
4747
{ key: this.defaultAuthenticationType, value: "Google JWT File" },
4848
{ key: "gce", value: "GCE Default Service Account" }
4949
];
50+
// GCP Dataset Locations: https://cloud.google.com/bigquery/docs/locations
5051
this.locations = [
52+
// Multi-regional locations
5153
{ text: "United States (US)", value: "US" },
5254
{ text: "European Union (EU)", value: "EU" },
55+
// Americas
56+
{ text: "Las Vegas (us-west4)", value: "us-west4" },
5357
{ text: "Los Angeles (us-west2)", value: "us-west2" },
54-
{
55-
text: "Montréal (northamerica-northeast1)",
56-
value: "northamerica-northeast1"
57-
},
58-
{ text: "South Carolina (us-east1)", value: "us-east1" },
58+
{ text: "Montréal (northamerica-northeast1)", value: "northamerica-northeast1" },
5959
{ text: "Northern Virginia (us-east4)", value: "us-east4" },
60+
{ text: "Oregon (us-west1)", value: "us-west1" },
61+
{ text: "Salt Lake City (us-west3)", value: "us-west3" },
6062
{ text: "São Paulo (southamerica-east1)", value: "southamerica-east1" },
63+
{ text: "South Carolina (us-east1)", value: "us-east1" },
64+
// Europe
65+
{ text: "Belgium (europe-west1)", value: "europe-west1" },
6166
{ text: "Finland (europe-north1)", value: "europe-north1" },
62-
{ text: "London (europe-west2)", value: "europe-west2" },
6367
{ text: "Frankfurt (europe-west3)", value: "europe-west3" },
68+
{ text: "London (europe-west2)", value: "europe-west2" },
69+
{ text: "Netherlands (europe-west4)", value: "europe-west4" },
6470
{ text: "Zürich (europe-west6)", value: "europe-west6" },
71+
// Asia Pacific
6572
{ text: "Hong Kong (asia-east2)", value: "asia-east2" },
73+
{ text: "Jakarta (asia-southeast2)", value: "asia-southeast2" },
6674
{ text: "Mumbai (asia-south1)", value: "asia-south1" },
6775
{ text: "Osaka (asia-northeast2)", value: "asia-northeast2" },
68-
{ text: "Taiwan (asia-east1)", value: "asia-east1" },
69-
{ text: "Tokyo (asia-northeast1)", value: "asia-northeast1" },
76+
{ text: "Seoul (asia-northeast3)", value: "asia-northeast3" },
7077
{ text: "Singapore (asia-southeast1)", value: "asia-southeast1" },
7178
{ text: "Sydney (australia-southeast1)", value: "australia-southeast1" },
72-
{ text: "Seoul (asia-northeast3)", value: "asia-northeast3"}
79+
{ text: "Taiwan (asia-east1)", value: "asia-east1" },
80+
{ text: "Tokyo (asia-northeast1)", value: "asia-northeast1" }
7381
];
7482
this.queryPriority = [{text:"INTERACTIVE", value: "INTERACTIVE"}, {text:"BATCH", value: "BATCH"}];
7583
}

src/query_ctrl.ts

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,37 @@ export class BigQueryQueryCtrl extends QueryCtrl {
6969
{ text: "ASC", value: "1" },
7070
{ text: "DESC", value: "2" }
7171
];
72+
// GCP Dataset Locations: https://cloud.google.com/bigquery/docs/locations
7273
this.locations = [
74+
// Multi-regional locations
7375
{ text: "United States (US)", value: "US" },
7476
{ text: "European Union (EU)", value: "EU" },
77+
// Americas
78+
{ text: "Las Vegas (us-west4)", value: "us-west4" },
7579
{ text: "Los Angeles (us-west2)", value: "us-west2" },
76-
{
77-
text: "Montréal (northamerica-northeast1)",
78-
value: "northamerica-northeast1"
79-
},
80-
{ text: "South Carolina (us-east1)", value: "us-east1" },
80+
{ text: "Montréal (northamerica-northeast1)", value: "northamerica-northeast1" },
8181
{ text: "Northern Virginia (us-east4)", value: "us-east4" },
82+
{ text: "Oregon (us-west1)", value: "us-west1" },
83+
{ text: "Salt Lake City (us-west3)", value: "us-west3" },
8284
{ text: "São Paulo (southamerica-east1)", value: "southamerica-east1" },
85+
{ text: "South Carolina (us-east1)", value: "us-east1" },
86+
// Europe
87+
{ text: "Belgium (europe-west1)", value: "europe-west1" },
8388
{ text: "Finland (europe-north1)", value: "europe-north1" },
84-
{ text: "London (europe-west2)", value: "europe-west2" },
8589
{ text: "Frankfurt (europe-west3)", value: "europe-west3" },
90+
{ text: "London (europe-west2)", value: "europe-west2" },
91+
{ text: "Netherlands (europe-west4)", value: "europe-west4" },
8692
{ text: "Zürich (europe-west6)", value: "europe-west6" },
93+
// Asia Pacific
8794
{ text: "Hong Kong (asia-east2)", value: "asia-east2" },
95+
{ text: "Jakarta (asia-southeast2)", value: "asia-southeast2" },
8896
{ text: "Mumbai (asia-south1)", value: "asia-south1" },
8997
{ text: "Osaka (asia-northeast2)", value: "asia-northeast2" },
90-
{ text: "Taiwan (asia-east1)", value: "asia-east1" },
91-
{ text: "Tokyo (asia-northeast1)", value: "asia-northeast1" },
98+
{ text: "Seoul (asia-northeast3)", value: "asia-northeast3" },
9299
{ text: "Singapore (asia-southeast1)", value: "asia-southeast1" },
93-
{ text: "Sydney (australia-southeast1)", value: "australia-southeast1" }
100+
{ text: "Sydney (australia-southeast1)", value: "australia-southeast1" },
101+
{ text: "Taiwan (asia-east1)", value: "asia-east1" },
102+
{ text: "Tokyo (asia-northeast1)", value: "asia-northeast1" }
94103
];
95104
if (!this.target.rawSql) {
96105
// special handling when in table panel

0 commit comments

Comments
 (0)