From ebf183c486a0b305d1cb96c8b13359c7de9b115a Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Tue, 9 Jul 2019 13:10:43 -0700 Subject: [PATCH 001/102] Container Analysis samples [(#2258)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2258) added container analysis samples and tests --- .../container_analysis/snippets/.gitignore | 1 + .../container_analysis/snippets/README.md | 54 +++ .../snippets/requirements.txt | 6 + .../container_analysis/snippets/samples.py | 373 ++++++++++++++++++ .../snippets/samples_test.py | 294 ++++++++++++++ 5 files changed, 728 insertions(+) create mode 100644 container_registry/container_analysis/snippets/.gitignore create mode 100644 container_registry/container_analysis/snippets/README.md create mode 100644 container_registry/container_analysis/snippets/requirements.txt create mode 100644 container_registry/container_analysis/snippets/samples.py create mode 100644 container_registry/container_analysis/snippets/samples_test.py diff --git a/container_registry/container_analysis/snippets/.gitignore b/container_registry/container_analysis/snippets/.gitignore new file mode 100644 index 00000000000..9e3d04c4950 --- /dev/null +++ b/container_registry/container_analysis/snippets/.gitignore @@ -0,0 +1 @@ +venv* diff --git a/container_registry/container_analysis/snippets/README.md b/container_registry/container_analysis/snippets/README.md new file mode 100644 index 00000000000..73c45c35478 --- /dev/null +++ b/container_registry/container_analysis/snippets/README.md @@ -0,0 +1,54 @@ +Google +Cloud Platform logo + +# Google Cloud Container Analysis Samples + + +Container Analysis scans container images stored in Container Registry for vulnerabilities. +Continuous automated analysis of containers keep you informed about known vulnerabilities so +that you can review and address issues before deployment. + +Additionally, third-party metadata providers can use Container Analysis to store and +retrieve additional metadata for their customers' images, such as packages installed in an image. + + +## Description + +These samples show how to use the [Google Cloud Container Analysis Client Library](https://cloud.google.com/container-registry/docs/reference/libraries). + +## Build and Run +1. **Enable APIs** + - [Enable the Container Analysis API](https://console.cloud.google.com/flows/enableapi?apiid=containeranalysis.googleapis.com) + and create a new project or select an existing project. +1. **Install and Initialize Cloud SDK** + - Follow instructions from the available [quickstarts](https://cloud.google.com/sdk/docs/quickstarts) +1. **Authenticate with GCP** + - Typically, you should authenticate using a [service account key](https://cloud.google.com/docs/authentication/getting-started) +1. **Clone the repo** and cd into this directory + + ``` + git clone https://github.com/GoogleCloudPlatform/python-docs-samples + cd python-docs-samples + ``` + +1. **Set Environment Variables** + + ``` + export GCLOUD_PROJECT="YOUR_PROJECT_ID" + ``` + +1. **Run Tests** + + ``` + nox -s "py36(sample='./container_registry/container_analysis')" + ``` + +## Contributing changes + +* See [CONTRIBUTING.md](../../CONTRIBUTING.md) + +## Licensing + +* See [LICENSE](../../LICENSE) + diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt new file mode 100644 index 00000000000..ac6aa320681 --- /dev/null +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -0,0 +1,6 @@ +google-cloud-pubsub == 0.42.1 +google-cloud-containeranalysis == 0.1.0 +grafeas == 0.1.0 +pytest +flaky +mock diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py new file mode 100644 index 00000000000..892b47ddb44 --- /dev/null +++ b/container_registry/container_analysis/snippets/samples.py @@ -0,0 +1,373 @@ +#!/bin/python +# Copyright 2019 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. + + +# [START containeranalysis_create_note] +def create_note(note_id, project_id): + """Creates and returns a new vulnerability note.""" + # note_id = 'my-note' + # project_id = 'my-gcp-project' + + from grafeas.grafeas_v1.gapic.enums import Version + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + project_name = grafeas_client.project_path(project_id) + note = { + 'vulnerability': { + 'details': [ + { + 'affected_cpe_uri': 'your-uri-here', + 'affected_package': 'your-package-here', + 'min_affected_version': { + 'kind': Version.VersionKind.MINIMUM + }, + 'fixed_version': { + 'kind': Version.VersionKind.MAXIMUM + } + } + ] + } + } + response = grafeas_client.create_note(project_name, note_id, note) + return response +# [END containeranalysis_create_note] + + +# [START containeranalysis_delete_note] +def delete_note(note_id, project_id): + """Removes an existing note from the server.""" + # note_id = 'my-note' + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + note_name = grafeas_client.note_path(project_id, note_id) + + grafeas_client.delete_note(note_name) +# [END containeranalysis_delete_note] + + +# [START ccontaineranalysis_create_occurrence] +def create_occurrence(resource_url, note_id, occurrence_project, note_project): + """ Creates and returns a new occurrence of a previously + created vulnerability note.""" + # resource_url = 'https://gcr.io/my-project/my-image@sha256:123' + # note_id = 'my-note' + # occurrence_project = 'my-gcp-project' + # note_project = 'my-gcp-project' + + from grafeas.grafeas_v1.gapic.enums import Version + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + formatted_note = grafeas_client.note_path(note_project, note_id) + formatted_project = grafeas_client.project_path(occurrence_project) + + occurrence = { + 'note_name': formatted_note, + 'resource_uri': resource_url, + 'vulnerability': { + 'package_issue': [ + { + 'affected_cpe_uri': 'your-uri-here', + 'affected_package': 'your-package-here', + 'min_affected_version': { + 'kind': Version.VersionKind.MINIMUM + }, + 'fixed_version': { + 'kind': Version.VersionKind.MAXIMUM + } + } + ] + } + } + + return grafeas_client.create_occurrence(formatted_project, occurrence) +# [END containeranalysis_create_occurrence] + + +# [START containeranalysis_delete_occurrence] +def delete_occurrence(occurrence_id, project_id): + """Removes an existing occurrence from the server.""" + # occurrence_id = basename(occurrence.name) + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + parent = grafeas_client.occurrence_path(project_id, occurrence_id) + grafeas_client.delete_occurrence(parent) +# [END containeranalysis_delete_occurrence] + + +# [START containeranalysis_get_note] +def get_note(note_id, project_id): + """Retrieves and prints a specified note from the server.""" + # note_id = 'my-note' + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + note_name = grafeas_client.note_path(project_id, note_id) + response = grafeas_client.get_note(note_name) + return response +# [END containeranalysis_get_note] + + +# [START containeranalysis_get_occurrence] +def get_occurrence(occurrence_id, project_id): + """retrieves and prints a specified occurrence from the server.""" + # occurrence_id = basename(occurrence.name) + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + parent = grafeas_client.occurrence_path(project_id, occurrence_id) + return grafeas_client.get_occurrence(parent) +# [END containeranalysis_get_occurrence] + + +# [START containeranalysis_discovery_info] +def get_discovery_info(resource_url, project_id): + """Retrieves and prints the discovery occurrence created for a specified + image. The discovery occurrence contains information about the initial + scan on the image.""" + # resource_url = 'https://gcr.io/my-project/my-image@sha256:123' + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + filter_str = 'kind="DISCOVERY" AND resourceUrl="{}"'.format(resource_url) + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + project_name = grafeas_client.project_path(project_id) + response = grafeas_client.list_occurrences(project_name, + filter_=filter_str) + for occ in response: + print(occ) +# [END containeranalysis_discovery_info] + + +# [START containeranalysis_occurrences_for_note] +def get_occurrences_for_note(note_id, project_id): + """Retrieves all the occurrences associated with a specified Note. + Here, all occurrences are printed and counted.""" + # note_id = 'my-note' + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + note_name = grafeas_client.note_path(project_id, note_id) + + response = grafeas_client.list_note_occurrences(note_name) + count = 0 + for o in response: + # do something with the retrieved occurrence + # in this sample, we will simply count each one + count += 1 + return count +# [END containeranalysis_occurrences_for_note] + + +# [START containeranalysis_occurrences_for_image] +def get_occurrences_for_image(resource_url, project_id): + """Retrieves all the occurrences associated with a specified image. + Here, all occurrences are simply printed and counted.""" + # resource_url = 'https://gcr.io/my-project/my-image@sha256:123' + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + filter_str = 'resourceUrl="{}"'.format(resource_url) + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + project_name = grafeas_client.project_path(project_id) + + response = grafeas_client.list_occurrences(project_name, + filter_=filter_str) + count = 0 + for o in response: + # do something with the retrieved occurrence + # in this sample, we will simply count each one + count += 1 + return count +# [END containeranalysis_occurrences_for_image] + + +# [START containeranalysis_pubsub] +def pubsub(subscription_id, timeout_seconds, project_id): + """Respond to incoming occurrences using a Cloud Pub/Sub subscription.""" + # subscription_id := 'my-occurrences-subscription' + # timeout_seconds = 20 + # project_id = 'my-gcp-project' + + import time + from google.cloud.pubsub import SubscriberClient + + client = SubscriberClient() + subscription_name = client.subscription_path(project_id, subscription_id) + receiver = MessageReceiver() + client.subscribe(subscription_name, receiver.pubsub_callback) + + # listen for 'timeout' seconds + for _ in range(timeout_seconds): + time.sleep(1) + # print and return the number of pubsub messages received + print(receiver.msg_count) + return receiver.msg_count + + +class MessageReceiver: + """Custom class to handle incoming Pub/Sub messages.""" + def __init__(self): + # initialize counter to 0 on initialization + self.msg_count = 0 + + def pubsub_callback(self, message): + # every time a pubsub message comes in, print it and count it + self.msg_count += 1 + print('Message {}: {}'.format(self.msg_count, message.data)) + message.ack() + + +def create_occurrence_subscription(subscription_id, project_id): + """Creates a new Pub/Sub subscription object listening to the + Container Analysis Occurrences topic.""" + # subscription_id := 'my-occurrences-subscription' + # project_id = 'my-gcp-project' + + from google.api_core.exceptions import AlreadyExists + from google.cloud.pubsub import SubscriberClient + + topic_id = 'container-analysis-occurrences-v1' + client = SubscriberClient() + topic_name = client.topic_path(project_id, topic_id) + subscription_name = client.subscription_path(project_id, subscription_id) + success = True + try: + client.create_subscription(subscription_name, topic_name) + except AlreadyExists: + # if subscription already exists, do nothing + pass + else: + success = False + return success +# [END containeranalysis_pubsub] + + +# [START containeranalysis_poll_discovery_occurrence_finished] +def poll_discovery_finished(resource_url, timeout_seconds, project_id): + """Returns the discovery occurrence for a resource once it reaches a + terminal state.""" + # resource_url = 'https://gcr.io/my-project/my-image@sha256:123' + # timeout_seconds = 20 + # project_id = 'my-gcp-project' + + import time + from grafeas.grafeas_v1.gapic.enums import DiscoveryOccurrence + from google.cloud.devtools import containeranalysis_v1 + + deadline = time.time() + timeout_seconds + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + project_name = grafeas_client.project_path(project_id) + + discovery_occurrence = None + while discovery_occurrence is None: + time.sleep(1) + filter_str = 'resourceUrl="{}" \ + AND noteProjectId="goog-analysis" \ + AND noteId="PACKAGE_VULNERABILITY"'.format(resource_url) + # [END containeranalysis_poll_discovery_occurrence_finished] + # The above filter isn't testable, since it looks for occurrences in a + # locked down project fall back to a more permissive filter for testing + filter_str = 'kind="DISCOVERY" AND resourceUrl="{}"'\ + .format(resource_url) + # [START containeranalysis_poll_discovery_occurrence_finished] + result = grafeas_client.list_occurrences(project_name, filter_str) + # only one occurrence should ever be returned by ListOccurrences + # and the given filter + for item in result: + discovery_occurrence = item + if time.time() > deadline: + raise RuntimeError('timeout while retrieving discovery occurrence') + + status = DiscoveryOccurrence.AnalysisStatus.PENDING + while status != DiscoveryOccurrence.AnalysisStatus.FINISHED_UNSUPPORTED \ + and status != DiscoveryOccurrence.AnalysisStatus.FINISHED_FAILED \ + and status != DiscoveryOccurrence.AnalysisStatus.FINISHED_SUCCESS: + time.sleep(1) + updated = grafeas_client.get_occurrence(discovery_occurrence.name) + status = updated.discovery.analysis_status + if time.time() > deadline: + raise RuntimeError('timeout while waiting for terminal state') + return discovery_occurrence +# [END containeranalysis_poll_discovery_occurrence_finished] + + +# [START containeranalysis_vulnerability_occurrences_for_image] +def find_vulnerabilities_for_image(resource_url, project_id): + """"Retrieves all vulnerability occurrences associated with a resource.""" + # resource_url = 'https://gcr.io/my-project/my-image@sha256:123' + # project_id = 'my-gcp-project' + + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + project_name = grafeas_client.project_path(project_id) + + filter_str = 'kind="VULNERABILITY" AND resourceUrl="{}"'\ + .format(resource_url) + return list(grafeas_client.list_occurrences(project_name, filter_str)) +# [END containeranalysis_vulnerability_occurrences_for_image] + + +# [START containeranalysis_filter_vulnerability_occurrences] +def find_high_severity_vulnerabilities_for_image(resource_url, project_id): + """Retrieves a list of only high vulnerability occurrences associated + with a resource.""" + # resource_url = 'https://gcr.io/my-project/my-image@sha256:123' + # project_id = 'my-gcp-project' + + from grafeas.grafeas_v1.gapic.enums import Severity + from google.cloud.devtools import containeranalysis_v1 + + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + project_name = grafeas_client.project_path(project_id) + + filter_str = 'kind="VULNERABILITY" AND resourceUrl="{}"'\ + .format(resource_url) + vulnerabilities = grafeas_client.list_occurrences(project_name, filter_str) + filtered_list = [] + for v in vulnerabilities: + if v.severity == Severity.HIGH or v.severity == Severity.CRITICAL: + filtered_list.append(v) + return filtered_list +# [END containeranalysis_filter_vulnerability_occurrences] diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py new file mode 100644 index 00000000000..e48a6ab8403 --- /dev/null +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -0,0 +1,294 @@ +#!/bin/python +# Copyright 2019 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. + +from os import environ +from os.path import basename +from time import sleep, time + +from google.api_core.exceptions import AlreadyExists +from google.api_core.exceptions import InvalidArgument +from google.api_core.exceptions import NotFound +from google.cloud.devtools import containeranalysis_v1 +from google.cloud.pubsub import PublisherClient, SubscriberClient + +from grafeas.grafeas_v1.gapic.enums import DiscoveryOccurrence +from grafeas.grafeas_v1.gapic.enums import NoteKind +from grafeas.grafeas_v1.gapic.enums import Severity +from grafeas.grafeas_v1.gapic.enums import Version + +import samples + +PROJECT_ID = environ['GCLOUD_PROJECT'] +SLEEP_TIME = 1 +TRY_LIMIT = 20 + + +class TestContainerAnalysisSamples: + + def setup_method(self, test_method): + print('SETUP {}'.format(test_method.__name__)) + timestamp = str(int(time())) + self.note_id = 'note-{}-{}'.format(timestamp, test_method.__name__) + self.image_url = '{}.{}'.format(timestamp, test_method.__name__) + self.note_obj = samples.create_note(self.note_id, PROJECT_ID) + + def teardown_method(self, test_method): + print('TEAR DOWN {}'.format(test_method.__name__)) + try: + samples.delete_note(self.note_id, PROJECT_ID) + except NotFound: + pass + + def test_create_note(self): + new_note = samples.get_note(self.note_id, PROJECT_ID) + assert new_note.name == self.note_obj.name + + def test_delete_note(self): + samples.delete_note(self.note_id, PROJECT_ID) + try: + samples.get_note(self.note_obj, PROJECT_ID) + except InvalidArgument: + pass + else: + # didn't raise exception we expected + assert (False) + + def test_create_occurrence(self): + created = samples.create_occurrence(self.image_url, + self.note_id, + PROJECT_ID, + PROJECT_ID) + retrieved = samples.get_occurrence(basename(created.name), PROJECT_ID) + assert created.name == retrieved.name + # clean up + samples.delete_occurrence(basename(created.name), PROJECT_ID) + + def test_delete_occurrence(self): + created = samples.create_occurrence(self.image_url, + self.note_id, + PROJECT_ID, + PROJECT_ID) + samples.delete_occurrence(basename(created.name), PROJECT_ID) + try: + samples.get_occurrence(basename(created.name), PROJECT_ID) + except NotFound: + pass + else: + # didn't raise exception we expected + assert False + + def test_occurrences_for_image(self): + orig_count = samples.get_occurrences_for_image(self.image_url, + PROJECT_ID) + occ = samples.create_occurrence(self.image_url, + self.note_id, + PROJECT_ID, + PROJECT_ID) + new_count = 0 + tries = 0 + while new_count != 1 and tries < TRY_LIMIT: + tries += 1 + new_count = samples.get_occurrences_for_image(self.image_url, + PROJECT_ID) + sleep(SLEEP_TIME) + assert new_count == 1 + assert orig_count == 0 + # clean up + samples.delete_occurrence(basename(occ.name), PROJECT_ID) + + def test_occurrences_for_note(self): + orig_count = samples.get_occurrences_for_note(self.note_id, + PROJECT_ID) + occ = samples.create_occurrence(self.image_url, + self.note_id, + PROJECT_ID, + PROJECT_ID) + new_count = 0 + tries = 0 + while new_count != 1 and tries < TRY_LIMIT: + tries += 1 + new_count = samples.get_occurrences_for_note(self.note_id, + PROJECT_ID) + sleep(SLEEP_TIME) + assert new_count == 1 + assert orig_count == 0 + # clean up + samples.delete_occurrence(basename(occ.name), PROJECT_ID) + + def test_pubsub(self): + # create topic if needed + client = SubscriberClient() + try: + topic_id = 'container-analysis-occurrences-v1' + topic_name = client.topic_path(PROJECT_ID, topic_id) + publisher = PublisherClient() + publisher.create_topic(topic_name) + except AlreadyExists: + pass + + subscription_id = 'drydockOccurrences' + subscription_name = client.subscription_path(PROJECT_ID, + subscription_id) + samples.create_occurrence_subscription(subscription_id, PROJECT_ID) + tries = 0 + success = False + while not success and tries < TRY_LIMIT: + print(tries) + tries += 1 + receiver = samples.MessageReceiver() + client.subscribe(subscription_name, receiver.pubsub_callback) + + # test adding 3 more occurrences + total_created = 3 + for _ in range(total_created): + occ = samples.create_occurrence(self.image_url, + self.note_id, + PROJECT_ID, + PROJECT_ID) + sleep(SLEEP_TIME) + samples.delete_occurrence(basename(occ.name), PROJECT_ID) + sleep(SLEEP_TIME) + print('done. msg_count = {}'.format(receiver.msg_count)) + success = receiver.msg_count == total_created + assert receiver.msg_count == total_created + # clean up + client.delete_subscription(subscription_name) + + def test_poll_discovery_occurrence(self): + # try with no discovery occurrence + try: + samples.poll_discovery_finished(self.image_url, 5, PROJECT_ID) + except RuntimeError: + pass + else: + # we expect timeout error + assert False + + # create discovery occurrence + note_id = 'discovery-note-{}'.format(int(time())) + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + note = { + 'discovery': { + 'analysis_kind': NoteKind.DISCOVERY + } + } + grafeas_client.\ + create_note(grafeas_client.project_path(PROJECT_ID), note_id, note) + occurrence = { + 'note_name': grafeas_client.note_path(PROJECT_ID, note_id), + 'resource_uri': self.image_url, + 'discovery': { + 'analysis_status': DiscoveryOccurrence.AnalysisStatus + .FINISHED_SUCCESS + } + } + created = grafeas_client.\ + create_occurrence(grafeas_client.project_path(PROJECT_ID), + occurrence) + + # poll again + disc = samples.poll_discovery_finished(self.image_url, 10, PROJECT_ID) + status = disc.discovery.analysis_status + assert disc is not None + assert status == DiscoveryOccurrence.AnalysisStatus.FINISHED_SUCCESS + + # clean up + samples.delete_occurrence(basename(created.name), PROJECT_ID) + samples.delete_note(note_id, PROJECT_ID) + + def test_find_vulnerabilities_for_image(self): + occ_list = samples.find_vulnerabilities_for_image(self.image_url, + PROJECT_ID) + assert len(occ_list) == 0 + + created = samples.create_occurrence(self.image_url, + self.note_id, + PROJECT_ID, + PROJECT_ID) + tries = 0 + count = 0 + while count != 1 and tries < TRY_LIMIT: + tries += 1 + occ_list = samples.find_vulnerabilities_for_image(self.image_url, + PROJECT_ID) + count = len(occ_list) + sleep(SLEEP_TIME) + assert len(occ_list) == 1 + samples.delete_occurrence(basename(created.name), PROJECT_ID) + + def test_find_high_severity_vulnerabilities(self): + occ_list = samples.find_high_severity_vulnerabilities_for_image( + self.image_url, + PROJECT_ID) + assert len(occ_list) == 0 + + # create new high severity vulnerability + note_id = 'discovery-note-{}'.format(int(time())) + client = containeranalysis_v1.ContainerAnalysisClient() + grafeas_client = client.get_grafeas_client() + note = { + 'vulnerability': { + 'severity': Severity.CRITICAL, + 'details': [ + { + 'affected_cpe_uri': 'your-uri-here', + 'affected_package': 'your-package-here', + 'min_affected_version': { + 'kind': Version.VersionKind.MINIMUM + }, + 'fixed_version': { + 'kind': Version.VersionKind.MAXIMUM + } + } + ] + } + } + grafeas_client.\ + create_note(grafeas_client.project_path(PROJECT_ID), note_id, note) + occurrence = { + 'note_name': client.note_path(PROJECT_ID, note_id), + 'resource_uri': self.image_url, + 'vulnerability': { + 'package_issue': [ + { + 'affected_cpe_uri': 'your-uri-here', + 'affected_package': 'your-package-here', + 'min_affected_version': { + 'kind': Version.VersionKind.MINIMUM + }, + 'fixed_version': { + 'kind': Version.VersionKind.MAXIMUM + } + } + ] + } + } + created = grafeas_client.\ + create_occurrence(grafeas_client.project_path(PROJECT_ID), + occurrence) + # query again + tries = 0 + count = 0 + while count != 1 and tries < TRY_LIMIT: + tries += 1 + occ_list = samples.find_vulnerabilities_for_image(self.image_url, + PROJECT_ID) + count = len(occ_list) + sleep(SLEEP_TIME) + assert len(occ_list) == 1 + # clean up + samples.delete_occurrence(basename(created.name), PROJECT_ID) + samples.delete_note(note_id, PROJECT_ID) From 93dd480714e8faf45669ad26dea79ab1166184b7 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Wed, 10 Jul 2019 09:15:21 -0700 Subject: [PATCH 002/102] Update samples.py [(#2263)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2263) fixed typo in region tag --- container_registry/container_analysis/snippets/samples.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py index 892b47ddb44..9a3edc4ebc0 100644 --- a/container_registry/container_analysis/snippets/samples.py +++ b/container_registry/container_analysis/snippets/samples.py @@ -63,7 +63,7 @@ def delete_note(note_id, project_id): # [END containeranalysis_delete_note] -# [START ccontaineranalysis_create_occurrence] +# [START containeranalysis_create_occurrence] def create_occurrence(resource_url, note_id, occurrence_project, note_project): """ Creates and returns a new occurrence of a previously created vulnerability note.""" From 96f6ab11973295e51f501584b34a587c511414dc Mon Sep 17 00:00:00 2001 From: Gus Class Date: Wed, 23 Oct 2019 16:27:00 -0700 Subject: [PATCH 003/102] Adds updates including compute [(#2436)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2436) * Adds updates including compute * Python 2 compat pytest * Fixing weird \r\n issue from GH merge * Put asset tests back in * Re-add pod operator test * Hack parameter for k8s pod operator --- .../container_analysis/snippets/requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index ac6aa320681..f693ca11ba7 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ -google-cloud-pubsub == 0.42.1 -google-cloud-containeranalysis == 0.1.0 -grafeas == 0.1.0 -pytest -flaky -mock +google-cloud-pubsub==1.0.0 +google-cloud-containeranalysis==0.3.0 +grafeas==0.1.0 +pytest==5.1.3 +flaky==3.6.1 +mock==3.0.5 From ba69dc16aaa782e8081378bce490813df596fd28 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Wed, 20 Nov 2019 11:20:24 -0800 Subject: [PATCH 004/102] fix: Use different versions of pytest for python 2 and python3 [(#2558)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2558) * fix: Use different versions of pytest for python 2 and python3 * fix: delete extra pytest dep * fix: update pytest dependencies in requirements.txt --- .../container_analysis/snippets/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index f693ca11ba7..dddaaacd851 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,7 @@ google-cloud-pubsub==1.0.0 google-cloud-containeranalysis==0.3.0 grafeas==0.1.0 -pytest==5.1.3 +pytest==5.3.0; python_version > "3.0" +pytest==4.6.6; python_version < "3.0" flaky==3.6.1 mock==3.0.5 From ea362f35284d07d4e0205a2b2652f5f3cd684fd0 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Wed, 1 Apr 2020 19:11:50 -0700 Subject: [PATCH 005/102] Simplify noxfile setup. [(#2806)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2806) * chore(deps): update dependency requests to v2.23.0 * Simplify noxfile and add version control. * Configure appengine/standard to only test Python 2.7. * Update Kokokro configs to match noxfile. * Add requirements-test to each folder. * Remove Py2 versions from everything execept appengine/standard. * Remove conftest.py. * Remove appengine/standard/conftest.py * Remove 'no-sucess-flaky-report' from pytest.ini. * Add GAE SDK back to appengine/standard tests. * Fix typo. * Roll pytest to python 2 version. * Add a bunch of testing requirements. * Remove typo. * Add appengine lib directory back in. * Add some additional requirements. * Fix issue with flake8 args. * Even more requirements. * Readd appengine conftest.py. * Add a few more requirements. * Even more Appengine requirements. * Add webtest for appengine/standard/mailgun. * Add some additional requirements. * Add workaround for issue with mailjet-rest. * Add responses for appengine/standard/mailjet. Co-authored-by: Renovate Bot --- .../container_analysis/snippets/requirements-test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 container_registry/container_analysis/snippets/requirements-test.txt diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt new file mode 100644 index 00000000000..781d4326c94 --- /dev/null +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -0,0 +1 @@ +pytest==5.3.2 From f815dfce925447ed113fb98cf0a1201d4975e227 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 2 Apr 2020 20:59:17 +0200 Subject: [PATCH 006/102] Update dependency mock to v4 [(#3216)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3216) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index dddaaacd851..d922ac33684 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -4,4 +4,4 @@ grafeas==0.1.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.6.1 -mock==3.0.5 +mock==4.0.2 From 1bc92fe0c3f16c9d0b70fa535b3bfa95567e61f2 Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Tue, 21 Apr 2020 17:28:51 -0700 Subject: [PATCH 007/102] [container_registry] fix: fix broken test [(#3436)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3436) * [container_registry] fix: fix broken test fixes #3435 * Use Pub/Sub message receiver that can notify main thread when it has received expected number of messages. * Only test one single occurence. * Use uuid4 wherever makes sense. * test if Pub/Sub client receives at least one message --- .../snippets/samples_test.py | 76 +++++++++++-------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index e48a6ab8403..b8eb6c5fbcb 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -15,7 +15,9 @@ from os import environ from os.path import basename -from time import sleep, time +import threading +import time +import uuid from google.api_core.exceptions import AlreadyExists from google.api_core.exceptions import InvalidArgument @@ -35,13 +37,29 @@ TRY_LIMIT = 20 +class MessageReceiver: + """Custom class to handle incoming Pub/Sub messages.""" + def __init__(self, expected_msg_nums, done_event): + # initialize counter to 0 on initialization + self.msg_count = 0 + self.expected_msg_nums = expected_msg_nums + self.done_event = done_event + + def pubsub_callback(self, message): + # every time a pubsub message comes in, print it and count it + self.msg_count += 1 + print('Message {}: {}'.format(self.msg_count, message.data)) + message.ack() + if (self.msg_count == self.expected_msg_nums): + self.done_event.set() + + class TestContainerAnalysisSamples: def setup_method(self, test_method): print('SETUP {}'.format(test_method.__name__)) - timestamp = str(int(time())) - self.note_id = 'note-{}-{}'.format(timestamp, test_method.__name__) - self.image_url = '{}.{}'.format(timestamp, test_method.__name__) + self.note_id = 'note-{}'.format(uuid.uuid4()) + self.image_url = '{}.{}'.format(uuid.uuid4(), test_method.__name__) self.note_obj = samples.create_note(self.note_id, PROJECT_ID) def teardown_method(self, test_method): @@ -102,7 +120,7 @@ def test_occurrences_for_image(self): tries += 1 new_count = samples.get_occurrences_for_image(self.image_url, PROJECT_ID) - sleep(SLEEP_TIME) + time.sleep(SLEEP_TIME) assert new_count == 1 assert orig_count == 0 # clean up @@ -121,7 +139,7 @@ def test_occurrences_for_note(self): tries += 1 new_count = samples.get_occurrences_for_note(self.note_id, PROJECT_ID) - sleep(SLEEP_TIME) + time.sleep(SLEEP_TIME) assert new_count == 1 assert orig_count == 0 # clean up @@ -138,33 +156,31 @@ def test_pubsub(self): except AlreadyExists: pass - subscription_id = 'drydockOccurrences' + subscription_id = 'container-analysis-test-{}'.format(uuid.uuid4()) subscription_name = client.subscription_path(PROJECT_ID, subscription_id) samples.create_occurrence_subscription(subscription_id, PROJECT_ID) - tries = 0 - success = False - while not success and tries < TRY_LIMIT: - print(tries) - tries += 1 - receiver = samples.MessageReceiver() + + # I can not make it pass with multiple messages. My guess is + # the server started to dedup? + message_count = 1 + try: + job_done = threading.Event() + receiver = MessageReceiver(message_count, job_done) client.subscribe(subscription_name, receiver.pubsub_callback) - # test adding 3 more occurrences - total_created = 3 - for _ in range(total_created): - occ = samples.create_occurrence(self.image_url, - self.note_id, - PROJECT_ID, - PROJECT_ID) - sleep(SLEEP_TIME) + for i in range(message_count): + occ = samples.create_occurrence( + self.image_url, self.note_id, PROJECT_ID, PROJECT_ID) + time.sleep(SLEEP_TIME) samples.delete_occurrence(basename(occ.name), PROJECT_ID) - sleep(SLEEP_TIME) + time.sleep(SLEEP_TIME) + job_done.wait(timeout=60) print('done. msg_count = {}'.format(receiver.msg_count)) - success = receiver.msg_count == total_created - assert receiver.msg_count == total_created - # clean up - client.delete_subscription(subscription_name) + assert message_count <= receiver.msg_count + finally: + # clean up + client.delete_subscription(subscription_name) def test_poll_discovery_occurrence(self): # try with no discovery occurrence @@ -177,7 +193,7 @@ def test_poll_discovery_occurrence(self): assert False # create discovery occurrence - note_id = 'discovery-note-{}'.format(int(time())) + note_id = 'discovery-note-{}'.format(uuid.uuid4()) client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() note = { @@ -225,7 +241,7 @@ def test_find_vulnerabilities_for_image(self): occ_list = samples.find_vulnerabilities_for_image(self.image_url, PROJECT_ID) count = len(occ_list) - sleep(SLEEP_TIME) + time.sleep(SLEEP_TIME) assert len(occ_list) == 1 samples.delete_occurrence(basename(created.name), PROJECT_ID) @@ -236,7 +252,7 @@ def test_find_high_severity_vulnerabilities(self): assert len(occ_list) == 0 # create new high severity vulnerability - note_id = 'discovery-note-{}'.format(int(time())) + note_id = 'discovery-note-{}'.format(uuid.uuid4()) client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() note = { @@ -287,7 +303,7 @@ def test_find_high_severity_vulnerabilities(self): occ_list = samples.find_vulnerabilities_for_image(self.image_url, PROJECT_ID) count = len(occ_list) - sleep(SLEEP_TIME) + time.sleep(SLEEP_TIME) assert len(occ_list) == 1 # clean up samples.delete_occurrence(basename(created.name), PROJECT_ID) From 7539962aa5342d973aaca41b7f3e5351aec06591 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 22 Apr 2020 06:01:07 +0200 Subject: [PATCH 008/102] Update dependency google-cloud-containeranalysis to v0.3.1 [(#3055)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3055) Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index d922ac33684..98cbb33dc61 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==1.0.0 -google-cloud-containeranalysis==0.3.0 +google-cloud-containeranalysis==0.3.1 grafeas==0.1.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 3e6ab211ad00115eed6bde1973e4ad1ec83904ea Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Tue, 21 Apr 2020 21:28:38 -0700 Subject: [PATCH 009/102] Update dependency google-cloud-pubsub to v1.4.2 [(#3340)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3340) Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 98cbb33dc61..98bceafbc5f 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==1.0.0 +google-cloud-pubsub==1.4.2 google-cloud-containeranalysis==0.3.1 grafeas==0.1.0 pytest==5.3.0; python_version > "3.0" From a98ded1e5fe53dd155ab942bed36dbea79a91a35 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Wed, 22 Apr 2020 18:13:25 -0700 Subject: [PATCH 010/102] [container analysis] effective severity [(#3478)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3478) Use new effective_severity field fixes b/142836422 --- container_registry/container_analysis/snippets/samples.py | 2 +- container_registry/container_analysis/snippets/samples_test.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py index 9a3edc4ebc0..2eeda1cae81 100644 --- a/container_registry/container_analysis/snippets/samples.py +++ b/container_registry/container_analysis/snippets/samples.py @@ -367,7 +367,7 @@ def find_high_severity_vulnerabilities_for_image(resource_url, project_id): vulnerabilities = grafeas_client.list_occurrences(project_name, filter_str) filtered_list = [] for v in vulnerabilities: - if v.severity == Severity.HIGH or v.severity == Severity.CRITICAL: + if v.effective_severity == Severity.HIGH or v.effective_severity == Severity.CRITICAL: filtered_list.append(v) return filtered_list # [END containeranalysis_filter_vulnerability_occurrences] diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index b8eb6c5fbcb..04768836d00 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -278,6 +278,7 @@ def test_find_high_severity_vulnerabilities(self): 'note_name': client.note_path(PROJECT_ID, note_id), 'resource_uri': self.image_url, 'vulnerability': { + 'effective_severity': Severity.CRITICAL, 'package_issue': [ { 'affected_cpe_uri': 'your-uri-here', From 84e07a86457dbbc2eed1ff72a82969392bed0ce2 Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Thu, 7 May 2020 14:23:59 -0700 Subject: [PATCH 011/102] [container_registry] fix: bump the pubsub timeout [(#3698)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3698) fixes #2894 Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> --- .../container_analysis/snippets/samples_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index 04768836d00..116796c0bf6 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -175,7 +175,10 @@ def test_pubsub(self): time.sleep(SLEEP_TIME) samples.delete_occurrence(basename(occ.name), PROJECT_ID) time.sleep(SLEEP_TIME) - job_done.wait(timeout=60) + # We saw occational failure with 60 seconds timeout, so we bumped it + # to 180 seconds. + # See also: python-docs-samples/issues/2894 + job_done.wait(timeout=180) print('done. msg_count = {}'.format(receiver.msg_count)) assert message_count <= receiver.msg_count finally: From 133a429e32876dfc9dc69963681055b0cd7bee53 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 13 May 2020 07:31:59 +0200 Subject: [PATCH 012/102] chore(deps): update dependency google-cloud-pubsub to v1.4.3 [(#3725)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3725) Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Co-authored-by: Takashi Matsuo --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 98bceafbc5f..32e0defc4c2 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==1.4.2 +google-cloud-pubsub==1.4.3 google-cloud-containeranalysis==0.3.1 grafeas==0.1.0 pytest==5.3.0; python_version > "3.0" From 057ceec511278e29b3e51dbae2990bd0db084670 Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Fri, 15 May 2020 10:31:48 -0700 Subject: [PATCH 013/102] [container-registry] fix: mark a flaky test [(#3765)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3765) fixes #2894 --- container_registry/container_analysis/snippets/samples_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index 116796c0bf6..a8552e54742 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -29,6 +29,7 @@ from grafeas.grafeas_v1.gapic.enums import NoteKind from grafeas.grafeas_v1.gapic.enums import Severity from grafeas.grafeas_v1.gapic.enums import Version +import pytest import samples @@ -145,6 +146,7 @@ def test_occurrences_for_note(self): # clean up samples.delete_occurrence(basename(occ.name), PROJECT_ID) + @pytest.mark.flaky(max_runs=3, min_passes=1) def test_pubsub(self): # create topic if needed client = SubscriberClient() From 77265d6f1e2a746f55076a0152a14e2c16b9832d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sun, 17 May 2020 06:17:21 +0200 Subject: [PATCH 014/102] chore(deps): update dependency grafeas to v0.4.0 [(#3172)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3172) * Update dependency grafeas to v0.4.0 * follow the field name changes Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> Co-authored-by: Takashi Matsuo --- .../container_analysis/snippets/requirements.txt | 2 +- container_registry/container_analysis/snippets/samples.py | 4 ++-- .../container_analysis/snippets/samples_test.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 32e0defc4c2..7e7518198bb 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==1.4.3 google-cloud-containeranalysis==0.3.1 -grafeas==0.1.0 +grafeas==0.4.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.6.1 diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py index 2eeda1cae81..c663e4dac01 100644 --- a/container_registry/container_analysis/snippets/samples.py +++ b/container_registry/container_analysis/snippets/samples.py @@ -32,7 +32,7 @@ def create_note(note_id, project_id): { 'affected_cpe_uri': 'your-uri-here', 'affected_package': 'your-package-here', - 'min_affected_version': { + 'affected_version_start': { 'kind': Version.VersionKind.MINIMUM }, 'fixed_version': { @@ -88,7 +88,7 @@ def create_occurrence(resource_url, note_id, occurrence_project, note_project): { 'affected_cpe_uri': 'your-uri-here', 'affected_package': 'your-package-here', - 'min_affected_version': { + 'affected_version': { 'kind': Version.VersionKind.MINIMUM }, 'fixed_version': { diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index a8552e54742..535544e4265 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -267,7 +267,7 @@ def test_find_high_severity_vulnerabilities(self): { 'affected_cpe_uri': 'your-uri-here', 'affected_package': 'your-package-here', - 'min_affected_version': { + 'affected_version_start': { 'kind': Version.VersionKind.MINIMUM }, 'fixed_version': { @@ -288,7 +288,7 @@ def test_find_high_severity_vulnerabilities(self): { 'affected_cpe_uri': 'your-uri-here', 'affected_package': 'your-package-here', - 'min_affected_version': { + 'affected_version': { 'kind': Version.VersionKind.MINIMUM }, 'fixed_version': { From f12ab0d5c6d5e3e2fc1f04b55c9bc4275cac2345 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 21 May 2020 04:50:04 +0200 Subject: [PATCH 015/102] chore(deps): update dependency google-cloud-pubsub to v1.5.0 [(#3781)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3781) Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 7e7518198bb..4fa09a775c6 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==1.4.3 +google-cloud-pubsub==1.5.0 google-cloud-containeranalysis==0.3.1 grafeas==0.4.0 pytest==5.3.0; python_version > "3.0" From 942733511628fbd77eddaed629b4908619d6bf32 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Tue, 9 Jun 2020 14:34:27 -0700 Subject: [PATCH 016/102] Replace GCLOUD_PROJECT with GOOGLE_CLOUD_PROJECT. [(#4022)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4022) --- container_registry/container_analysis/snippets/samples_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index 535544e4265..faab9b1d09b 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -33,7 +33,7 @@ import samples -PROJECT_ID = environ['GCLOUD_PROJECT'] +PROJECT_ID = environ['GOOGLE_CLOUD_PROJECT'] SLEEP_TIME = 1 TRY_LIMIT = 20 From 163c55c1757fdbb2ad6ca8e42e38110a74999ea4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 20 Jun 2020 06:08:08 +0200 Subject: [PATCH 017/102] Update dependency google-cloud-pubsub to v1.6.0 [(#4039)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4039) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [google-cloud-pubsub](https://togithub.com/googleapis/python-pubsub) | minor | `==1.5.0` -> `==1.6.0` | --- ### Release Notes
googleapis/python-pubsub ### [`v1.6.0`](https://togithub.com/googleapis/python-pubsub/blob/master/CHANGELOG.md#​160-httpswwwgithubcomgoogleapispython-pubsubcomparev150v160-2020-06-09) [Compare Source](https://togithub.com/googleapis/python-pubsub/compare/v1.5.0...v1.6.0) ##### Features - Add flow control for message publishing ([#​96](https://www.github.com/googleapis/python-pubsub/issues/96)) ([06085c4](https://www.github.com/googleapis/python-pubsub/commit/06085c4083b9dccdd50383257799904510bbf3a0)) ##### Bug Fixes - Fix PubSub incompatibility with api-core 1.17.0+ ([#​103](https://www.github.com/googleapis/python-pubsub/issues/103)) ([c02060f](https://www.github.com/googleapis/python-pubsub/commit/c02060fbbe6e2ca4664bee08d2de10665d41dc0b)) ##### Documentation - Clarify that Schedulers shouldn't be used with multiple SubscriberClients ([#​100](https://togithub.com/googleapis/python-pubsub/pull/100)) ([cf9e87c](https://togithub.com/googleapis/python-pubsub/commit/cf9e87c80c0771f3fa6ef784a8d76cb760ad37ef)) - Fix update subscription/snapshot/topic samples ([#​113](https://togithub.com/googleapis/python-pubsub/pull/113)) ([e62c38b](https://togithub.com/googleapis/python-pubsub/commit/e62c38bb33de2434e32f866979de769382dea34a)) ##### Internal / Testing Changes - Re-generated service implementaton using synth: removed experimental notes from the RetryPolicy and filtering features in anticipation of GA, added DetachSubscription (experimental) ([#​114](https://togithub.com/googleapis/python-pubsub/pull/114)) ([0132a46](https://togithub.com/googleapis/python-pubsub/commit/0132a4680e0727ce45d5e27d98ffc9f3541a0962)) - Incorporate will_accept() checks into publish() ([#​108](https://togithub.com/googleapis/python-pubsub/pull/108)) ([6c7677e](https://togithub.com/googleapis/python-pubsub/commit/6c7677ecb259672bbb9b6f7646919e602c698570))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Never, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/python-docs-samples). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 4fa09a775c6..1ed23cb0f54 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==1.5.0 +google-cloud-pubsub==1.6.0 google-cloud-containeranalysis==0.3.1 grafeas==0.4.0 pytest==5.3.0; python_version > "3.0" From bddc99d9c98b6be94b6c9e0106bac9a991f0c6f6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 30 Jun 2020 00:28:02 +0200 Subject: [PATCH 018/102] chore(deps): update dependency grafeas to v0.4.1 [(#4200)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4200) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [grafeas](https://togithub.com/googleapis/python-grafeas) | patch | `==0.4.0` -> `==0.4.1` | --- ### Release Notes
googleapis/python-grafeas ### [`v0.4.1`](https://togithub.com/googleapis/python-grafeas/blob/master/CHANGELOG.md#​041-httpswwwgithubcomgoogleapispython-grafeascomparev040v041-2020-06-25) [Compare Source](https://togithub.com/googleapis/python-grafeas/compare/v0.4.0...v0.4.1)
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Never, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/python-docs-samples). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 1ed23cb0f54..3f51425293f 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==1.6.0 google-cloud-containeranalysis==0.3.1 -grafeas==0.4.0 +grafeas==0.4.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.6.1 From 4ce25b19380ec4f68b70ab29931d1a513e7fb3f1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 6 Jul 2020 22:52:02 +0200 Subject: [PATCH 019/102] chore(deps): update dependency google-cloud-pubsub to v1.6.1 [(#4242)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4242) Co-authored-by: gcf-merge-on-green[bot] <60162190+gcf-merge-on-green[bot]@users.noreply.github.com> --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 3f51425293f..feb6b282db0 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==1.6.0 +google-cloud-pubsub==1.6.1 google-cloud-containeranalysis==0.3.1 grafeas==0.4.1 pytest==5.3.0; python_version > "3.0" From 06af00f919cc434c4145d1b5f648117af9bcc5b3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 9 Jul 2020 00:48:59 +0200 Subject: [PATCH 020/102] chore(deps): update dependency flaky to v3.7.0 [(#4263)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4263) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index feb6b282db0..fe93d59b519 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -3,5 +3,5 @@ google-cloud-containeranalysis==0.3.1 grafeas==0.4.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" -flaky==3.6.1 +flaky==3.7.0 mock==4.0.2 From 7e05c8221c7e795699b0d261ef8f486001ef4e13 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Jul 2020 00:46:30 +0200 Subject: [PATCH 021/102] chore(deps): update dependency pytest to v5.4.3 [(#4279)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4279) * chore(deps): update dependency pytest to v5.4.3 * specify pytest for python 2 in appengine Co-authored-by: Leah Cole --- .../container_analysis/snippets/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 781d4326c94..79738af5f26 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==5.3.2 +pytest==5.4.3 From 86912c287478c20b6bd4d3cbc9c8f28c2ef4c0c3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jul 2020 19:20:03 +0200 Subject: [PATCH 022/102] chore(deps): update dependency google-cloud-pubsub to v1.7.0 [(#4290)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4290) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [google-cloud-pubsub](https://togithub.com/googleapis/python-pubsub) | minor | `==1.6.1` -> `==1.7.0` | --- ### Release Notes
googleapis/python-pubsub ### [`v1.7.0`](https://togithub.com/googleapis/python-pubsub/blob/master/CHANGELOG.md#​170-httpswwwgithubcomgoogleapispython-pubsubcomparev161v170-2020-07-13) [Compare Source](https://togithub.com/googleapis/python-pubsub/compare/v1.6.1...v1.7.0) ##### New Features - Add support for server-side flow control. ([#​143](https://togithub.com/googleapis/python-pubsub/pull/143)) ([04e261c](https://www.github.com/googleapis/python-pubsub/commit/04e261c602a2919cc75b3efa3dab099fb2cf704c)) ##### Dependencies - Update samples dependency `google-cloud-pubsub` to `v1.6.1`. ([#​144](https://togithub.com/googleapis/python-pubsub/pull/144)) ([1cb6746](https://togithub.com/googleapis/python-pubsub/commit/1cb6746b00ebb23dbf1663bae301b32c3fc65a88)) ##### Documentation - Add pubsub/cloud-client samples from the common samples repo (with commit history). ([#​151](https://togithub.com/googleapis/python-pubsub/pull/151)) - Add flow control section to publish overview. ([#​129](https://togithub.com/googleapis/python-pubsub/pull/129)) ([acc19eb](https://www.github.com/googleapis/python-pubsub/commit/acc19eb048eef067d9818ef3e310b165d9c6307e)) - Add a link to Pub/Sub filtering language public documentation to `pubsub.proto`. ([#​121](https://togithub.com/googleapis/python-pubsub/pull/121)) ([8802d81](https://www.github.com/googleapis/python-pubsub/commit/8802d8126247f22e26057e68a42f5b5a82dcbf0d))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/python-docs-samples). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index fe93d59b519..42cc1dc3d81 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==1.6.1 +google-cloud-pubsub==1.7.0 google-cloud-containeranalysis==0.3.1 grafeas==0.4.1 pytest==5.3.0; python_version > "3.0" From aed5c8a706108f9d54d7ca92b0c3b99837f6f634 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 24 Jul 2020 03:27:36 +0200 Subject: [PATCH 023/102] chore(deps): update dependency google-cloud-containeranalysis to v1 [(#4108)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4108) --- .../container_analysis/snippets/requirements.txt | 2 +- .../container_analysis/snippets/samples.py | 12 ++++++------ .../container_analysis/snippets/samples_test.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 42cc1dc3d81..ece5188c628 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==1.7.0 -google-cloud-containeranalysis==0.3.1 +google-cloud-containeranalysis==1.0.1 grafeas==0.4.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py index c663e4dac01..7d1348cf2e5 100644 --- a/container_registry/container_analysis/snippets/samples.py +++ b/container_registry/container_analysis/snippets/samples.py @@ -57,7 +57,7 @@ def delete_note(note_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - note_name = grafeas_client.note_path(project_id, note_id) + note_name = f"projects/{project_id}/notes/{note_id}" grafeas_client.delete_note(note_name) # [END containeranalysis_delete_note] @@ -77,7 +77,7 @@ def create_occurrence(resource_url, note_id, occurrence_project, note_project): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - formatted_note = grafeas_client.note_path(note_project, note_id) + formatted_note = f"projects/{note_project}/notes/{note_id}" formatted_project = grafeas_client.project_path(occurrence_project) occurrence = { @@ -113,7 +113,7 @@ def delete_occurrence(occurrence_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - parent = grafeas_client.occurrence_path(project_id, occurrence_id) + parent = f"projects/{project_id}/occurrences/{occurrence_id}" grafeas_client.delete_occurrence(parent) # [END containeranalysis_delete_occurrence] @@ -128,7 +128,7 @@ def get_note(note_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - note_name = grafeas_client.note_path(project_id, note_id) + note_name = f"projects/{project_id}/notes/{note_id}" response = grafeas_client.get_note(note_name) return response # [END containeranalysis_get_note] @@ -144,7 +144,7 @@ def get_occurrence(occurrence_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - parent = grafeas_client.occurrence_path(project_id, occurrence_id) + parent = f"projects/{project_id}/occurrences/{occurrence_id}" return grafeas_client.get_occurrence(parent) # [END containeranalysis_get_occurrence] @@ -181,7 +181,7 @@ def get_occurrences_for_note(note_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - note_name = grafeas_client.note_path(project_id, note_id) + note_name = f"projects/{project_id}/notes/{note_id}" response = grafeas_client.list_note_occurrences(note_name) count = 0 diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index faab9b1d09b..56ac9ab7e2b 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -209,7 +209,7 @@ def test_poll_discovery_occurrence(self): grafeas_client.\ create_note(grafeas_client.project_path(PROJECT_ID), note_id, note) occurrence = { - 'note_name': grafeas_client.note_path(PROJECT_ID, note_id), + 'note_name': f"projects/{PROJECT_ID}/notes/{note_id}", 'resource_uri': self.image_url, 'discovery': { 'analysis_status': DiscoveryOccurrence.AnalysisStatus @@ -280,7 +280,7 @@ def test_find_high_severity_vulnerabilities(self): grafeas_client.\ create_note(grafeas_client.project_path(PROJECT_ID), note_id, note) occurrence = { - 'note_name': client.note_path(PROJECT_ID, note_id), + 'note_name': f"projects/{PROJECT_ID}/notes/{note_id}", 'resource_uri': self.image_url, 'vulnerability': { 'effective_severity': Severity.CRITICAL, From d857e2b4559873d17a325fda74b32c371523ff4a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 24 Jul 2020 03:33:15 +0200 Subject: [PATCH 024/102] chore(deps): update dependency google-cloud-containeranalysis to v1.0.2 [(#4367)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4367) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index ece5188c628..865f9ba5937 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==1.7.0 -google-cloud-containeranalysis==1.0.1 +google-cloud-containeranalysis==1.0.2 grafeas==0.4.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 0d0bee39d13183a6415aec8162c2b49937415c9c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 1 Aug 2020 21:51:00 +0200 Subject: [PATCH 025/102] Update dependency pytest to v6 [(#4390)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4390) --- .../container_analysis/snippets/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 79738af5f26..7e460c8c866 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==5.4.3 +pytest==6.0.1 From 6c2d764e16aca7a0653ccf1c083d8be761dae37e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 12 Aug 2020 01:09:54 +0200 Subject: [PATCH 026/102] chore(deps): update dependency google-cloud-containeranalysis to v1.0.3 (#31) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 865f9ba5937..459f9c9b773 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==1.7.0 -google-cloud-containeranalysis==1.0.2 +google-cloud-containeranalysis==1.0.3 grafeas==0.4.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From fd03b005015c92b23e1d0dccee084792c975c4bd Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 12 Aug 2020 11:08:06 -0700 Subject: [PATCH 027/102] feat!: move to microgen (#33) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-containeranalysis/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes # 🦕 --- .../snippets/requirements.txt | 2 +- .../container_analysis/snippets/samples.py | 50 +++++++++---------- .../snippets/samples_test.py | 20 ++++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 459f9c9b773..af8750f80b7 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==1.7.0 google-cloud-containeranalysis==1.0.3 -grafeas==0.4.1 +grafeas==1.0.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py index 7d1348cf2e5..caf08990ba8 100644 --- a/container_registry/container_analysis/snippets/samples.py +++ b/container_registry/container_analysis/snippets/samples.py @@ -20,12 +20,12 @@ def create_note(note_id, project_id): # note_id = 'my-note' # project_id = 'my-gcp-project' - from grafeas.grafeas_v1.gapic.enums import Version + from grafeas.grafeas_v1 import Version from google.cloud.devtools import containeranalysis_v1 client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - project_name = grafeas_client.project_path(project_id) + project_name = f"projects/{project_id}" note = { 'vulnerability': { 'details': [ @@ -42,7 +42,7 @@ def create_note(note_id, project_id): ] } } - response = grafeas_client.create_note(project_name, note_id, note) + response = grafeas_client.create_note(parent=project_name, note_id=note_id, note=note) return response # [END containeranalysis_create_note] @@ -59,7 +59,7 @@ def delete_note(note_id, project_id): grafeas_client = client.get_grafeas_client() note_name = f"projects/{project_id}/notes/{note_id}" - grafeas_client.delete_note(note_name) + grafeas_client.delete_note(name=note_name) # [END containeranalysis_delete_note] @@ -72,13 +72,13 @@ def create_occurrence(resource_url, note_id, occurrence_project, note_project): # occurrence_project = 'my-gcp-project' # note_project = 'my-gcp-project' - from grafeas.grafeas_v1.gapic.enums import Version + from grafeas.grafeas_v1 import Version from google.cloud.devtools import containeranalysis_v1 client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() formatted_note = f"projects/{note_project}/notes/{note_id}" - formatted_project = grafeas_client.project_path(occurrence_project) + formatted_project = f"projects/{occurrence_project}" occurrence = { 'note_name': formatted_note, @@ -99,7 +99,7 @@ def create_occurrence(resource_url, note_id, occurrence_project, note_project): } } - return grafeas_client.create_occurrence(formatted_project, occurrence) + return grafeas_client.create_occurrence(parent=formatted_project, occurrence=occurrence) # [END containeranalysis_create_occurrence] @@ -114,7 +114,7 @@ def delete_occurrence(occurrence_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() parent = f"projects/{project_id}/occurrences/{occurrence_id}" - grafeas_client.delete_occurrence(parent) + grafeas_client.delete_occurrence(name=parent) # [END containeranalysis_delete_occurrence] @@ -129,7 +129,7 @@ def get_note(note_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() note_name = f"projects/{project_id}/notes/{note_id}" - response = grafeas_client.get_note(note_name) + response = grafeas_client.get_note(name=note_name) return response # [END containeranalysis_get_note] @@ -145,7 +145,7 @@ def get_occurrence(occurrence_id, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() parent = f"projects/{project_id}/occurrences/{occurrence_id}" - return grafeas_client.get_occurrence(parent) + return grafeas_client.get_occurrence(name=parent) # [END containeranalysis_get_occurrence] @@ -162,8 +162,8 @@ def get_discovery_info(resource_url, project_id): filter_str = 'kind="DISCOVERY" AND resourceUrl="{}"'.format(resource_url) client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - project_name = grafeas_client.project_path(project_id) - response = grafeas_client.list_occurrences(project_name, + project_name = f"projects/{project_id}" + response = grafeas_client.list_occurrences(parent=project_name, filter_=filter_str) for occ in response: print(occ) @@ -183,7 +183,7 @@ def get_occurrences_for_note(note_id, project_id): grafeas_client = client.get_grafeas_client() note_name = f"projects/{project_id}/notes/{note_id}" - response = grafeas_client.list_note_occurrences(note_name) + response = grafeas_client.list_note_occurrences(name=note_name) count = 0 for o in response: # do something with the retrieved occurrence @@ -205,10 +205,10 @@ def get_occurrences_for_image(resource_url, project_id): filter_str = 'resourceUrl="{}"'.format(resource_url) client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - project_name = grafeas_client.project_path(project_id) + project_name = f"projects/{project_id}" - response = grafeas_client.list_occurrences(project_name, - filter_=filter_str) + response = grafeas_client.list_occurrences(parent=project_name, + filter=filter_str) count = 0 for o in response: # do something with the retrieved occurrence @@ -288,14 +288,14 @@ def poll_discovery_finished(resource_url, timeout_seconds, project_id): # project_id = 'my-gcp-project' import time - from grafeas.grafeas_v1.gapic.enums import DiscoveryOccurrence + from grafeas.grafeas_v1 import DiscoveryOccurrence from google.cloud.devtools import containeranalysis_v1 deadline = time.time() + timeout_seconds client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - project_name = grafeas_client.project_path(project_id) + project_name = f"projects/{project_id}" discovery_occurrence = None while discovery_occurrence is None: @@ -309,7 +309,7 @@ def poll_discovery_finished(resource_url, timeout_seconds, project_id): filter_str = 'kind="DISCOVERY" AND resourceUrl="{}"'\ .format(resource_url) # [START containeranalysis_poll_discovery_occurrence_finished] - result = grafeas_client.list_occurrences(project_name, filter_str) + result = grafeas_client.list_occurrences(parent=project_name, filter=filter_str) # only one occurrence should ever be returned by ListOccurrences # and the given filter for item in result: @@ -322,7 +322,7 @@ def poll_discovery_finished(resource_url, timeout_seconds, project_id): and status != DiscoveryOccurrence.AnalysisStatus.FINISHED_FAILED \ and status != DiscoveryOccurrence.AnalysisStatus.FINISHED_SUCCESS: time.sleep(1) - updated = grafeas_client.get_occurrence(discovery_occurrence.name) + updated = grafeas_client.get_occurrence(name=discovery_occurrence.name) status = updated.discovery.analysis_status if time.time() > deadline: raise RuntimeError('timeout while waiting for terminal state') @@ -340,11 +340,11 @@ def find_vulnerabilities_for_image(resource_url, project_id): client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - project_name = grafeas_client.project_path(project_id) + project_name = f"projects/{project_id}" filter_str = 'kind="VULNERABILITY" AND resourceUrl="{}"'\ .format(resource_url) - return list(grafeas_client.list_occurrences(project_name, filter_str)) + return list(grafeas_client.list_occurrences(parent=project_name, filter=filter_str)) # [END containeranalysis_vulnerability_occurrences_for_image] @@ -355,16 +355,16 @@ def find_high_severity_vulnerabilities_for_image(resource_url, project_id): # resource_url = 'https://gcr.io/my-project/my-image@sha256:123' # project_id = 'my-gcp-project' - from grafeas.grafeas_v1.gapic.enums import Severity + from grafeas.grafeas_v1 import Severity from google.cloud.devtools import containeranalysis_v1 client = containeranalysis_v1.ContainerAnalysisClient() grafeas_client = client.get_grafeas_client() - project_name = grafeas_client.project_path(project_id) + project_name = f"projects/{project_id}" filter_str = 'kind="VULNERABILITY" AND resourceUrl="{}"'\ .format(resource_url) - vulnerabilities = grafeas_client.list_occurrences(project_name, filter_str) + vulnerabilities = grafeas_client.list_occurrences(parent=project_name, filter=filter_str) filtered_list = [] for v in vulnerabilities: if v.effective_severity == Severity.HIGH or v.effective_severity == Severity.CRITICAL: diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index 56ac9ab7e2b..7a1bd8152cf 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -25,10 +25,10 @@ from google.cloud.devtools import containeranalysis_v1 from google.cloud.pubsub import PublisherClient, SubscriberClient -from grafeas.grafeas_v1.gapic.enums import DiscoveryOccurrence -from grafeas.grafeas_v1.gapic.enums import NoteKind -from grafeas.grafeas_v1.gapic.enums import Severity -from grafeas.grafeas_v1.gapic.enums import Version +from grafeas.grafeas_v1 import DiscoveryOccurrence +from grafeas.grafeas_v1 import NoteKind +from grafeas.grafeas_v1 import Severity +from grafeas.grafeas_v1 import Version import pytest import samples @@ -207,7 +207,7 @@ def test_poll_discovery_occurrence(self): } } grafeas_client.\ - create_note(grafeas_client.project_path(PROJECT_ID), note_id, note) + create_note(parent=f"projects/{PROJECT_ID}", note_id=note_id, note=note) occurrence = { 'note_name': f"projects/{PROJECT_ID}/notes/{note_id}", 'resource_uri': self.image_url, @@ -217,8 +217,8 @@ def test_poll_discovery_occurrence(self): } } created = grafeas_client.\ - create_occurrence(grafeas_client.project_path(PROJECT_ID), - occurrence) + create_occurrence(parent=f"projects/{PROJECT_ID}", + occurrence=occurrence) # poll again disc = samples.poll_discovery_finished(self.image_url, 10, PROJECT_ID) @@ -278,7 +278,7 @@ def test_find_high_severity_vulnerabilities(self): } } grafeas_client.\ - create_note(grafeas_client.project_path(PROJECT_ID), note_id, note) + create_note(parent=f"projects/{PROJECT_ID}", note_id=note_id, note=note) occurrence = { 'note_name': f"projects/{PROJECT_ID}/notes/{note_id}", 'resource_uri': self.image_url, @@ -299,8 +299,8 @@ def test_find_high_severity_vulnerabilities(self): } } created = grafeas_client.\ - create_occurrence(grafeas_client.project_path(PROJECT_ID), - occurrence) + create_occurrence(parent=f"projects/{PROJECT_ID}", + occurrence=occurrence) # query again tries = 0 count = 0 From eb867fa46463b55f3219d02a2d061701d95e3243 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 16 Oct 2020 22:09:40 +0200 Subject: [PATCH 028/102] chore(deps): update dependency google-cloud-containeranalysis to v2 (#41) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index af8750f80b7..f51fbe5eaec 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==1.7.0 -google-cloud-containeranalysis==1.0.3 +google-cloud-containeranalysis==2.0.0 grafeas==1.0.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 594c83e5f5ffd6e58b74189a310fede12bf9b355 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 16 Oct 2020 23:10:08 +0200 Subject: [PATCH 029/102] chore(deps): update dependency grafeas to v1.0.1 (#40) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [grafeas](https://togithub.com/googleapis/python-grafeas) | patch | `==1.0.0` -> `==1.0.1` | --- ### Release Notes
googleapis/python-grafeas ### [`v1.0.1`](https://togithub.com/googleapis/python-grafeas/blob/master/CHANGELOG.md#​101-httpswwwgithubcomgoogleapispython-grafeascomparev100v101-2020-08-12) [Compare Source](https://togithub.com/googleapis/python-grafeas/compare/v1.0.0...v1.0.1)
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/python-containeranalysis). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index f51fbe5eaec..605f7e85a4d 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==1.7.0 google-cloud-containeranalysis==2.0.0 -grafeas==1.0.0 +grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From df9b33d2a306abb9f495fa6c47ebaf930083b834 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 20 Oct 2020 00:35:16 +0200 Subject: [PATCH 030/102] chore(deps): update dependency google-cloud-pubsub to v2 (#46) Updated sample to use pubsub v2 --- .../container_analysis/snippets/requirements.txt | 2 +- container_registry/container_analysis/snippets/samples.py | 4 ++-- .../container_analysis/snippets/samples_test.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 605f7e85a4d..33b4937a9bb 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==1.7.0 +google-cloud-pubsub==2.1.0 google-cloud-containeranalysis==2.0.0 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py index caf08990ba8..48d193be791 100644 --- a/container_registry/container_analysis/snippets/samples.py +++ b/container_registry/container_analysis/snippets/samples.py @@ -265,11 +265,11 @@ def create_occurrence_subscription(subscription_id, project_id): topic_id = 'container-analysis-occurrences-v1' client = SubscriberClient() - topic_name = client.topic_path(project_id, topic_id) + topic_name = f"projects/{project_id}/topics/{topic_id}" subscription_name = client.subscription_path(project_id, subscription_id) success = True try: - client.create_subscription(subscription_name, topic_name) + client.create_subscription({"name": subscription_name, "topic": topic_name}) except AlreadyExists: # if subscription already exists, do nothing pass diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index 7a1bd8152cf..7145dd75943 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -152,7 +152,7 @@ def test_pubsub(self): client = SubscriberClient() try: topic_id = 'container-analysis-occurrences-v1' - topic_name = client.topic_path(PROJECT_ID, topic_id) + topic_name = {"name": f"projects/{PROJECT_ID}/topics/{topic_id}"} publisher = PublisherClient() publisher.create_topic(topic_name) except AlreadyExists: @@ -185,7 +185,7 @@ def test_pubsub(self): assert message_count <= receiver.msg_count finally: # clean up - client.delete_subscription(subscription_name) + client.delete_subscription({"subscription": subscription_name}) def test_poll_discovery_occurrence(self): # try with no discovery occurrence From 4bc0208ee0fd39cedd1a6951cbffc73a6f2b1073 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 19 Nov 2020 22:32:03 +0100 Subject: [PATCH 031/102] chore(deps): update dependency google-cloud-containeranalysis to v2.1.0 (#56) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 33b4937a9bb..2d83f723d3c 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.1.0 -google-cloud-containeranalysis==2.0.0 +google-cloud-containeranalysis==2.1.0 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 5688a3016b7090c860d6fbb36bceb38a2cfedad3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 5 Dec 2020 06:32:29 +0100 Subject: [PATCH 032/102] chore(deps): update dependency google-cloud-pubsub to v2.2.0 (#61) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 2d83f723d3c..c55dd073b3b 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.1.0 +google-cloud-pubsub==2.2.0 google-cloud-containeranalysis==2.1.0 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" From 1ec4437bdbe549d660efbd8f622c38023a17b49d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 11 Dec 2020 17:47:14 +0100 Subject: [PATCH 033/102] chore(deps): update dependency mock to v4.0.3 (#67) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index c55dd073b3b..f650d3f289f 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -4,4 +4,4 @@ grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 -mock==4.0.2 +mock==4.0.3 From 88fb4962f153131ba7595d338ac2fa48a802b7ec Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 6 Jan 2021 23:46:01 +0100 Subject: [PATCH 034/102] chore(deps): update dependency google-cloud-containeranalysis to v2.2.0 (#76) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index f650d3f289f..07718d448b8 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.2.0 -google-cloud-containeranalysis==2.1.0 +google-cloud-containeranalysis==2.2.0 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 65d790bf852bd50ad88533bdf6a7379f33db0c7a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 16 Feb 2021 19:28:03 +0100 Subject: [PATCH 035/102] chore(deps): update dependency google-cloud-containeranalysis to v2.2.1 (#91) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 07718d448b8..84e843dfae8 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.2.0 -google-cloud-containeranalysis==2.2.0 +google-cloud-containeranalysis==2.2.1 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From cb27efa1eb6c8acc89ee6a00bafb6541ae88c8b2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 16 Feb 2021 19:41:44 +0100 Subject: [PATCH 036/102] chore(deps): update dependency google-cloud-pubsub to v2.3.0 (#88) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 84e843dfae8..0f9a29af29d 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.2.0 +google-cloud-pubsub==2.3.0 google-cloud-containeranalysis==2.2.1 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" From ae002612cc2aebda870e5967c66d03d1fac1e3e2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 23 Feb 2021 18:25:51 +0100 Subject: [PATCH 037/102] chore(deps): update dependency google-cloud-pubsub to v2.4.0 (#94) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 0f9a29af29d..41c1ec9fd58 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.3.0 +google-cloud-pubsub==2.4.0 google-cloud-containeranalysis==2.2.1 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" From a55d1701c0506af27d8e8236bfff1d92c65470c2 Mon Sep 17 00:00:00 2001 From: Megan O'Keefe <3137106+askmeegs@users.noreply.github.com> Date: Thu, 25 Mar 2021 11:45:37 -0400 Subject: [PATCH 038/102] fix: effective severity attribute error (#104) --- container_registry/container_analysis/snippets/samples.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/container_analysis/snippets/samples.py index 48d193be791..ecf28c43b83 100644 --- a/container_registry/container_analysis/snippets/samples.py +++ b/container_registry/container_analysis/snippets/samples.py @@ -367,7 +367,7 @@ def find_high_severity_vulnerabilities_for_image(resource_url, project_id): vulnerabilities = grafeas_client.list_occurrences(parent=project_name, filter=filter_str) filtered_list = [] for v in vulnerabilities: - if v.effective_severity == Severity.HIGH or v.effective_severity == Severity.CRITICAL: + if v.vulnerability.effective_severity == Severity.HIGH or v.vulnerability.effective_severity == Severity.CRITICAL: filtered_list.append(v) return filtered_list # [END containeranalysis_filter_vulnerability_occurrences] From 95f32003a8757122b02bc13d08f6b28d7fc86738 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 31 Mar 2021 01:24:58 +0200 Subject: [PATCH 039/102] chore(deps): update dependency google-cloud-containeranalysis to v2.2.2 (#107) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 41c1ec9fd58..71b4a54487a 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.4.0 -google-cloud-containeranalysis==2.2.1 +google-cloud-containeranalysis==2.2.2 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 047b7754d3c4478f7d1482893f271cc8f75452eb Mon Sep 17 00:00:00 2001 From: Dina Graves Portman Date: Fri, 2 Apr 2021 14:21:31 -0700 Subject: [PATCH 040/102] test: fix flaky test (#106) * test: fix flaky test --- .../container_analysis/snippets/samples_test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/container_analysis/snippets/samples_test.py index 7145dd75943..dd9bce6c177 100644 --- a/container_registry/container_analysis/snippets/samples_test.py +++ b/container_registry/container_analysis/snippets/samples_test.py @@ -187,7 +187,7 @@ def test_pubsub(self): # clean up client.delete_subscription({"subscription": subscription_name}) - def test_poll_discovery_occurrence(self): + def test_poll_discovery_occurrence_fails(self): # try with no discovery occurrence try: samples.poll_discovery_finished(self.image_url, 5, PROJECT_ID) @@ -197,6 +197,8 @@ def test_poll_discovery_occurrence(self): # we expect timeout error assert False + @pytest.mark.flaky(max_runs=3, min_passes=1) + def test_poll_discovery_occurrence(self): # create discovery occurrence note_id = 'discovery-note-{}'.format(uuid.uuid4()) client = containeranalysis_v1.ContainerAnalysisClient() @@ -220,7 +222,6 @@ def test_poll_discovery_occurrence(self): create_occurrence(parent=f"projects/{PROJECT_ID}", occurrence=occurrence) - # poll again disc = samples.poll_discovery_finished(self.image_url, 10, PROJECT_ID) status = disc.discovery.analysis_status assert disc is not None From ca6be1b4f3bafe1592c8ff1c2417be96480b5672 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 2 Apr 2021 23:30:46 +0200 Subject: [PATCH 041/102] chore(deps): update dependency google-cloud-pubsub to v2.4.1 (#108) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 71b4a54487a..0ac42ccd34e 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.4.0 +google-cloud-pubsub==2.4.1 google-cloud-containeranalysis==2.2.2 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" From 8749249499dcdb5f59b0b115fcd42f0ca39eb9ba Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 3 Apr 2021 02:03:32 +0200 Subject: [PATCH 042/102] chore(deps): update dependency google-cloud-containeranalysis to v2.2.3 (#111) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 0ac42ccd34e..cca5c27857c 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.4.1 -google-cloud-containeranalysis==2.2.2 +google-cloud-containeranalysis==2.2.3 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 33aaf50fe51493bafc633c356ce1b2c012d3497d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 12 Apr 2021 19:11:14 +0200 Subject: [PATCH 043/102] chore(deps): update dependency pytest to v6.2.3 (#115) --- .../container_analysis/snippets/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 7e460c8c866..f7e3ec09da6 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==6.0.1 +pytest==6.2.3 From 4f21cf8292de33a3d7128235a4b97b23e4416620 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 May 2021 21:45:52 +0200 Subject: [PATCH 044/102] chore(deps): update dependency pytest to v6.2.4 (#123) --- .../container_analysis/snippets/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index f7e3ec09da6..95ea1e6a02b 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==6.2.3 +pytest==6.2.4 From b422cb3bb29a3e12b52c097e0d42bbc73bbd6499 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 12 May 2021 22:51:36 +0200 Subject: [PATCH 045/102] chore(deps): update dependency google-cloud-pubsub to v2.4.2 (#126) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index cca5c27857c..a908fba6f6d 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.4.1 +google-cloud-pubsub==2.4.2 google-cloud-containeranalysis==2.2.3 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" From 3ef14643d5bd10d2ebd45f20f25406d4f8fdc2a1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 20 May 2021 02:51:10 +0200 Subject: [PATCH 046/102] chore(deps): update dependency google-cloud-pubsub to v2.5.0 (#131) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index a908fba6f6d..4082b468359 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.4.2 +google-cloud-pubsub==2.5.0 google-cloud-containeranalysis==2.2.3 grafeas==1.0.1 pytest==5.3.0; python_version > "3.0" From 05ae0f32362edc42043b5074956889eb0741d58d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 20 May 2021 23:18:43 +0200 Subject: [PATCH 047/102] chore(deps): update dependency grafeas to v1.1.0 (#133) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 4082b468359..9f0053707af 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.5.0 google-cloud-containeranalysis==2.2.3 -grafeas==1.0.1 +grafeas==1.1.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From 72d200ac697f9bf4d792e9edcfe7dd94282bcb17 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 27 May 2021 20:29:03 +0200 Subject: [PATCH 048/102] chore(deps): update dependency google-cloud-containeranalysis to v2.3.0 (#138) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 9f0053707af..c327fee0ac0 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.5.0 -google-cloud-containeranalysis==2.2.3 +google-cloud-containeranalysis==2.3.0 grafeas==1.1.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 7f5bd122631e067d5f771a86c652888e63b8e4a4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 26 Jun 2021 02:10:25 +0200 Subject: [PATCH 049/102] chore(deps): update dependency google-cloud-pubsub to v2.6.0 (#145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-cloud-pubsub](https://togithub.com/googleapis/python-pubsub) | `==2.5.0` -> `==2.6.0` | [![age](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.6.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.6.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.6.0/compatibility-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.6.0/confidence-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/python-pubsub ### [`v2.6.0`](https://togithub.com/googleapis/python-pubsub/blob/master/CHANGELOG.md#​260-httpswwwgithubcomgoogleapispython-pubsubcomparev250v260-2021-06-17) [Compare Source](https://togithub.com/googleapis/python-pubsub/compare/v2.5.0...v2.6.0) ##### Features - support customizable retry and timeout settings on the publisher client ([#​299](https://www.github.com/googleapis/python-pubsub/issues/299)) ([7597604](https://www.github.com/googleapis/python-pubsub/commit/7597604b41fa3a1e9bf34addc35c8647dde007cc)) ##### Bug Fixes - ACK deadline set for received messages can be too low ([#​416](https://www.github.com/googleapis/python-pubsub/issues/416)) ([e907f6e](https://www.github.com/googleapis/python-pubsub/commit/e907f6e05f59f64a3b08df3304e92ec960997be6)) - threads can skip the line in publisher flow controller ([#​422](https://www.github.com/googleapis/python-pubsub/issues/422)) ([ef89f55](https://www.github.com/googleapis/python-pubsub/commit/ef89f55a41044e9ad26b91132b4b1be9c7b2c127)) ##### Documentation - block until the streaming pull shuts down ([#​424](https://www.github.com/googleapis/python-pubsub/issues/424)) ([d0d0b70](https://www.github.com/googleapis/python-pubsub/commit/d0d0b704642df8dee893d3f585aeb666e19696fb)) - explain that future.cancel() is non-blocking ([#​420](https://www.github.com/googleapis/python-pubsub/issues/420)) ([c825789](https://www.github.com/googleapis/python-pubsub/commit/c825789bdff310f44cbb132a723e99d1e6331d8f))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/python-containeranalysis). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index c327fee0ac0..eba5c88caf8 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.5.0 +google-cloud-pubsub==2.6.0 google-cloud-containeranalysis==2.3.0 grafeas==1.1.0 pytest==5.3.0; python_version > "3.0" From 2dc36aa50e0a8d7e28e7d5fb2757269d8a3b4bea Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 1 Jul 2021 04:16:08 +0200 Subject: [PATCH 050/102] chore(deps): update dependency google-cloud-containeranalysis to v2.4.0 (#152) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-cloud-containeranalysis](https://togithub.com/googleapis/python-containeranalysis) | `==2.3.0` -> `==2.4.0` | [![age](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.0/compatibility-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.0/confidence-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/python-containeranalysis ### [`v2.4.0`](https://togithub.com/googleapis/python-containeranalysis/blob/master/CHANGELOG.md#​240-httpswwwgithubcomgoogleapispython-containeranalysiscomparev230v240-2021-06-30) [Compare Source](https://togithub.com/googleapis/python-containeranalysis/compare/v2.3.0...v2.4.0) ##### Features - add always_use_jwt_access ([#​147](https://www.github.com/googleapis/python-containeranalysis/issues/147)) ([1f55871](https://www.github.com/googleapis/python-containeranalysis/commit/1f558713a683e3b48d9d7fba2c015e92818850fd)) ##### Bug Fixes - disable always_use_jwt_access ([#​151](https://www.github.com/googleapis/python-containeranalysis/issues/151)) ([7768ae1](https://www.github.com/googleapis/python-containeranalysis/commit/7768ae1ce4a32fa25ef5c0fb86f8981fed038297)) ##### Documentation - omit mention of Python 2.7 in 'CONTRIBUTING.rst' ([#​1127](https://www.github.com/googleapis/python-containeranalysis/issues/1127)) ([#​141](https://www.github.com/googleapis/python-containeranalysis/issues/141)) ([a588841](https://www.github.com/googleapis/python-containeranalysis/commit/a58884154f23caf453040ad314c0a2d4416952f2))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/python-containeranalysis). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index eba5c88caf8..9d790d09e73 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.6.0 -google-cloud-containeranalysis==2.3.0 +google-cloud-containeranalysis==2.4.0 grafeas==1.1.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 4096a0c30ace236c2d065f395d42eb00b98e2582 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 12 Jul 2021 20:18:22 +0200 Subject: [PATCH 051/102] chore(deps): update dependency google-cloud-pubsub to v2.6.1 (#153) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 9d790d09e73..c8b4877ba7b 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.6.0 +google-cloud-pubsub==2.6.1 google-cloud-containeranalysis==2.4.0 grafeas==1.1.0 pytest==5.3.0; python_version > "3.0" From d1eb3c90f7f7444ae0adbb64e5adcd99c814d713 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 26 Jul 2021 20:46:49 +0200 Subject: [PATCH 052/102] chore(deps): update dependency grafeas to v1.1.1 (#159) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index c8b4877ba7b..98e1a244883 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.6.1 google-cloud-containeranalysis==2.4.0 -grafeas==1.1.0 +grafeas==1.1.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From d7c2f6f732ded8b3e7f6ddfae9514046f165d9e9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 27 Jul 2021 12:36:15 +0200 Subject: [PATCH 053/102] chore(deps): update dependency google-cloud-containeranalysis to v2.4.1 (#165) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-cloud-containeranalysis](https://togithub.com/googleapis/python-containeranalysis) | `==2.4.0` -> `==2.4.1` | [![age](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.1/compatibility-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.4.1/confidence-slim/2.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/python-containeranalysis ### [`v2.4.1`](https://togithub.com/googleapis/python-containeranalysis/blob/master/CHANGELOG.md#​241-httpswwwgithubcomgoogleapispython-containeranalysiscomparev240v241-2021-07-26) [Compare Source](https://togithub.com/googleapis/python-containeranalysis/compare/v2.4.0...v2.4.1)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/python-containeranalysis). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 98e1a244883..192a5fe79b7 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.6.1 -google-cloud-containeranalysis==2.4.0 +google-cloud-containeranalysis==2.4.1 grafeas==1.1.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From e36d3f42896bca9f01ad36f12b95626b5ee8c255 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 28 Jul 2021 16:48:47 +0200 Subject: [PATCH 054/102] chore(deps): update dependency grafeas to v1.1.2 (#166) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 192a5fe79b7..b84464e76eb 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.6.1 google-cloud-containeranalysis==2.4.1 -grafeas==1.1.1 +grafeas==1.1.2 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From ff4f0432e16692f4ee605a7d63ce74da657cfd97 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 28 Jul 2021 21:51:40 +0200 Subject: [PATCH 055/102] chore(deps): update dependency google-cloud-pubsub to v2.7.0 (#167) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index b84464e76eb..725aceb859f 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.6.1 +google-cloud-pubsub==2.7.0 google-cloud-containeranalysis==2.4.1 grafeas==1.1.2 pytest==5.3.0; python_version > "3.0" From 12c02f8e523111628c10864b4f783b1aa62b90b0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 21 Aug 2021 00:08:55 +0200 Subject: [PATCH 056/102] chore(deps): update dependency google-cloud-pubsub to v2.7.1 (#172) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 725aceb859f..5407337863d 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.7.0 +google-cloud-pubsub==2.7.1 google-cloud-containeranalysis==2.4.1 grafeas==1.1.2 pytest==5.3.0; python_version > "3.0" From e21b538e4b0f19de27b63c001f9f80b3303026a3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 31 Aug 2021 17:12:07 +0200 Subject: [PATCH 057/102] chore(deps): update dependency pytest to v6.2.5 (#176) --- .../container_analysis/snippets/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 95ea1e6a02b..927094516e6 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==6.2.4 +pytest==6.2.5 From 34c316eb20883df9e82f00e050bd2c3943f17b85 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Sep 2021 17:39:06 +0200 Subject: [PATCH 058/102] chore(deps): update dependency google-cloud-pubsub to v2.8.0 (#179) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 5407337863d..892ec07f945 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.7.1 +google-cloud-pubsub==2.8.0 google-cloud-containeranalysis==2.4.1 grafeas==1.1.2 pytest==5.3.0; python_version > "3.0" From 6b5df547ed73a9410da0ffda3326139915785bdc Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 25 Sep 2021 00:14:55 +0200 Subject: [PATCH 059/102] chore(deps): update all dependencies (#186) --- .../container_analysis/snippets/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 892ec07f945..6659a9f5159 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.8.0 -google-cloud-containeranalysis==2.4.1 -grafeas==1.1.2 +google-cloud-containeranalysis==2.4.2 +grafeas==1.1.3 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From 6f6fbeb702abc9216c9d21ed65596175eb122124 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 1 Oct 2021 01:20:44 +0200 Subject: [PATCH 060/102] chore(deps): update dependency grafeas to v1.1.4 (#188) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 6659a9f5159..954420e00f3 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.8.0 google-cloud-containeranalysis==2.4.2 -grafeas==1.1.3 +grafeas==1.1.4 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From 7aa905eff7fbdea80052397227ebbc931fc70ee0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 11 Oct 2021 20:50:02 +0200 Subject: [PATCH 061/102] chore(deps): update dependency grafeas to v1.2.0 (#195) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 954420e00f3..4f67cb605b4 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.8.0 google-cloud-containeranalysis==2.4.2 -grafeas==1.1.4 +grafeas==1.2.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From f37482291710c2aa74aecd2aba8cbecf2403d5cd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 13 Oct 2021 10:37:58 +0200 Subject: [PATCH 062/102] chore(deps): update dependency google-cloud-containeranalysis to v2.5.0 (#196) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 4f67cb605b4..16581e818ab 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.8.0 -google-cloud-containeranalysis==2.4.2 +google-cloud-containeranalysis==2.5.0 grafeas==1.2.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 8e804fc26c65e31b4e6329c798e4722876c8c713 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 20 Oct 2021 19:25:08 +0200 Subject: [PATCH 063/102] chore(deps): update dependency grafeas to v1.3.0 (#199) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 16581e818ab..bd2df2b4232 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.8.0 google-cloud-containeranalysis==2.5.0 -grafeas==1.2.0 +grafeas==1.3.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From 3e02f1f50b60f5d39f61a5e6110fd7150c5a031f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 25 Oct 2021 15:49:53 +0200 Subject: [PATCH 064/102] chore(deps): update dependency google-cloud-containeranalysis to v2.6.0 (#200) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index bd2df2b4232..87cdbabf7d1 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.8.0 -google-cloud-containeranalysis==2.5.0 +google-cloud-containeranalysis==2.6.0 grafeas==1.3.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From 891011a9f6be27f81b9383dca0e86a32eeca665f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 29 Oct 2021 17:47:10 +0200 Subject: [PATCH 065/102] chore(deps): update dependency google-cloud-containeranalysis to v2.6.1 (#205) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 87cdbabf7d1..db9e1ebed58 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.8.0 -google-cloud-containeranalysis==2.6.0 +google-cloud-containeranalysis==2.6.1 grafeas==1.3.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" From b8866bee728a94e7862b4e6655f65bdd66861878 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 2 Nov 2021 16:46:29 +0100 Subject: [PATCH 066/102] chore(deps): update all dependencies (#208) --- .../container_analysis/snippets/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index db9e1ebed58..37282661894 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.8.0 -google-cloud-containeranalysis==2.6.1 -grafeas==1.3.0 +google-cloud-containeranalysis==2.6.2 +grafeas==1.3.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From d0de0e3eb9d1e8ae2eb28d30692d0095db606344 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 4 Nov 2021 10:18:24 +0100 Subject: [PATCH 067/102] chore(deps): update dependency grafeas to v1.4.0 (#209) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 37282661894..3f7eed32ec0 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.8.0 google-cloud-containeranalysis==2.6.2 -grafeas==1.3.1 +grafeas==1.4.0 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" flaky==3.7.0 From 15be17b86d5c67ecefabe8a50a60655a3f456627 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 11 Nov 2021 02:09:29 +0100 Subject: [PATCH 068/102] chore(deps): update dependency google-cloud-pubsub to v2.9.0 (#213) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 3f7eed32ec0..04ca8a87123 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.8.0 +google-cloud-pubsub==2.9.0 google-cloud-containeranalysis==2.6.2 grafeas==1.4.0 pytest==5.3.0; python_version > "3.0" From 68242a74592e7bb308335257fa293d7743f377b5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 13 Jan 2022 19:25:14 +0100 Subject: [PATCH 069/102] chore(deps): update all dependencies (#227) * chore(deps): update all dependencies * remove python 2.7 from testing Co-authored-by: Dina Graves Portman Co-authored-by: Anthonios Partheniou --- .../container_analysis/snippets/requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 04ca8a87123..02e7c58362a 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,7 +1,6 @@ google-cloud-pubsub==2.9.0 google-cloud-containeranalysis==2.6.2 -grafeas==1.4.0 -pytest==5.3.0; python_version > "3.0" -pytest==4.6.6; python_version < "3.0" +grafeas==1.4.1 +pytest==6.2.5 flaky==3.7.0 mock==4.0.3 From 8401d95d77a0ce0a6d8c98c756badac5925bcd38 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sun, 16 Jan 2022 15:19:35 +0100 Subject: [PATCH 070/102] chore(deps): update dependency google-cloud-containeranalysis to v2.6.3 (#230) Co-authored-by: Anthonios Partheniou --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 02e7c58362a..67f01a1863a 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.9.0 -google-cloud-containeranalysis==2.6.2 +google-cloud-containeranalysis==2.6.3 grafeas==1.4.1 pytest==6.2.5 flaky==3.7.0 From 16947134dc8d5aa23b58b8777f4b0a9054c13b53 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 7 Feb 2022 17:21:15 +0100 Subject: [PATCH 071/102] chore(deps): update dependency google-cloud-containeranalysis to v2.7.0 (#238) Co-authored-by: Anthonios Partheniou --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 67f01a1863a..cb2276d8473 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.9.0 -google-cloud-containeranalysis==2.6.3 +google-cloud-containeranalysis==2.7.0 grafeas==1.4.1 pytest==6.2.5 flaky==3.7.0 From c76176901411e355a81cd46e521f7af2e3cc9269 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 23:11:11 +0100 Subject: [PATCH 072/102] chore(deps): update dependency pytest to v7 (#243) --- .../container_analysis/snippets/requirements-test.txt | 2 +- container_registry/container_analysis/snippets/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 927094516e6..4a46ff60080 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==6.2.5 +pytest==7.0.0 diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index cb2276d8473..c282392b29d 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.9.0 google-cloud-containeranalysis==2.7.0 grafeas==1.4.1 -pytest==6.2.5 +pytest==7.0.0 flaky==3.7.0 mock==4.0.3 From 235469f79384f9b46942890ba11fb06a83225890 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 12 Feb 2022 00:26:54 +0100 Subject: [PATCH 073/102] chore(deps): update dependency pytest to v7.0.1 (#245) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [pytest](https://docs.pytest.org/en/latest/) ([source](https://togithub.com/pytest-dev/pytest), [changelog](https://docs.pytest.org/en/stable/changelog.html)) | `==7.0.0` -> `==7.0.1` | [![age](https://badges.renovateapi.com/packages/pypi/pytest/7.0.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/pytest/7.0.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/pytest/7.0.1/compatibility-slim/7.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/pytest/7.0.1/confidence-slim/7.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
pytest-dev/pytest ### [`v7.0.1`](https://togithub.com/pytest-dev/pytest/releases/7.0.1) [Compare Source](https://togithub.com/pytest-dev/pytest/compare/7.0.0...7.0.1) # pytest 7.0.1 (2022-02-11) ## Bug Fixes - [#​9608](https://togithub.com/pytest-dev/pytest/issues/9608): Fix invalid importing of `importlib.readers` in Python 3.9. - [#​9610](https://togithub.com/pytest-dev/pytest/issues/9610): Restore \[UnitTestFunction.obj]{.title-ref} to return unbound rather than bound method. Fixes a crash during a failed teardown in unittest TestCases with non-default \[\__init\_\_]{.title-ref}. Regressed in pytest 7.0.0. - [#​9636](https://togithub.com/pytest-dev/pytest/issues/9636): The `pythonpath` plugin was renamed to `python_path`. This avoids a conflict with the `pytest-pythonpath` plugin. - [#​9642](https://togithub.com/pytest-dev/pytest/issues/9642): Fix running tests by id with `::` in the parametrize portion. - [#​9643](https://togithub.com/pytest-dev/pytest/issues/9643): Delay issuing a `~pytest.PytestWarning`{.interpreted-text role="class"} about diamond inheritance involving `~pytest.Item`{.interpreted-text role="class"} and `~pytest.Collector`{.interpreted-text role="class"} so it can be filtered using `standard warning filters `{.interpreted-text role="ref"}.
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/python-containeranalysis). --- .../container_analysis/snippets/requirements-test.txt | 2 +- container_registry/container_analysis/snippets/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 4a46ff60080..c2845bffbe8 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==7.0.0 +pytest==7.0.1 diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index c282392b29d..d12d241f585 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.9.0 google-cloud-containeranalysis==2.7.0 grafeas==1.4.1 -pytest==7.0.0 +pytest==7.0.1 flaky==3.7.0 mock==4.0.3 From 3692e6f6fb7992d8ef9e96efbbb83cff42c5f449 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 23 Feb 2022 16:51:08 +0100 Subject: [PATCH 074/102] chore(deps): update dependency google-cloud-containeranalysis to v2.7.1 (#246) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-cloud-containeranalysis](https://togithub.com/googleapis/python-containeranalysis) | `==2.7.0` -> `==2.7.1` | [![age](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.7.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.7.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.7.1/compatibility-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-cloud-containeranalysis/2.7.1/confidence-slim/2.7.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/python-containeranalysis ### [`v2.7.1`](https://togithub.com/googleapis/python-containeranalysis/blob/HEAD/CHANGELOG.md#​271-httpsgithubcomgoogleapispython-containeranalysiscomparev270v271-2022-02-11) [Compare Source](https://togithub.com/googleapis/python-containeranalysis/compare/v2.7.0...v2.7.1)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/python-containeranalysis). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index d12d241f585..6279894e6ae 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.9.0 -google-cloud-containeranalysis==2.7.0 +google-cloud-containeranalysis==2.7.1 grafeas==1.4.1 pytest==7.0.1 flaky==3.7.0 From 56007f706b21a79ed82529ff3b2011cc110d2a73 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 1 Mar 2022 12:19:02 +0100 Subject: [PATCH 075/102] chore(deps): update dependency grafeas to v1.4.2 (#249) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 6279894e6ae..12e20c9a479 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.9.0 google-cloud-containeranalysis==2.7.1 -grafeas==1.4.1 +grafeas==1.4.2 pytest==7.0.1 flaky==3.7.0 mock==4.0.3 From 4e43efe772598fe0e2a061324cc897387bd1e75c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 4 Mar 2022 18:53:11 +0100 Subject: [PATCH 076/102] chore(deps): update dependency google-cloud-pubsub to v2.10.0 (#255) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 12e20c9a479..98ba73ca018 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.9.0 +google-cloud-pubsub==2.10.0 google-cloud-containeranalysis==2.7.1 grafeas==1.4.2 pytest==7.0.1 From f69d7c1b8957d4d11ce3ca431e2df0f66ffe0e4c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 7 Mar 2022 23:12:21 +0100 Subject: [PATCH 077/102] chore(deps): update all dependencies (#256) Co-authored-by: Anthonios Partheniou --- .../container_analysis/snippets/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 98ba73ca018..3edf835c47b 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.10.0 -google-cloud-containeranalysis==2.7.1 -grafeas==1.4.2 +google-cloud-containeranalysis==2.7.2 +grafeas==1.4.3 pytest==7.0.1 flaky==3.7.0 mock==4.0.3 From 90914c9120379bf89e8927aff927c1a0b569aabd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 9 Mar 2022 00:20:48 +0100 Subject: [PATCH 078/102] chore(deps): update dependency google-cloud-containeranalysis to v2.7.3 (#258) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 3edf835c47b..b8fcaf08d2f 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.10.0 -google-cloud-containeranalysis==2.7.2 +google-cloud-containeranalysis==2.7.3 grafeas==1.4.3 pytest==7.0.1 flaky==3.7.0 From 980b47bf414087602671a358a07caee74bf6cc0d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 10 Mar 2022 11:40:35 +0100 Subject: [PATCH 079/102] chore(deps): update dependency google-cloud-pubsub to v2.11.0 (#259) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index b8fcaf08d2f..289502aece2 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.10.0 +google-cloud-pubsub==2.11.0 google-cloud-containeranalysis==2.7.3 grafeas==1.4.3 pytest==7.0.1 From ea00cbc3f70b3194c01d6ff1abd9693efb9ae84b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sun, 13 Mar 2022 17:04:28 +0100 Subject: [PATCH 080/102] chore(deps): update dependency pytest to v7.1.0 (#261) --- .../container_analysis/snippets/requirements-test.txt | 2 +- container_registry/container_analysis/snippets/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index c2845bffbe8..824a8a7a0ce 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==7.0.1 +pytest==7.1.0 diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 289502aece2..52ef5b8d3c9 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.11.0 google-cloud-containeranalysis==2.7.3 grafeas==1.4.3 -pytest==7.0.1 +pytest==7.1.0 flaky==3.7.0 mock==4.0.3 From c8b4507c29c73099656e8fff90cdb72fd7adfc83 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 19 Mar 2022 11:35:37 +0100 Subject: [PATCH 081/102] chore(deps): update dependency pytest to v7.1.1 (#262) --- .../container_analysis/snippets/requirements-test.txt | 2 +- container_registry/container_analysis/snippets/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 824a8a7a0ce..4f6bf643fc5 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==7.1.0 +pytest==7.1.1 diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 52ef5b8d3c9..b5fd9c3e496 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.11.0 google-cloud-containeranalysis==2.7.3 grafeas==1.4.3 -pytest==7.1.0 +pytest==7.1.1 flaky==3.7.0 mock==4.0.3 From ef90a075c197e2637bf345cc3bc7e92a5ff31575 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 7 Apr 2022 13:13:11 +0200 Subject: [PATCH 082/102] chore(deps): update dependency google-cloud-pubsub to v2.12.0 (#274) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index b5fd9c3e496..42a593a8860 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.11.0 +google-cloud-pubsub==2.12.0 google-cloud-containeranalysis==2.7.3 grafeas==1.4.3 pytest==7.1.1 From 5ece18d4fe2bf62852d87bb7abe84c0d8ef89c66 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 25 Apr 2022 17:00:01 +0200 Subject: [PATCH 083/102] chore(deps): update dependency pytest to v7.1.2 (#282) --- .../container_analysis/snippets/requirements-test.txt | 2 +- container_registry/container_analysis/snippets/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index 4f6bf643fc5..d00689e0623 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==7.1.1 +pytest==7.1.2 diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 42a593a8860..8ed3df3a84a 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.12.0 google-cloud-containeranalysis==2.7.3 grafeas==1.4.3 -pytest==7.1.1 +pytest==7.1.2 flaky==3.7.0 mock==4.0.3 From 87502efa183b32ebfbbe2a7570ecc7c37fc4d2e0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 5 May 2022 23:48:57 +0200 Subject: [PATCH 084/102] chore(deps): update all dependencies (#286) --- .../container_analysis/snippets/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 8ed3df3a84a..6119198f6e4 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.12.0 -google-cloud-containeranalysis==2.7.3 -grafeas==1.4.3 +google-cloud-containeranalysis==2.8.0 +grafeas==1.4.4 pytest==7.1.2 flaky==3.7.0 mock==4.0.3 From af595692510444416050fc2bbc49012af950b238 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 12 May 2022 20:24:26 +0200 Subject: [PATCH 085/102] chore(deps): update dependency google-cloud-pubsub to v2.12.1 (#288) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 6119198f6e4..df9fc6a391c 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.12.0 +google-cloud-pubsub==2.12.1 google-cloud-containeranalysis==2.8.0 grafeas==1.4.4 pytest==7.1.2 From f5f5f2594668f789b76292bca62ea00391ffed94 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 15 Jul 2022 18:11:49 +0200 Subject: [PATCH 086/102] chore(deps): update all dependencies (#295) * chore(deps): update all dependencies * revert Co-authored-by: Anthonios Partheniou Co-authored-by: Ace Nassri --- .../container_analysis/snippets/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index df9fc6a391c..946a871cb51 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ -google-cloud-pubsub==2.12.1 -google-cloud-containeranalysis==2.8.0 -grafeas==1.4.4 +google-cloud-pubsub==2.13.1 +google-cloud-containeranalysis==2.8.1 +grafeas==1.4.5 pytest==7.1.2 flaky==3.7.0 mock==4.0.3 From f1dd8fb1b079f698db133c4acca1636b83aad87a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 2 Aug 2022 14:48:00 +0200 Subject: [PATCH 087/102] chore(deps): update all dependencies (#308) * chore(deps): update all dependencies * revert Co-authored-by: Anthonios Partheniou --- .../container_analysis/snippets/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 946a871cb51..87585b1024a 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ -google-cloud-pubsub==2.13.1 -google-cloud-containeranalysis==2.8.1 -grafeas==1.4.5 +google-cloud-pubsub==2.13.4 +google-cloud-containeranalysis==2.9.0 +grafeas==1.5.0 pytest==7.1.2 flaky==3.7.0 mock==4.0.3 From 520a7cf1a8efc76816774b8a9d273052e39b6728 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 12 Aug 2022 01:14:28 +0200 Subject: [PATCH 088/102] chore(deps): update dependency google-cloud-pubsub to v2.13.5 (#309) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 87585b1024a..c4e0aad959a 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.13.4 +google-cloud-pubsub==2.13.5 google-cloud-containeranalysis==2.9.0 grafeas==1.5.0 pytest==7.1.2 From 96cf0c29ede0265c9b4fe363e38f03b1fe5c9f14 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 12 Aug 2022 13:12:40 +0200 Subject: [PATCH 089/102] chore(deps): update dependency google-cloud-pubsub to v2.13.6 (#312) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index c4e0aad959a..4b2c1276185 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.13.5 +google-cloud-pubsub==2.13.6 google-cloud-containeranalysis==2.9.0 grafeas==1.5.0 pytest==7.1.2 From be90843194fd2704c054d74d381dfb465c31c071 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Aug 2022 16:30:23 +0200 Subject: [PATCH 090/102] chore(deps): update dependency grafeas to v1.5.1 (#314) Co-authored-by: Anthonios Partheniou --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 4b2c1276185..cc144c3118d 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.13.6 google-cloud-containeranalysis==2.9.0 -grafeas==1.5.0 +grafeas==1.5.1 pytest==7.1.2 flaky==3.7.0 mock==4.0.3 From 64fab0c2967887b724a958fbd841fd5c0950e530 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Aug 2022 16:52:57 +0200 Subject: [PATCH 091/102] chore(deps): update dependency google-cloud-containeranalysis to v2.9.1 (#315) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index cc144c3118d..3add9af68b6 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,5 +1,5 @@ google-cloud-pubsub==2.13.6 -google-cloud-containeranalysis==2.9.0 +google-cloud-containeranalysis==2.9.1 grafeas==1.5.1 pytest==7.1.2 flaky==3.7.0 From 0b6e4a826752d5bbebb5c632e1f1f710b8b56cbd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 6 Sep 2022 17:51:20 +0200 Subject: [PATCH 092/102] chore(deps): update dependency pytest to v7.1.3 (#323) --- .../container_analysis/snippets/requirements-test.txt | 2 +- container_registry/container_analysis/snippets/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index d00689e0623..e07168502ea 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==7.1.2 +pytest==7.1.3 diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 3add9af68b6..80855f1e5ff 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.13.6 google-cloud-containeranalysis==2.9.1 grafeas==1.5.1 -pytest==7.1.2 +pytest==7.1.3 flaky==3.7.0 mock==4.0.3 From e138c395360d0ca0fd36b5f7089f3938f61aa06e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Oct 2022 02:55:19 +0200 Subject: [PATCH 093/102] chore(deps): update dependency google-cloud-pubsub to v2.13.7 (#329) Co-authored-by: Anthonios Partheniou --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 80855f1e5ff..a0480d88353 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.13.6 +google-cloud-pubsub==2.13.7 google-cloud-containeranalysis==2.9.1 grafeas==1.5.1 pytest==7.1.3 From 643866c42f0eefe4e15c546b101d053aad166e06 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Oct 2022 03:07:32 +0200 Subject: [PATCH 094/102] chore(deps): update all dependencies (#333) --- .../container_analysis/snippets/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index a0480d88353..10b47fb2790 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.13.7 -google-cloud-containeranalysis==2.9.1 -grafeas==1.5.1 +google-cloud-containeranalysis==2.9.2 +grafeas==1.6.0 pytest==7.1.3 flaky==3.7.0 mock==4.0.3 From c080b9d86c216a5d5a8a627794d5931d7da282b7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 10 Oct 2022 20:16:31 +0200 Subject: [PATCH 095/102] chore(deps): update all dependencies (#336) --- .../container_analysis/snippets/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 10b47fb2790..172a3b2823a 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.13.7 -google-cloud-containeranalysis==2.9.2 -grafeas==1.6.0 +google-cloud-containeranalysis==2.9.3 +grafeas==1.6.1 pytest==7.1.3 flaky==3.7.0 mock==4.0.3 From 12f2840c4725892251a242c688ff45a2aa1c5097 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 11 Oct 2022 18:26:13 +0200 Subject: [PATCH 096/102] chore(deps): update dependency google-cloud-pubsub to v2.13.9 (#337) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-cloud-pubsub](https://togithub.com/googleapis/python-pubsub) | `==2.13.7` -> `==2.13.9` | [![age](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.13.9/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.13.9/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.13.9/compatibility-slim/2.13.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-cloud-pubsub/2.13.9/confidence-slim/2.13.7)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/python-pubsub ### [`v2.13.9`](https://togithub.com/googleapis/python-pubsub/releases/tag/v2.13.9) [Compare Source](https://togithub.com/googleapis/python-pubsub/compare/v2.13.7...v2.13.9) ##### Bug Fixes - **deps:** Allow protobuf 3.19.5 ([#​801](https://togithub.com/googleapis/python-pubsub/issues/801)) ([fa23503](https://togithub.com/googleapis/python-pubsub/commit/fa235033481783c2ec378b2a26b223bdff206461))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/python-containeranalysis). --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index 172a3b2823a..a9f96ac01a8 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.13.7 +google-cloud-pubsub==2.13.9 google-cloud-containeranalysis==2.9.3 grafeas==1.6.1 pytest==7.1.3 From c1c4a4670e3e342168b7271cad802e6470cbb554 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 Oct 2022 15:12:03 +0200 Subject: [PATCH 097/102] chore(deps): update dependency google-cloud-pubsub to v2.13.10 (#338) --- container_registry/container_analysis/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index a9f96ac01a8..a5f9a58dc02 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-pubsub==2.13.9 +google-cloud-pubsub==2.13.10 google-cloud-containeranalysis==2.9.3 grafeas==1.6.1 pytest==7.1.3 From 23bca0ebc9ab7ae3f325d72131eb3ba5cb7dc400 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 Oct 2022 12:48:18 +0200 Subject: [PATCH 098/102] chore(deps): update dependency pytest to v7.2.0 (#339) --- .../container_analysis/snippets/requirements-test.txt | 2 +- container_registry/container_analysis/snippets/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/container_analysis/snippets/requirements-test.txt index e07168502ea..49780e03569 100644 --- a/container_registry/container_analysis/snippets/requirements-test.txt +++ b/container_registry/container_analysis/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==7.1.3 +pytest==7.2.0 diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/container_analysis/snippets/requirements.txt index a5f9a58dc02..ad6c968e8cf 100644 --- a/container_registry/container_analysis/snippets/requirements.txt +++ b/container_registry/container_analysis/snippets/requirements.txt @@ -1,6 +1,6 @@ google-cloud-pubsub==2.13.10 google-cloud-containeranalysis==2.9.3 grafeas==1.6.1 -pytest==7.1.3 +pytest==7.2.0 flaky==3.7.0 mock==4.0.3 From c9be51e68dc2cb91459f58b8510b48324b76aafb Mon Sep 17 00:00:00 2001 From: Sampath M Date: Fri, 18 Nov 2022 11:51:41 +0100 Subject: [PATCH 099/102] Update blunderbuss.yml and CODEOWNERS --- .github/CODEOWNERS | 3 ++- .github/blunderbuss.yml | 4 ++++ container_registry/container_analysis/README.md | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 container_registry/container_analysis/README.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0458dce6e0a..a74fd084343 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -78,4 +78,5 @@ /workflows/**/* @GoogleCloudPlatform/python-samples-reviewers /datacatalog/**/* @GoogleCloudPlatform/python-samples-reviewers /kms/**/** @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers -/dataproc/**/** @GoogleCloudPlatform/cloud-dpes @GoogleCloudPlatform/python-samples-reviewers \ No newline at end of file +/dataproc/**/** @GoogleCloudPlatform/cloud-dpes @GoogleCloudPlatform/python-samples-reviewers +container_registry/container_analysis/**/* @GoogleCloudPlatform/aap-dpes @GoogleCloudPlatform/python-samples-reviewers \ No newline at end of file diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1689daa9992..1fba81eb1fc 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -60,6 +60,10 @@ assign_issues_by: - 'api: container' to: - GoogleCloudPlatform/dee-platform-ops +- labels: + - 'api: containeranalysis' + to: + - GoogleCloudPlatform/aap-dpes - labels: - 'api: datascienceonramp' to: diff --git a/container_registry/container_analysis/README.md b/container_registry/container_analysis/README.md deleted file mode 100644 index 68aaa646aaa..00000000000 --- a/container_registry/container_analysis/README.md +++ /dev/null @@ -1,3 +0,0 @@ -These samples have been moved. - -https://github.com/googleapis/python-containeranalysis/tree/main/samples From b6a6b697937c9bdc9b765ebea518db7d36b2af71 Mon Sep 17 00:00:00 2001 From: Sampath M Date: Mon, 21 Nov 2022 15:30:21 +0100 Subject: [PATCH 100/102] Renamed `container_analysis` to `containeranalysis` --- .github/CODEOWNERS | 2 +- .../snippets/.gitignore | 0 .../snippets/README.md | 2 +- .../snippets/requirements-test.txt | 0 .../snippets/requirements.txt | 0 .../snippets/samples.py | 0 .../snippets/samples_test.py | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename container_registry/{container_analysis => containeranalysis}/snippets/.gitignore (100%) rename container_registry/{container_analysis => containeranalysis}/snippets/README.md (96%) rename container_registry/{container_analysis => containeranalysis}/snippets/requirements-test.txt (100%) rename container_registry/{container_analysis => containeranalysis}/snippets/requirements.txt (100%) rename container_registry/{container_analysis => containeranalysis}/snippets/samples.py (100%) rename container_registry/{container_analysis => containeranalysis}/snippets/samples_test.py (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b205dd7cdd0..98fe2d83d11 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -34,7 +34,7 @@ /composer/**/* @leahecole @rachael-ds @rafalbiegacz @GoogleCloudPlatform/python-samples-reviewers /compute/**/* @m-strzelczyk @GoogleCloudPlatform/dee-infra @GoogleCloudPlatform/python-samples-reviewers /container/**/* @GoogleCloudPlatform/dee-platform-ops @GoogleCloudPlatform/python-samples-reviewers -/container_analysis/**/* @GoogleCloudPlatform/aap-dpes @GoogleCloudPlatform/python-samples-reviewers +/containeranalysis/**/* @GoogleCloudPlatform/aap-dpes @GoogleCloudPlatform/python-samples-reviewers /data-science-onramp/ @leahecole @bradmiro @GoogleCloudPlatform/python-samples-reviewers /datacatalog/**/* @GoogleCloudPlatform/python-samples-reviewers /dataflow/**/* @davidcavazos @GoogleCloudPlatform/python-samples-reviewers diff --git a/container_registry/container_analysis/snippets/.gitignore b/container_registry/containeranalysis/snippets/.gitignore similarity index 100% rename from container_registry/container_analysis/snippets/.gitignore rename to container_registry/containeranalysis/snippets/.gitignore diff --git a/container_registry/container_analysis/snippets/README.md b/container_registry/containeranalysis/snippets/README.md similarity index 96% rename from container_registry/container_analysis/snippets/README.md rename to container_registry/containeranalysis/snippets/README.md index 73c45c35478..cb094028ed8 100644 --- a/container_registry/container_analysis/snippets/README.md +++ b/container_registry/containeranalysis/snippets/README.md @@ -41,7 +41,7 @@ These samples show how to use the [Google Cloud Container Analysis Client Librar 1. **Run Tests** ``` - nox -s "py36(sample='./container_registry/container_analysis')" + nox -s "py36(sample='./container_registry/containeranalysis')" ``` ## Contributing changes diff --git a/container_registry/container_analysis/snippets/requirements-test.txt b/container_registry/containeranalysis/snippets/requirements-test.txt similarity index 100% rename from container_registry/container_analysis/snippets/requirements-test.txt rename to container_registry/containeranalysis/snippets/requirements-test.txt diff --git a/container_registry/container_analysis/snippets/requirements.txt b/container_registry/containeranalysis/snippets/requirements.txt similarity index 100% rename from container_registry/container_analysis/snippets/requirements.txt rename to container_registry/containeranalysis/snippets/requirements.txt diff --git a/container_registry/container_analysis/snippets/samples.py b/container_registry/containeranalysis/snippets/samples.py similarity index 100% rename from container_registry/container_analysis/snippets/samples.py rename to container_registry/containeranalysis/snippets/samples.py diff --git a/container_registry/container_analysis/snippets/samples_test.py b/container_registry/containeranalysis/snippets/samples_test.py similarity index 100% rename from container_registry/container_analysis/snippets/samples_test.py rename to container_registry/containeranalysis/snippets/samples_test.py From 508247af9f04302ec01090838991f81d0eb58100 Mon Sep 17 00:00:00 2001 From: Sampath Kumar Date: Tue, 22 Nov 2022 14:14:09 +0100 Subject: [PATCH 101/102] Update README.md --- container_registry/containeranalysis/snippets/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_registry/containeranalysis/snippets/README.md b/container_registry/containeranalysis/snippets/README.md index cb094028ed8..e5da544dda3 100644 --- a/container_registry/containeranalysis/snippets/README.md +++ b/container_registry/containeranalysis/snippets/README.md @@ -41,7 +41,7 @@ These samples show how to use the [Google Cloud Container Analysis Client Librar 1. **Run Tests** ``` - nox -s "py36(sample='./container_registry/containeranalysis')" + nox -s "py36(sample='./containeranalysis')" ``` ## Contributing changes From 298c692fd9132750c4404d059ea09ef6ba1bb420 Mon Sep 17 00:00:00 2001 From: Sampath M Date: Wed, 23 Nov 2022 16:01:53 +0100 Subject: [PATCH 102/102] Renamed files. --- .../containeranalysis => containeranalysis}/snippets/.gitignore | 0 .../containeranalysis => containeranalysis}/snippets/README.md | 0 .../snippets/requirements-test.txt | 0 .../snippets/requirements.txt | 0 .../containeranalysis => containeranalysis}/snippets/samples.py | 0 .../snippets/samples_test.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename {container_registry/containeranalysis => containeranalysis}/snippets/.gitignore (100%) rename {container_registry/containeranalysis => containeranalysis}/snippets/README.md (100%) rename {container_registry/containeranalysis => containeranalysis}/snippets/requirements-test.txt (100%) rename {container_registry/containeranalysis => containeranalysis}/snippets/requirements.txt (100%) rename {container_registry/containeranalysis => containeranalysis}/snippets/samples.py (100%) rename {container_registry/containeranalysis => containeranalysis}/snippets/samples_test.py (100%) diff --git a/container_registry/containeranalysis/snippets/.gitignore b/containeranalysis/snippets/.gitignore similarity index 100% rename from container_registry/containeranalysis/snippets/.gitignore rename to containeranalysis/snippets/.gitignore diff --git a/container_registry/containeranalysis/snippets/README.md b/containeranalysis/snippets/README.md similarity index 100% rename from container_registry/containeranalysis/snippets/README.md rename to containeranalysis/snippets/README.md diff --git a/container_registry/containeranalysis/snippets/requirements-test.txt b/containeranalysis/snippets/requirements-test.txt similarity index 100% rename from container_registry/containeranalysis/snippets/requirements-test.txt rename to containeranalysis/snippets/requirements-test.txt diff --git a/container_registry/containeranalysis/snippets/requirements.txt b/containeranalysis/snippets/requirements.txt similarity index 100% rename from container_registry/containeranalysis/snippets/requirements.txt rename to containeranalysis/snippets/requirements.txt diff --git a/container_registry/containeranalysis/snippets/samples.py b/containeranalysis/snippets/samples.py similarity index 100% rename from container_registry/containeranalysis/snippets/samples.py rename to containeranalysis/snippets/samples.py diff --git a/container_registry/containeranalysis/snippets/samples_test.py b/containeranalysis/snippets/samples_test.py similarity index 100% rename from container_registry/containeranalysis/snippets/samples_test.py rename to containeranalysis/snippets/samples_test.py