Skip to content

Commit 5556c67

Browse files
committed
upgrade google providers
1 parent c4d1fe4 commit 5556c67

File tree

5 files changed

+90
-57
lines changed

5 files changed

+90
-57
lines changed

api/src/feeds/impl/models/gtfs_feed_impl.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@ def from_orm(cls, feed: GtfsfeedOrm | None) -> GtfsFeed | None:
2525
gtfs_feed.locations = [LocationImpl.from_orm(item) for item in feed.locations]
2626
gtfs_feed.latest_dataset = LatestDatasetImpl.from_orm(feed.latest_dataset)
2727
gtfs_feed.bounding_box = BoundingBoxImpl.from_orm(feed.bounding_box)
28-
gtfs_feed.visualization_dataset_id = feed.visualization_dataset_id
28+
gtfs_feed.visualization_dataset_id = (
29+
feed.visualization_dataset.stable_id if feed.visualization_dataset else None
30+
)
2931
return gtfs_feed

infra/.terraform.lock.hcl

Lines changed: 41 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/batch/.terraform.lock.hcl

Lines changed: 34 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/batch/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
terraform {
22
backend "gcs" {
33
}
4+
# Limiting to 6.0.0 due to a deprecated resource
5+
# google_datastore_index.batch_execution_index_execution_id_timestamp
46
required_providers {
57
google = {
68
source = "hashicorp/google"
7-
version = ">= 5.34.0"
9+
version = ">= 5.40.0, < 6.0.0"
10+
}
11+
google-beta = {
12+
source = "hashicorp/google-beta",
13+
version = ">= 5.40.0, < 6.0.0"
814
}
915
}
1016
}

infra/functions-python/main.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ terraform {
22
required_providers {
33
google = {
44
source = "hashicorp/google"
5-
version = "5.34.0"
5+
version = ">= 5.40.0, < 7.7.0"
6+
}
7+
google-beta = {
8+
source = "hashicorp/google-beta",
9+
version = ">= 5.40.0, < 7.7.0"
610
}
711
}
812
}

0 commit comments

Comments
 (0)