Skip to content

Commit

Permalink
Merge branch 'owlbot-bootstrapper-initial-PR-0e66115032d8' of https:/…
Browse files Browse the repository at this point in the history
…/github.com/googleapis/google-cloud-python into owlbot-bootstrapper-initial-PR-0e66115032d8
  • Loading branch information
gcf-owl-bot[bot] committed Nov 26, 2024
2 parents b28fd87 + 7ff4a62 commit 05c418d
Show file tree
Hide file tree
Showing 9 changed files with 216 additions and 151 deletions.
272 changes: 136 additions & 136 deletions CHANGELOG.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = "0.4.13" # {x-release-please-version}
__version__ = "0.0.0" # {x-release-please-version}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = "0.4.13" # {x-release-please-version}
__version__ = "0.0.0" # {x-release-please-version}
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,14 @@ class TokenType(proto.Enum):
Public Key Infrastructure (PKI) token type
TOKEN_TYPE_LIMITED_AWS (3):
Limited claim token type for AWS integration
TOKEN_TYPE_AWS_PRINCIPALTAGS (4):
Principal-tag-based token for AWS integration
"""
TOKEN_TYPE_UNSPECIFIED = 0
TOKEN_TYPE_OIDC = 1
TOKEN_TYPE_PKI = 2
TOKEN_TYPE_LIMITED_AWS = 3
TOKEN_TYPE_AWS_PRINCIPALTAGS = 4


class Challenge(proto.Message):
Expand Down Expand Up @@ -347,7 +350,15 @@ class TokenOptions(proto.Message):
r"""Options to modify claims in the token to generate
custom-purpose tokens.
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
Attributes:
aws_principal_tags_options (google.cloud.confidentialcomputing_v1.types.TokenOptions.AwsPrincipalTagsOptions):
Optional. Options for the Limited AWS token
type.
This field is a member of `oneof`_ ``token_type_options``.
audience (str):
Optional. Optional string to issue the token
with a custom audience claim. Required if one or
Expand All @@ -362,6 +373,62 @@ class TokenOptions(proto.Message):
type of token to return.
"""

class AwsPrincipalTagsOptions(proto.Message):
r"""Token options that only apply to the AWS Principal Tags token
type.
Attributes:
allowed_principal_tags (google.cloud.confidentialcomputing_v1.types.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags):
Optional. Principal tags to allow in the
token.
"""

class AllowedPrincipalTags(proto.Message):
r"""Allowed principal tags is used to define what principal tags
will be placed in the token.
Attributes:
container_image_signatures (google.cloud.confidentialcomputing_v1.types.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags.ContainerImageSignatures):
Optional. Container image signatures allowed
in the token.
"""

class ContainerImageSignatures(proto.Message):
r"""Allowed Container Image Signatures. Key IDs are required to
allow this claim to fit within the narrow AWS IAM restrictions.
Attributes:
key_ids (MutableSequence[str]):
Optional. List of key ids to filter into the
Principal tags. Only keys that have been
validated and added to the token will be
filtered into principal tags. Unrecognized key
ids will be ignored.
"""

key_ids: MutableSequence[str] = proto.RepeatedField(
proto.STRING,
number=1,
)

container_image_signatures: "TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags.ContainerImageSignatures" = proto.Field(
proto.MESSAGE,
number=1,
message="TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags.ContainerImageSignatures",
)

allowed_principal_tags: "TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags" = proto.Field(
proto.MESSAGE,
number=1,
message="TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags",
)

aws_principal_tags_options: AwsPrincipalTagsOptions = proto.Field(
proto.MESSAGE,
number=4,
oneof="token_type_options",
message=AwsPrincipalTagsOptions,
)
audience: str = proto.Field(
proto.STRING,
number=1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-cloud-confidentialcomputing",
"version": "0.4.13"
"version": "0.1.0"
},
"snippets": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = "2.4.1" # {x-release-please-version}
__version__ = "0.0.0" # {x-release-please-version}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
__version__ = "2.4.1" # {x-release-please-version}
__version__ = "0.0.0" # {x-release-please-version}
Original file line number Diff line number Diff line change
Expand Up @@ -3442,10 +3442,10 @@ class Release(proto.Message):
update and delete requests to ensure the client
has an up-to-date value before proceeding.
skaffold_version (str):
Optional. The Skaffold version to use when
operating on this release, such as "1.20.0". Not
all versions are valid; Cloud Deploy supports a
specific set of versions.
The Skaffold version to use when operating on
this release, such as "1.20.0". Not all versions
are valid; Cloud Deploy supports a specific set
of versions.
If unset, the most recent supported Skaffold
version will be used.
Expand Down Expand Up @@ -5405,11 +5405,9 @@ class OperationMetadata(proto.Message):
requested_cancellation (bool):
Output only. Identifies whether the user has requested
cancellation of the operation. Operations that have
successfully been cancelled have
[google.longrunning.Operation.error][google.longrunning.Operation.error]
value with a
[google.rpc.Status.code][google.rpc.Status.code] of 1,
corresponding to ``Code.CANCELLED``.
successfully been cancelled have [Operation.error][] value
with a [google.rpc.Status.code][google.rpc.Status.code] of
1, corresponding to ``Code.CANCELLED``.
api_version (str):
Output only. API version used to start the
operation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-cloud-deploy",
"version": "2.4.1"
"version": "0.1.0"
},
"snippets": [
{
Expand Down

0 comments on commit 05c418d

Please sign in to comment.