8000 fix: include the compliance protos (#222) · googleapis/google-cloud-python@a3fea13 · GitHub
[go: up one dir, main page]
Skip to content

Commit a3fea13

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: include the compliance protos (#222)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 420306668 Source-Link: googleapis/googleapis@9a8910e Source-Link: googleapis/googleapis-gen@24c9bfc Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjRjOWJmYzRkNTlmNTBhNDllMjJhNjA3MGQxYzIyOWY1MjNkZWZkYyJ9 fix(deps): require grafeas 1.4.1
1 parent 3b56cb9 commit a3fea13

File tree

6 files changed

+15
-69
lines changed

6 files changed

+15
-69
lines changed

‎packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/async_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
571571
The request object. Request to get a vulnerability
572572
summary for some set of occurrences.
573573
parent (:class:`str`):
574-
The name of the project to get a vulnerability summary
575-
for in the form of ``projects/[PROJECT_ID]``.
574+
Required. The name of the project to get a vulnerability
575+
summary for in the form of ``projects/[PROJECT_ID]``.
576576
577577
This corresponds to the ``parent`` field
578578
on the ``request`` instance; if ``request`` is provided, this

‎packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,8 +748,8 @@ def get_vulnerability_occurrences_summary(
748748
The request object. Request to get a vulnerability
749749
summary for some set of occurrences.
750750
parent (str):
751-
The name of the project to get a vulnerability summary
752-
for in the form of ``projects/[PROJECT_ID]``.
751+
Required. The name of the project to get a vulnerability
752+
summary for in the form of ``projects/[PROJECT_ID]``.
753753
754754
This corresponds to the ``parent`` field
755755
on the ``request`` instance; if ``request`` is provided, this

‎packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/types/containeranalysis.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616
import proto # type: ignore
1717

18-
from grafeas.grafeas_v1.types import vulnerability # type: ignore
18+
from grafeas.grafeas_v1.types import severity # type: ignore
1919

2020

2121
__protobuf__ = proto.module(
@@ -33,8 +33,8 @@ class GetVulnerabilityOccurrencesSummaryRequest(proto.Message):
3333
3434
Attributes:
3535
parent (str):
36-
The name of the project to get a vulnerability summary for
37-
in the form of ``projects/[PROJECT_ID]``.
36+
Required. The name of the project to get a vulnerability
37+
summary for in the form of ``projects/[PROJECT_ID]``.
3838
filter (str):
3939
The filter expression.
4040
"""
@@ -60,7 +60,7 @@ class FixableTotalByDigest(proto.Message):
6060
Attributes:
6161
resource_uri (str):
6262
The affected resource.
63-
severity (grafeas.v1.vulnerability.Severity):
63+
severity (grafeas.v1.severity.Severity):
6464
The severity for this count. SEVERITY_UNSPECIFIED indicates
6565
total across all severities.
6666
fixable_count (int):
@@ -72,7 +72,7 @@ class FixableTotalByDigest(proto.Message):
7272
"""
7373

7474
resource_uri = proto.Field(proto.STRING, number=1,)
75-
severity = proto.Field(proto.ENUM, number=2, enum=vulnerability.Severity,)
75+
severity = proto.Field(proto.ENUM, number=2, enum=severity.Severity,)
7676
fixable_count = proto.Field(proto.INT64, number=3,)
7777
total_count = proto.Field(proto.INT64, number=4,)
7878

‎packages/google-cloud-containeranalysis/owlbot.py

Lines changed: 4 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
# Fix imported type from grafeas
3636
s.replace(
3737
library / "google/**/types/containeranalysis.py",
38-
"from grafeas\.v1 import vulnerability_pb2",
39-
"from grafeas.grafeas_v1.types import vulnerability"
38+
"from grafeas\.v1 import severity_pb2",
39+
"from grafeas.grafeas_v1.types import severity"
4040
)
4141

4242
# Fix imported type from grafeas
4343
s.replace(
4444
library / "google/**/types/containeranalysis.py",
45-
"vulnerability_pb2",
46-
"vulnerability"
45+
"severity_pb2",
46+
"severity"
4747
)
4848

4949
# Insert helper method to get grafeas client
@@ -113,58 +113,4 @@
113113

114114
python.py_samples(skip_readmes=True)
115115

116-
# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged
117-
118-
# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
119-
s.replace(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")
120-
121-
# Customize CONTRIBUTING.rst to replace master with main
122-
s.replace(
123-
"CONTRIBUTING.rst",
124-
"fetch and merge changes from upstream into master",
125-
"fetch and merge changes from upstream into main",
126-
)
127-
128-
s.replace(
129-
"CONTRIBUTING.rst",
130-
"git merge upstream/master",
131-
"git merge upstream/main",
132-
)
133-
134-
s.replace(
135-
"CONTRIBUTING.rst",
136-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
137-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
138-
)
139-
140-
s.replace(
141-
"CONTRIBUTING.rst",
142-
"remote \(``master``\)",
143-
"remote (``main``)",
144-
)
145-
146-
s.replace(
147-
"CONTRIBUTING.rst",
148-
"blob/master/CONTRIBUTING.rst",
149-
"blob/main/CONTRIBUTING.rst",
150-
)
151-
152-
s.replace(
153-
"CONTRIBUTING.rst",
154-
"blob/master/noxfile.py",
155-
"blob/main/noxfile.py",
156-
)
157-
158-
s.replace(
159-
"docs/conf.py",
160-
"master_doc",
161-
"root_doc",
162-
)
163-
164-
s.replace(
165-
"docs/conf.py",
166-
"# The master toctree document.",
167-
"# The root toctree document.",
168-
)
169-
170116
s.shell.run(["nox", "-s", "blacken"], hide_output=False)

‎packages/google-cloud-containeranalysis/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
3232
"grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
3333
"proto-plus >= 1.4.0",
34-
"grafeas >=1.0.0, <2.0dev",
34+
"grafeas >=1.4.1, <2.0dev",
3535
]
3636
extras = {"libcst": "libcst >= 0.2.5"}
3737

‎packages/google-cloud-containeranalysis/testing/constraints-3.6.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ google-api-core==1.28.0
99
grpc-google-iam-v1==0.12.3
1010
proto-plus==1.4.0
1111
libcst==0.2.5
12-
grafeas==1.0.0
12+
grafeas==1.4.1

0 commit comments

Comments
 (0)
0