diff --git a/.circleci/config.yml b/.circleci/config.yml index 6fef7704cf..cabbd471c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -235,7 +235,7 @@ jobs: showcase: docker: - image: python:3.8-slim - - image: gcr.io/gapic-images/gapic-showcase:0.11.0 + - image: gcr.io/gapic-images/gapic-showcase:0.16.0 steps: - checkout - run: @@ -284,7 +284,7 @@ jobs: command: | mkdir gapic_showcase cd gapic_showcase - curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v0.11.0/gapic-showcase-0.11.0-linux-amd64.tar.gz | tar xz + curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v0.16.0/gapic-showcase-0.16.0-linux-amd64.tar.gz | tar xz ./gapic-showcase run --mtls-ca-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-key=/tmp/workspace/tests/cert/mtls.key & showcase_pid=$! @@ -301,7 +301,7 @@ jobs: showcase-alternative-templates: docker: - image: python:3.8-slim - - image: gcr.io/gapic-images/gapic-showcase:0.11.0 + - image: gcr.io/gapic-images/gapic-showcase:0.16.0 steps: - checkout - run: @@ -350,7 +350,7 @@ jobs: command: | mkdir gapic_showcase cd gapic_showcase - curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v0.11.0/gapic-showcase-0.11.0-linux-amd64.tar.gz | tar xz + curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v0.16.0/gapic-showcase-0.16.0-linux-amd64.tar.gz | tar xz ./gapic-showcase run --mtls-ca-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-key=/tmp/workspace/tests/cert/mtls.key & showcase_pid=$! diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 623dfc04c4..e99d5633e0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -98,7 +98,7 @@ jobs: run: | sudo mkdir -p /usr/src/showcase sudo chown -R ${USER} /usr/src/ - curl --location https://github.com/googleapis/gapic-showcase/releases/download/v0.12.0/gapic-showcase-0.12.0-linux-amd64.tar.gz --output /usr/src/showcase/showcase-0.12.0-linux-amd64.tar.gz + curl --location https://github.com/googleapis/gapic-showcase/releases/download/v0.16.0/gapic-showcase-0.16.0-linux-amd64.tar.gz --output /usr/src/showcase/showcase-0.16.0-linux-amd64.tar.gz cd /usr/src/showcase/ tar -xf showcase-* ./gapic-showcase run & @@ -156,7 +156,7 @@ jobs: sudo mkdir gapic_showcase sudo chown ${USER} gapic_showcase cd gapic_showcase - curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v0.11.0/gapic-showcase-0.11.0-linux-amd64.tar.gz | tar xz + curl -sSL https://github.com/googleapis/gapic-showcase/releases/download/v0.16.0/gapic-showcase-0.16.0-linux-amd64.tar.gz | tar xz ./gapic-showcase run --mtls-ca-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-cert=/tmp/workspace/tests/cert/mtls.crt --mtls-key=/tmp/workspace/tests/cert/mtls.key & showcase_pid=$! diff --git a/noxfile.py b/noxfile.py index bf5e378d97..cf842dc494 100644 --- a/noxfile.py +++ b/noxfile.py @@ -25,7 +25,7 @@ import shutil -showcase_version = "0.11.0" +showcase_version = "0.16.0" ADS_TEMPLATES = path.join(path.dirname(__file__), "gapic", "ads-templates") diff --git a/tests/system/test_resource_crud.py b/tests/system/test_resource_crud.py index 85bafe561a..8af963e86a 100644 --- a/tests/system/test_resource_crud.py +++ b/tests/system/test_resource_crud.py @@ -62,15 +62,15 @@ def test_nonslash_resource(messaging): def test_path_parsing(messaging): - expected = {"room_id": "tiki"} + expected = {"room": "tiki"} actual = messaging.parse_room_path(messaging.room_path("tiki")) assert expected == actual expected = { - "user_id": "bdfl", - "legacy_user_id": "apocalyptic", - "blurb_id": "city", + "user": "bdfl", + "legacy_user": "apocalyptic", + "blurb": "city", } actual = messaging.parse_blurb_path( messaging.blurb_path("bdfl", "apocalyptic", "city")