From a402b20bed535b193b030ff077b76515aa27a81e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 11:22:47 -0700 Subject: [PATCH 1/3] feat: add airflow_byoid_uri field to Cloud Composer API (#172) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add airflow_byoid_uri field to Cloud Composer API PiperOrigin-RevId: 527102116 Source-Link: https://github.com/googleapis/googleapis/commit/baf6171f7106175794758667cb3107055227ba5d Source-Link: https://github.com/googleapis/googleapis-gen/commit/5b90e617e5af922132b6918575bd3b5cf008a799 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWI5MGU2MTdlNWFmOTIyMTMyYjY5MTg1NzViZDNiNWNmMDA4YTc5OSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: add airflow_byoid_uri field to Cloud Composer API PiperOrigin-RevId: 527102364 Source-Link: https://github.com/googleapis/googleapis/commit/6a480738804c3cb9be90b2d4b099e787bba415f2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/a161ce2eb69fd3a5cb534b9511d09991d3afeb2f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTE2MWNlMmViNjlmZDNhNWNiNTM0Yjk1MTFkMDk5OTFkM2FmZWIyZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../airflow/service_v1/types/environments.py | 11 +++++++++++ .../airflow/service_v1beta1/types/environments.py | 11 +++++++++++ ...google.cloud.orchestration.airflow.service.v1.json | 2 +- ...e.cloud.orchestration.airflow.service.v1beta1.json | 2 +- tests/unit/gapic/service_v1/test_environments.py | 4 ++++ tests/unit/gapic/service_v1beta1/test_environments.py | 4 ++++ 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/google/cloud/orchestration/airflow/service_v1/types/environments.py b/google/cloud/orchestration/airflow/service_v1/types/environments.py index 1fbbb8a..8d2aab8 100644 --- a/google/cloud/orchestration/airflow/service_v1/types/environments.py +++ b/google/cloud/orchestration/airflow/service_v1/types/environments.py @@ -543,6 +543,13 @@ class EnvironmentConfig(proto.Message): Output only. The URI of the Apache Airflow Web UI hosted within this environment (see `Airflow web interface `__). + airflow_byoid_uri (str): + Output only. The 'bring your own identity' variant of the + URI of the Apache Airflow Web UI hosted within this + environment, to be accessed with external identities using + workforce identity federation (see `Access environments with + workforce identity + federation `__). master_authorized_networks_config (google.cloud.orchestration.airflow.service_v1.types.MasterAuthorizedNetworksConfig): Optional. The configuration options for GKE cluster master authorized networks. By default @@ -642,6 +649,10 @@ class EnvironmentSize(proto.Enum): proto.STRING, number=6, ) + airflow_byoid_uri: str = proto.Field( + proto.STRING, + number=20, + ) master_authorized_networks_config: "MasterAuthorizedNetworksConfig" = proto.Field( proto.MESSAGE, number=17, diff --git a/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py b/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py index efb0757..1ee53c2 100644 --- a/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py +++ b/google/cloud/orchestration/airflow/service_v1beta1/types/environments.py @@ -669,6 +669,13 @@ class EnvironmentConfig(proto.Message): Output only. The URI of the Apache Airflow Web UI hosted within this environment (see `Airflow web interface `__). + airflow_byoid_uri (str): + Output only. The 'bring your own identity' variant of the + URI of the Apache Airflow Web UI hosted within this + environment, to be accessed with external identities using + workforce identity federation (see `Access environments with + workforce identity + federation `__). encryption_config (google.cloud.orchestration.airflow.service_v1beta1.types.EncryptionConfig): Optional. The encryption options for the Cloud Composer environment and its dependencies. @@ -784,6 +791,10 @@ class EnvironmentSize(proto.Enum): proto.STRING, number=6, ) + airflow_byoid_uri: str = proto.Field( + proto.STRING, + number=21, + ) encryption_config: "EncryptionConfig" = proto.Field( proto.MESSAGE, number=12, diff --git a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json index 2e23a66..afcb961 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-orchestration-airflow", - "version": "1.7.1" + "version": "0.1.0" }, "snippets": [ { diff --git a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json index 3e2fd30..5ba2ed3 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-orchestration-airflow-service", - "version": "1.7.1" + "version": "0.1.0" }, "snippets": [ { diff --git a/tests/unit/gapic/service_v1/test_environments.py b/tests/unit/gapic/service_v1/test_environments.py index 3ecca39..589f5ab 100644 --- a/tests/unit/gapic/service_v1/test_environments.py +++ b/tests/unit/gapic/service_v1/test_environments.py @@ -2516,6 +2516,7 @@ def test_create_environment_rest(request_type): }, "environment_size": 1, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "master_authorized_networks_config": { "enabled": True, "cidr_blocks": [ @@ -2708,6 +2709,7 @@ def test_create_environment_rest_bad_request( }, "environment_size": 1, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "master_authorized_networks_config": { "enabled": True, "cidr_blocks": [ @@ -3330,6 +3332,7 @@ def test_update_environment_rest(request_type): }, "environment_size": 1, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "master_authorized_networks_config": { "enabled": True, "cidr_blocks": [ @@ -3522,6 +3525,7 @@ def test_update_environment_rest_bad_request( }, "environment_size": 1, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "master_authorized_networks_config": { "enabled": True, "cidr_blocks": [ diff --git a/tests/unit/gapic/service_v1beta1/test_environments.py b/tests/unit/gapic/service_v1beta1/test_environments.py index 05dd035..1d04aeb 100644 --- a/tests/unit/gapic/service_v1beta1/test_environments.py +++ b/tests/unit/gapic/service_v1beta1/test_environments.py @@ -2796,6 +2796,7 @@ def test_create_environment_rest(request_type): "database_config": {"machine_type": "machine_type_value"}, "web_server_config": {"machine_type": "machine_type_value"}, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "encryption_config": {"kms_key_name": "kms_key_name_value"}, "maintenance_window": { "start_time": {"seconds": 751, "nanos": 543}, @@ -2991,6 +2992,7 @@ def test_create_environment_rest_bad_request( "database_config": {"machine_type": "machine_type_value"}, "web_server_config": {"machine_type": "machine_type_value"}, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "encryption_config": {"kms_key_name": "kms_key_name_value"}, "maintenance_window": { "start_time": {"seconds": 751, "nanos": 543}, @@ -3616,6 +3618,7 @@ def test_update_environment_rest(request_type): "database_config": {"machine_type": "machine_type_value"}, "web_server_config": {"machine_type": "machine_type_value"}, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "encryption_config": {"kms_key_name": "kms_key_name_value"}, "maintenance_window": { "start_time": {"seconds": 751, "nanos": 543}, @@ -3893,6 +3896,7 @@ def test_update_environment_rest_bad_request( "database_config": {"machine_type": "machine_type_value"}, "web_server_config": {"machine_type": "machine_type_value"}, "airflow_uri": "airflow_uri_value", + "airflow_byoid_uri": "airflow_byoid_uri_value", "encryption_config": {"kms_key_name": "kms_key_name_value"}, "maintenance_window": { "start_time": {"seconds": 751, "nanos": 543}, From 9c8ac8fcd7ad4f5361cf1a4d4f135ec02ebdd166 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 16:18:30 +0000 Subject: [PATCH 2/3] build(deps): bump requests to 2.31.0 [autoapprove] (#174) Source-Link: https://togithub.com/googleapis/synthtool/commit/30bd01b4ab78bf1b2a425816e15b3e7e090993dd Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b --- .github/.OwlBot.lock.yaml | 3 ++- .kokoro/requirements.txt | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b8edda5..32b3c48 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:2e247c7bf5154df7f98cce087a20ca7605e236340c7d6d1a14447e5c06791bd6 + digest: sha256:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b +# created: 2023-05-25T14:56:16.294623272Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 66a2172..3b8d7ee 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -419,9 +419,9 @@ readme-renderer==37.3 \ --hash=sha256:cd653186dfc73055656f090f227f5cb22a046d7f71a841dfa305f55c9a513273 \ --hash=sha256:f67a16caedfa71eef48a31b39708637a6f4664c4394801a7b0d6432d13907343 # via twine -requests==2.28.1 \ - --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ - --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349 +requests==2.31.0 \ + --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ + --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 # via # gcp-releasetool # google-api-core From ffc4bbcd39af6105b5540b5a9f02f2dc6339c643 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 14:02:20 -0400 Subject: [PATCH 3/3] chore(main): release 1.8.0 (#173) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ .../cloud/orchestration/airflow/service/gapic_version.py | 2 +- .../orchestration/airflow/service_v1/gapic_version.py | 2 +- .../orchestration/airflow/service_v1beta1/gapic_version.py | 2 +- ...data_google.cloud.orchestration.airflow.service.v1.json | 2 +- ...google.cloud.orchestration.airflow.service.v1beta1.json | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index d0972da..099626f 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "1.7.1" + ".": "1.8.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 479e903..a93ee4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.8.0](https://github.com/googleapis/python-orchestration-airflow/compare/v1.7.1...v1.8.0) (2023-05-25) + + +### Features + +* Add airflow_byoid_uri field to Cloud Composer API ([#172](https://github.com/googleapis/python-orchestration-airflow/issues/172)) ([a402b20](https://github.com/googleapis/python-orchestration-airflow/commit/a402b20bed535b193b030ff077b76515aa27a81e)) + ## [1.7.1](https://github.com/googleapis/python-orchestration-airflow/compare/v1.7.0...v1.7.1) (2023-03-23) diff --git a/google/cloud/orchestration/airflow/service/gapic_version.py b/google/cloud/orchestration/airflow/service/gapic_version.py index 84856f0..b334dcc 100644 --- a/google/cloud/orchestration/airflow/service/gapic_version.py +++ b/google/cloud/orchestration/airflow/service/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.7.1" # {x-release-please-version} +__version__ = "1.8.0" # {x-release-please-version} diff --git a/google/cloud/orchestration/airflow/service_v1/gapic_version.py b/google/cloud/orchestration/airflow/service_v1/gapic_version.py index 84856f0..b334dcc 100644 --- a/google/cloud/orchestration/airflow/service_v1/gapic_version.py +++ b/google/cloud/orchestration/airflow/service_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.7.1" # {x-release-please-version} +__version__ = "1.8.0" # {x-release-please-version} diff --git a/google/cloud/orchestration/airflow/service_v1beta1/gapic_version.py b/google/cloud/orchestration/airflow/service_v1beta1/gapic_version.py index 84856f0..b334dcc 100644 --- a/google/cloud/orchestration/airflow/service_v1beta1/gapic_version.py +++ b/google/cloud/orchestration/airflow/service_v1beta1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "1.7.1" # {x-release-please-version} +__version__ = "1.8.0" # {x-release-please-version} diff --git a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json index afcb961..1c50fcd 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-orchestration-airflow", - "version": "0.1.0" + "version": "1.8.0" }, "snippets": [ { diff --git a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json index 5ba2ed3..9371937 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.orchestration.airflow.service.v1beta1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-orchestration-airflow-service", - "version": "0.1.0" + "version": "1.8.0" }, "snippets": [ {