diff --git a/packages/google-cloud-appengine-admin/.github/.OwlBot.lock.yaml b/packages/google-cloud-appengine-admin/.github/.OwlBot.lock.yaml new file mode 100644 index 000000000000..d49860b32e70 --- /dev/null +++ b/packages/google-cloud-appengine-admin/.github/.OwlBot.lock.yaml @@ -0,0 +1,4 @@ +docker: + digest: sha256:457583330eec64daa02aeb7a72a04d33e7be2428f646671ce4045dcbc0191b1e + image: gcr.io/repo-automation-bots/owlbot-python:latest + diff --git a/packages/google-cloud-appengine-admin/.github/.OwlBot.yaml b/packages/google-cloud-appengine-admin/.github/.OwlBot.yaml new file mode 100644 index 000000000000..d8bfd9afa2d9 --- /dev/null +++ b/packages/google-cloud-appengine-admin/.github/.OwlBot.yaml @@ -0,0 +1,26 @@ +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +docker: + image: gcr.io/repo-automation-bots/owlbot-python:latest + +deep-remove-regex: + - /owl-bot-staging + +deep-copy-regex: + - source: /google/appengine/(v.*)/.*-py/(.*) + dest: /owl-bot-staging/$1/$2 + +begin-after-commit-hash: 5f1b96948e61e31e6bb4b586238ad79d6c24cdc3 + diff --git a/packages/google-cloud-appengine-admin/.kokoro/release.sh b/packages/google-cloud-appengine-admin/.kokoro/release.sh index 267f0bed6e52..107a7d9509d5 100755 --- a/packages/google-cloud-appengine-admin/.kokoro/release.sh +++ b/packages/google-cloud-appengine-admin/.kokoro/release.sh @@ -26,7 +26,7 @@ python3 -m pip install --upgrade twine wheel setuptools export PYTHONUNBUFFERED=1 # Move into the package, build the distribution and upload. -TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google_cloud_pypi_password") +TWINE_PASSWORD=$(cat "${KOKORO_GFILE_DIR}/secret_manager/google-cloud-pypi-token") cd github/python-appengine-admin python3 setup.py sdist bdist_wheel -twine upload --username gcloudpypi --password "${TWINE_PASSWORD}" dist/* +twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/* diff --git a/packages/google-cloud-appengine-admin/.kokoro/release/common.cfg b/packages/google-cloud-appengine-admin/.kokoro/release/common.cfg index e14b6ac9f61f..935c70f7cc86 100644 --- a/packages/google-cloud-appengine-admin/.kokoro/release/common.cfg +++ b/packages/google-cloud-appengine-admin/.kokoro/release/common.cfg @@ -23,18 +23,8 @@ env_vars: { value: "github/python-appengine-admin/.kokoro/release.sh" } -# Fetch PyPI password -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "google_cloud_pypi_password" - } - } -} - # Tokens needed to report release status back to GitHub env_vars: { key: "SECRET_MANAGER_KEYS" - value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" -} \ No newline at end of file + value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,google-cloud-pypi-token" +} diff --git a/packages/google-cloud-appengine-admin/.pre-commit-config.yaml b/packages/google-cloud-appengine-admin/.pre-commit-config.yaml index 8912e9b5d7d7..1bbd787833ec 100644 --- a/packages/google-cloud-appengine-admin/.pre-commit-config.yaml +++ b/packages/google-cloud-appengine-admin/.pre-commit-config.yaml @@ -26,6 +26,6 @@ repos: hooks: - id: black - repo: https://gitlab.com/pycqa/flake8 - rev: 3.9.0 + rev: 3.9.1 hooks: - id: flake8 diff --git a/packages/google-cloud-appengine-admin/CONTRIBUTING.rst b/packages/google-cloud-appengine-admin/CONTRIBUTING.rst index 98f860f07f4e..9aec34d18b41 100644 --- a/packages/google-cloud-appengine-admin/CONTRIBUTING.rst +++ b/packages/google-cloud-appengine-admin/CONTRIBUTING.rst @@ -160,21 +160,7 @@ Running System Tests auth settings and change some configuration in your project to run all the tests. -- System tests will be run against an actual project and - so you'll need to provide some environment variables to facilitate - authentication to your project: - - - ``GOOGLE_APPLICATION_CREDENTIALS``: The path to a JSON key file; - Such a file can be downloaded directly from the developer's console by clicking - "Generate new JSON key". See private key - `docs `__ - for more details. - -- Once you have downloaded your json keys, set the environment variable - ``GOOGLE_APPLICATION_CREDENTIALS`` to the absolute path of the json file:: - - $ export GOOGLE_APPLICATION_CREDENTIALS="/Users//path/to/app_credentials.json" - +- System tests will be run against an actual project. You should use local credentials from gcloud when possible. See `Best practices for application authentication `__. Some tests require a service account. For those tests see `Authenticating as a service account `__. ************* Test Coverage diff --git a/packages/google-cloud-appengine-admin/docs/_static/custom.css b/packages/google-cloud-appengine-admin/docs/_static/custom.css index bcd37bbd3c4a..b0a295464b23 100644 --- a/packages/google-cloud-appengine-admin/docs/_static/custom.css +++ b/packages/google-cloud-appengine-admin/docs/_static/custom.css @@ -1,9 +1,20 @@ div#python2-eol { border-color: red; border-width: medium; -} +} /* Ensure minimum width for 'Parameters' / 'Returns' column */ dl.field-list > dt { min-width: 100px } + +/* Insert space between methods for readability */ +dl.method { + padding-top: 10px; + padding-bottom: 10px +} + +/* Insert empty space between classes */ +dl.class { + padding-bottom: 50px +} diff --git a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py index 60a8089f80f9..a463e618d72b 100644 --- a/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py +++ b/packages/google-cloud-appengine-admin/google/cloud/appengine_admin_v1/__init__.py @@ -130,11 +130,11 @@ "ApiConfigHandler", "ApiEndpointHandler", "Application", - "ApplicationsClient", "AuditData", "AuthFailAction", "AuthorizedCertificate", "AuthorizedCertificateView", + "AuthorizedCertificatesClient", "AuthorizedDomain", "AuthorizedDomainsClient", "AutomaticScaling", @@ -235,5 +235,5 @@ "Volume", "VpcAccessConnector", "ZipInfo", - "AuthorizedCertificatesClient", + "ApplicationsClient", ) diff --git a/packages/google-cloud-appengine-admin/noxfile.py b/packages/google-cloud-appengine-admin/noxfile.py index af50a606196c..1d45cadce4dd 100644 --- a/packages/google-cloud-appengine-admin/noxfile.py +++ b/packages/google-cloud-appengine-admin/noxfile.py @@ -62,16 +62,9 @@ def lint(session): session.run("flake8", "google", "tests") -@nox.session(python="3.6") +@nox.session(python=DEFAULT_PYTHON_VERSION) def blacken(session): - """Run black. - - Format code to uniform standard. - - This currently uses Python 3.6 due to the automated Kokoro run of synthtool. - That run uses an image that doesn't have 3.6 installed. Before updating this - check the state of the `gcp_ubuntu_config` we use for that Kokoro run. - """ + """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) session.run( "black", *BLACK_PATHS, @@ -131,9 +124,6 @@ def system(session): # Check the value of `RUN_SYSTEM_TESTS` env var. It defaults to true. if os.environ.get("RUN_SYSTEM_TESTS", "true") == "false": session.skip("RUN_SYSTEM_TESTS is set to false, skipping") - # Sanity check: Only run tests if the environment variable is set. - if not os.environ.get("GOOGLE_APPLICATION_CREDENTIALS", ""): - session.skip("Credentials must be set via environment variable") # Install pyopenssl for mTLS testing. if os.environ.get("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true": session.install("pyopenssl") diff --git a/packages/google-cloud-appengine-admin/synth.py b/packages/google-cloud-appengine-admin/owlbot.py similarity index 74% rename from packages/google-cloud-appengine-admin/synth.py rename to packages/google-cloud-appengine-admin/owlbot.py index a3eab89cb607..30ffad7bb2a8 100644 --- a/packages/google-cloud-appengine-admin/synth.py +++ b/packages/google-cloud-appengine-admin/owlbot.py @@ -20,24 +20,11 @@ import synthtool.gcp as gcp from synthtool.languages import python -gapic = gcp.GAPICBazel() common = gcp.CommonTemplates() -versions = [ - "v1", - -] # add new versions at the end of the list - -# ---------------------------------------------------------------------------- -# Generate appengine GAPIC layer -# ---------------------------------------------------------------------------- -for version in versions: - library = gapic.py_library( - service="appengine", - version=version, - bazel_target=f"//google/appengine/{version}:google-cloud-appengine-{version}-py", - ) +default_version = "v1" +for library in s.get_staging_dirs(default_version): excludes=["setup.py", "README.rst", "docs/index.rst"] # See https://github.com/googleapis/gapic-generator-python/issues/825 @@ -45,6 +32,8 @@ s.move(library, excludes=excludes) +s.remove_staging_dirs() + # ---------------------------------------------------------------------------- # Add templated files # ---------------------------------------------------------------------------- diff --git a/packages/google-cloud-appengine-admin/synth.metadata b/packages/google-cloud-appengine-admin/synth.metadata deleted file mode 100644 index bb42d8d19a58..000000000000 --- a/packages/google-cloud-appengine-admin/synth.metadata +++ /dev/null @@ -1,221 +0,0 @@ -{ - "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/python-appengine-admin.git", - "sha": "29d67f947f488bd15684a525ee408f42d41fa1e6" - } - }, - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "7e91915c247a5c84ab5fcdf11ce2bdf7404f2fcc", - "internalRef": "367156876" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0a071b3460344886297a304253bf924aa68ddb7e" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0a071b3460344886297a304253bf924aa68ddb7e" - } - } - ], - "destinations": [ - { - "client": { - "source": "googleapis", - "apiName": "appengine", - "apiVersion": "v1", - "language": "python", - "generator": "bazel" - } - } - ], - "generatedFiles": [ - ".coveragerc", - ".flake8", - ".github/CONTRIBUTING.md", - ".github/ISSUE_TEMPLATE/bug_report.md", - ".github/ISSUE_TEMPLATE/feature_request.md", - ".github/ISSUE_TEMPLATE/support_request.md", - ".github/PULL_REQUEST_TEMPLATE.md", - ".github/header-checker-lint.yml", - ".github/release-please.yml", - ".github/snippet-bot.yml", - ".gitignore", - ".kokoro/build.sh", - ".kokoro/continuous/common.cfg", - ".kokoro/continuous/continuous.cfg", - ".kokoro/docker/docs/Dockerfile", - ".kokoro/docker/docs/fetch_gpg_keys.sh", - ".kokoro/docs/common.cfg", - ".kokoro/docs/docs-presubmit.cfg", - ".kokoro/docs/docs.cfg", - ".kokoro/populate-secrets.sh", - ".kokoro/presubmit/common.cfg", - ".kokoro/presubmit/presubmit.cfg", - ".kokoro/publish-docs.sh", - ".kokoro/release.sh", - ".kokoro/release/common.cfg", - ".kokoro/release/release.cfg", - ".kokoro/samples/lint/common.cfg", - ".kokoro/samples/lint/continuous.cfg", - ".kokoro/samples/lint/periodic.cfg", - ".kokoro/samples/lint/presubmit.cfg", - ".kokoro/samples/python3.6/common.cfg", - ".kokoro/samples/python3.6/continuous.cfg", - ".kokoro/samples/python3.6/periodic-head.cfg", - ".kokoro/samples/python3.6/periodic.cfg", - ".kokoro/samples/python3.6/presubmit.cfg", - ".kokoro/samples/python3.7/common.cfg", - ".kokoro/samples/python3.7/continuous.cfg", - ".kokoro/samples/python3.7/periodic-head.cfg", - ".kokoro/samples/python3.7/periodic.cfg", - ".kokoro/samples/python3.7/presubmit.cfg", - ".kokoro/samples/python3.8/common.cfg", - ".kokoro/samples/python3.8/continuous.cfg", - ".kokoro/samples/python3.8/periodic-head.cfg", - ".kokoro/samples/python3.8/periodic.cfg", - ".kokoro/samples/python3.8/presubmit.cfg", - ".kokoro/test-samples-against-head.sh", - ".kokoro/test-samples-impl.sh", - ".kokoro/test-samples.sh", - ".kokoro/trampoline.sh", - ".kokoro/trampoline_v2.sh", - ".pre-commit-config.yaml", - ".trampolinerc", - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.rst", - "LICENSE", - "MANIFEST.in", - "docs/_static/custom.css", - "docs/_templates/layout.html", - "docs/appengine_admin_v1/applications.rst", - "docs/appengine_admin_v1/authorized_certificates.rst", - "docs/appengine_admin_v1/authorized_domains.rst", - "docs/appengine_admin_v1/domain_mappings.rst", - "docs/appengine_admin_v1/firewall.rst", - "docs/appengine_admin_v1/instances.rst", - "docs/appengine_admin_v1/types.rst", - "docs/appengine_admin_v1/versions.rst", - "docs/conf.py", - "docs/multiprocessing.rst", - "google/cloud/appengine_admin/__init__.py", - "google/cloud/appengine_admin/py.typed", - "google/cloud/appengine_admin_v1/__init__.py", - "google/cloud/appengine_admin_v1/py.typed", - "google/cloud/appengine_admin_v1/services/__init__.py", - "google/cloud/appengine_admin_v1/services/applications/__init__.py", - "google/cloud/appengine_admin_v1/services/applications/async_client.py", - "google/cloud/appengine_admin_v1/services/applications/client.py", - "google/cloud/appengine_admin_v1/services/applications/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/applications/transports/base.py", - "google/cloud/appengine_admin_v1/services/applications/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/applications/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/__init__.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/async_client.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/client.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/pagers.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/transports/base.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/authorized_certificates/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/__init__.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/async_client.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/client.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/pagers.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/transports/base.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/authorized_domains/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/__init__.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/async_client.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/client.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/pagers.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/transports/base.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/domain_mappings/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/services/firewall/__init__.py", - "google/cloud/appengine_admin_v1/services/firewall/async_client.py", - "google/cloud/appengine_admin_v1/services/firewall/client.py", - "google/cloud/appengine_admin_v1/services/firewall/pagers.py", - "google/cloud/appengine_admin_v1/services/firewall/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/firewall/transports/base.py", - "google/cloud/appengine_admin_v1/services/firewall/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/firewall/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/services/instances/__init__.py", - "google/cloud/appengine_admin_v1/services/instances/async_client.py", - "google/cloud/appengine_admin_v1/services/instances/client.py", - "google/cloud/appengine_admin_v1/services/instances/pagers.py", - "google/cloud/appengine_admin_v1/services/instances/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/instances/transports/base.py", - "google/cloud/appengine_admin_v1/services/instances/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/instances/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/services/services/__init__.py", - "google/cloud/appengine_admin_v1/services/services/async_client.py", - "google/cloud/appengine_admin_v1/services/services/client.py", - "google/cloud/appengine_admin_v1/services/services/pagers.py", - "google/cloud/appengine_admin_v1/services/services/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/services/transports/base.py", - "google/cloud/appengine_admin_v1/services/services/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/services/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/services/versions/__init__.py", - "google/cloud/appengine_admin_v1/services/versions/async_client.py", - "google/cloud/appengine_admin_v1/services/versions/client.py", - "google/cloud/appengine_admin_v1/services/versions/pagers.py", - "google/cloud/appengine_admin_v1/services/versions/transports/__init__.py", - "google/cloud/appengine_admin_v1/services/versions/transports/base.py", - "google/cloud/appengine_admin_v1/services/versions/transports/grpc.py", - "google/cloud/appengine_admin_v1/services/versions/transports/grpc_asyncio.py", - "google/cloud/appengine_admin_v1/types/__init__.py", - "google/cloud/appengine_admin_v1/types/app_yaml.py", - "google/cloud/appengine_admin_v1/types/appengine.py", - "google/cloud/appengine_admin_v1/types/application.py", - "google/cloud/appengine_admin_v1/types/audit_data.py", - "google/cloud/appengine_admin_v1/types/certificate.py", - "google/cloud/appengine_admin_v1/types/deploy.py", - "google/cloud/appengine_admin_v1/types/deployed_files.py", - "google/cloud/appengine_admin_v1/types/domain.py", - "google/cloud/appengine_admin_v1/types/domain_mapping.py", - "google/cloud/appengine_admin_v1/types/firewall.py", - "google/cloud/appengine_admin_v1/types/instance.py", - "google/cloud/appengine_admin_v1/types/location.py", - "google/cloud/appengine_admin_v1/types/network_settings.py", - "google/cloud/appengine_admin_v1/types/operation.py", - "google/cloud/appengine_admin_v1/types/service.py", - "google/cloud/appengine_admin_v1/types/version.py", - "mypy.ini", - "noxfile.py", - "renovate.json", - "scripts/decrypt-secrets.sh", - "scripts/fixup_appengine_admin_v1_keywords.py", - "scripts/readme-gen/readme_gen.py", - "scripts/readme-gen/templates/README.tmpl.rst", - "scripts/readme-gen/templates/auth.tmpl.rst", - "scripts/readme-gen/templates/auth_api_key.tmpl.rst", - "scripts/readme-gen/templates/install_deps.tmpl.rst", - "scripts/readme-gen/templates/install_portaudio.tmpl.rst", - "setup.cfg", - "testing/.gitignore", - "tests/unit/gapic/appengine_admin_v1/__init__.py", - "tests/unit/gapic/appengine_admin_v1/test_applications.py", - "tests/unit/gapic/appengine_admin_v1/test_authorized_certificates.py", - "tests/unit/gapic/appengine_admin_v1/test_authorized_domains.py", - "tests/unit/gapic/appengine_admin_v1/test_domain_mappings.py", - "tests/unit/gapic/appengine_admin_v1/test_firewall.py", - "tests/unit/gapic/appengine_admin_v1/test_instances.py", - "tests/unit/gapic/appengine_admin_v1/test_services.py", - "tests/unit/gapic/appengine_admin_v1/test_versions.py" - ] -} \ No newline at end of file