From dc4057c763b891c533949dd6a022021afa80a2a0 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 2 Dec 2024 15:44:26 +0100 Subject: [PATCH 1/4] chore(deps): update gcr.io/cloud-spanner-emulator/emulator docker tag to v1.5.26 (#7867) --- .github/workflows/system-tests-spanner-emulator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/system-tests-spanner-emulator.yaml b/.github/workflows/system-tests-spanner-emulator.yaml index ffde133af921..80d1c1df70a4 100644 --- a/.github/workflows/system-tests-spanner-emulator.yaml +++ b/.github/workflows/system-tests-spanner-emulator.yaml @@ -18,7 +18,7 @@ jobs: services: emulator: - image: gcr.io/cloud-spanner-emulator/emulator:1.5.25 + image: gcr.io/cloud-spanner-emulator/emulator:1.5.26 ports: - 9010:9010 - 9020:9020 From 30475c53cee7e9ed90d4d541c0744ce246304e00 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 06:44:47 -0800 Subject: [PATCH 2/4] docs: challenge is also returned for INVISIBLE keys (#7866) PiperOrigin-RevId: 700933092 Source-Link: https://github.com/googleapis/googleapis/commit/072ae46e493035d1419caad40bccc1a4f1b977bf Source-Link: https://github.com/googleapis/googleapis-gen/commit/edb60149740467b710265c58a174358a3649611b Copy-Tag: eyJwIjoiUmVjYXB0Y2hhRW50ZXJwcmlzZS8uT3dsQm90LnlhbWwiLCJoIjoiZWRiNjAxNDk3NDA0NjdiNzEwMjY1YzU4YTE3NDM1OGEzNjQ5NjExYiJ9 --- .../src/V1/RemoveIpOverrideRequest.php | 2 +- RecaptchaEnterprise/src/V1/RiskAnalysis.php | 12 ++++++++---- .../src/V1/RiskAnalysis/Challenge.php | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/RecaptchaEnterprise/src/V1/RemoveIpOverrideRequest.php b/RecaptchaEnterprise/src/V1/RemoveIpOverrideRequest.php index c8a7dc776a8e..3123864f33a0 100644 --- a/RecaptchaEnterprise/src/V1/RemoveIpOverrideRequest.php +++ b/RecaptchaEnterprise/src/V1/RemoveIpOverrideRequest.php @@ -9,7 +9,7 @@ use Google\Protobuf\Internal\GPBUtil; /** - * The removeIpOverride request message. + * The RemoveIpOverride request message. * * Generated from protobuf message google.cloud.recaptchaenterprise.v1.RemoveIpOverrideRequest */ diff --git a/RecaptchaEnterprise/src/V1/RiskAnalysis.php b/RecaptchaEnterprise/src/V1/RiskAnalysis.php index 378bf2563756..fb934cc88e41 100644 --- a/RecaptchaEnterprise/src/V1/RiskAnalysis.php +++ b/RecaptchaEnterprise/src/V1/RiskAnalysis.php @@ -37,7 +37,8 @@ class RiskAnalysis extends \Google\Protobuf\Internal\Message */ private $extended_verdict_reasons; /** - * Output only. Challenge information for SCORE_AND_CHALLENGE keys + * Output only. Challenge information for SCORE_AND_CHALLENGE and INVISIBLE + * keys * * Generated from protobuf field .google.cloud.recaptchaenterprise.v1.RiskAnalysis.Challenge challenge = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; */ @@ -59,7 +60,8 @@ class RiskAnalysis extends \Google\Protobuf\Internal\Message * Output only. Extended verdict reasons to be used for experimentation only. * The set of possible reasons is subject to change. * @type int $challenge - * Output only. Challenge information for SCORE_AND_CHALLENGE keys + * Output only. Challenge information for SCORE_AND_CHALLENGE and INVISIBLE + * keys * } */ public function __construct($data = NULL) { @@ -152,7 +154,8 @@ public function setExtendedVerdictReasons($var) } /** - * Output only. Challenge information for SCORE_AND_CHALLENGE keys + * Output only. Challenge information for SCORE_AND_CHALLENGE and INVISIBLE + * keys * * Generated from protobuf field .google.cloud.recaptchaenterprise.v1.RiskAnalysis.Challenge challenge = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; * @return int @@ -163,7 +166,8 @@ public function getChallenge() } /** - * Output only. Challenge information for SCORE_AND_CHALLENGE keys + * Output only. Challenge information for SCORE_AND_CHALLENGE and INVISIBLE + * keys * * Generated from protobuf field .google.cloud.recaptchaenterprise.v1.RiskAnalysis.Challenge challenge = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; * @param int $var diff --git a/RecaptchaEnterprise/src/V1/RiskAnalysis/Challenge.php b/RecaptchaEnterprise/src/V1/RiskAnalysis/Challenge.php index 52ab37b3ff85..d61a1944dd0c 100644 --- a/RecaptchaEnterprise/src/V1/RiskAnalysis/Challenge.php +++ b/RecaptchaEnterprise/src/V1/RiskAnalysis/Challenge.php @@ -7,7 +7,7 @@ use UnexpectedValueException; /** - * Challenge information for SCORE_AND_CHALLENGE keys + * Challenge information for SCORE_AND_CHALLENGE and INVISIBLE keys * * Protobuf type google.cloud.recaptchaenterprise.v1.RiskAnalysis.Challenge */ From b6c51c9cc48b62fabdddcef09c36c63658cf9d83 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 06:45:22 -0800 Subject: [PATCH 3/4] feat: Add a token_type options proto to allow for customization of specific token types. Added the first token type option to hold principal tag token options (#7855) PiperOrigin-RevId: 700050491 Source-Link: https://github.com/googleapis/googleapis/commit/5afbbeb4cc5e89393d279a60bc36d73982229f52 Source-Link: https://github.com/googleapis/googleapis-gen/commit/856d7aed3fc290457da157473e91946e682ced7a Copy-Tag: eyJwIjoiQ29uZmlkZW50aWFsQ29tcHV0aW5nLy5Pd2xCb3QueWFtbCIsImgiOiI4NTZkN2FlZDNmYzI5MDQ1N2RhMTU3NDczZTkxOTQ2ZTY4MmNlZDdhIn0= --- ConfidentialComputing/metadata/V1/Service.php | Bin 4655 -> 5236 bytes ConfidentialComputing/src/V1/TokenOptions.php | 42 ++++++++++ .../TokenOptions/AwsPrincipalTagsOptions.php | 78 +++++++++++++++++ .../AllowedPrincipalTags.php | 79 ++++++++++++++++++ .../ContainerImageSignatures.php | 77 +++++++++++++++++ ConfidentialComputing/src/V1/TokenType.php | 7 ++ 6 files changed, 283 insertions(+) create mode 100644 ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions.php create mode 100644 ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags.php create mode 100644 ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags/ContainerImageSignatures.php diff --git a/ConfidentialComputing/metadata/V1/Service.php b/ConfidentialComputing/metadata/V1/Service.php index 2f60f23ea57e3771958ccb7f9ff441a464a9e086..f7c44e82795d471299f0c1c2195a16d1274d8811 100644 GIT binary patch delta 491 zcmZ3l@jl|*LcV9;P`+bPd{hR07st?NB3X>md)LK GOPB%h$)%S7 delta 57 zcmeyOv0i0^BQwilSuW#=-o~3Nm`m9NS{S)_Lh`dy^ZW}+GV}9_Czo=SZJx@rnwc?Y NvXem0<_iK#m;o$W6Sn{W diff --git a/ConfidentialComputing/src/V1/TokenOptions.php b/ConfidentialComputing/src/V1/TokenOptions.php index 486afd096578..875887325773 100644 --- a/ConfidentialComputing/src/V1/TokenOptions.php +++ b/ConfidentialComputing/src/V1/TokenOptions.php @@ -36,6 +36,7 @@ class TokenOptions extends \Google\Protobuf\Internal\Message * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenType token_type = 3 [(.google.api.field_behavior) = OPTIONAL]; */ protected $token_type = 0; + protected $token_type_options; /** * Constructor. @@ -43,6 +44,8 @@ class TokenOptions extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * + * @type \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions $aws_principal_tags_options + * Optional. Options for the Limited AWS token type. * @type string $audience * Optional. Optional string to issue the token with a custom audience claim. * Required if one or more nonces are specified. @@ -59,6 +62,37 @@ public function __construct($data = NULL) { parent::__construct($data); } + /** + * Optional. Options for the Limited AWS token type. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions aws_principal_tags_options = 4 [(.google.api.field_behavior) = OPTIONAL]; + * @return \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions|null + */ + public function getAwsPrincipalTagsOptions() + { + return $this->readOneof(4); + } + + public function hasAwsPrincipalTagsOptions() + { + return $this->hasOneof(4); + } + + /** + * Optional. Options for the Limited AWS token type. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions aws_principal_tags_options = 4 [(.google.api.field_behavior) = OPTIONAL]; + * @param \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions $var + * @return $this + */ + public function setAwsPrincipalTagsOptions($var) + { + GPBUtil::checkMessage($var, \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions::class); + $this->writeOneof(4, $var); + + return $this; + } + /** * Optional. Optional string to issue the token with a custom audience claim. * Required if one or more nonces are specified. @@ -143,5 +177,13 @@ public function setTokenType($var) return $this; } + /** + * @return string + */ + public function getTokenTypeOptions() + { + return $this->whichOneof("token_type_options"); + } + } diff --git a/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions.php b/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions.php new file mode 100644 index 000000000000..de689d56b049 --- /dev/null +++ b/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions.php @@ -0,0 +1,78 @@ +google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions + */ +class AwsPrincipalTagsOptions extends \Google\Protobuf\Internal\Message +{ + /** + * Optional. Principal tags to allow in the token. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags allowed_principal_tags = 1 [(.google.api.field_behavior) = OPTIONAL]; + */ + protected $allowed_principal_tags = null; + + /** + * Constructor. + * + * @param array $data { + * Optional. Data for populating the Message object. + * + * @type \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags $allowed_principal_tags + * Optional. Principal tags to allow in the token. + * } + */ + public function __construct($data = NULL) { + \GPBMetadata\Google\Cloud\Confidentialcomputing\V1\Service::initOnce(); + parent::__construct($data); + } + + /** + * Optional. Principal tags to allow in the token. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags allowed_principal_tags = 1 [(.google.api.field_behavior) = OPTIONAL]; + * @return \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags|null + */ + public function getAllowedPrincipalTags() + { + return $this->allowed_principal_tags; + } + + public function hasAllowedPrincipalTags() + { + return isset($this->allowed_principal_tags); + } + + public function clearAllowedPrincipalTags() + { + unset($this->allowed_principal_tags); + } + + /** + * Optional. Principal tags to allow in the token. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags allowed_principal_tags = 1 [(.google.api.field_behavior) = OPTIONAL]; + * @param \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags $var + * @return $this + */ + public function setAllowedPrincipalTags($var) + { + GPBUtil::checkMessage($var, \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags::class); + $this->allowed_principal_tags = $var; + + return $this; + } + +} + + diff --git a/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags.php b/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags.php new file mode 100644 index 000000000000..04c28cdabeff --- /dev/null +++ b/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags.php @@ -0,0 +1,79 @@ +google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags + */ +class AllowedPrincipalTags extends \Google\Protobuf\Internal\Message +{ + /** + * Optional. Container image signatures allowed in the token. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags.ContainerImageSignatures container_image_signatures = 1 [(.google.api.field_behavior) = OPTIONAL]; + */ + protected $container_image_signatures = null; + + /** + * Constructor. + * + * @param array $data { + * Optional. Data for populating the Message object. + * + * @type \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags\ContainerImageSignatures $container_image_signatures + * Optional. Container image signatures allowed in the token. + * } + */ + public function __construct($data = NULL) { + \GPBMetadata\Google\Cloud\Confidentialcomputing\V1\Service::initOnce(); + parent::__construct($data); + } + + /** + * Optional. Container image signatures allowed in the token. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags.ContainerImageSignatures container_image_signatures = 1 [(.google.api.field_behavior) = OPTIONAL]; + * @return \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags\ContainerImageSignatures|null + */ + public function getContainerImageSignatures() + { + return $this->container_image_signatures; + } + + public function hasContainerImageSignatures() + { + return isset($this->container_image_signatures); + } + + public function clearContainerImageSignatures() + { + unset($this->container_image_signatures); + } + + /** + * Optional. Container image signatures allowed in the token. + * + * Generated from protobuf field .google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags.ContainerImageSignatures container_image_signatures = 1 [(.google.api.field_behavior) = OPTIONAL]; + * @param \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags\ContainerImageSignatures $var + * @return $this + */ + public function setContainerImageSignatures($var) + { + GPBUtil::checkMessage($var, \Google\Cloud\ConfidentialComputing\V1\TokenOptions\AwsPrincipalTagsOptions\AllowedPrincipalTags\ContainerImageSignatures::class); + $this->container_image_signatures = $var; + + return $this; + } + +} + + diff --git a/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags/ContainerImageSignatures.php b/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags/ContainerImageSignatures.php new file mode 100644 index 000000000000..6b3eae1fd2e7 --- /dev/null +++ b/ConfidentialComputing/src/V1/TokenOptions/AwsPrincipalTagsOptions/AllowedPrincipalTags/ContainerImageSignatures.php @@ -0,0 +1,77 @@ +google.cloud.confidentialcomputing.v1.TokenOptions.AwsPrincipalTagsOptions.AllowedPrincipalTags.ContainerImageSignatures + */ +class ContainerImageSignatures extends \Google\Protobuf\Internal\Message +{ + /** + * 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. + * + * Generated from protobuf field repeated string key_ids = 1 [(.google.api.field_behavior) = OPTIONAL]; + */ + private $key_ids; + + /** + * Constructor. + * + * @param array $data { + * Optional. Data for populating the Message object. + * + * @type array|\Google\Protobuf\Internal\RepeatedField $key_ids + * 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. + * } + */ + public function __construct($data = NULL) { + \GPBMetadata\Google\Cloud\Confidentialcomputing\V1\Service::initOnce(); + parent::__construct($data); + } + + /** + * 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. + * + * Generated from protobuf field repeated string key_ids = 1 [(.google.api.field_behavior) = OPTIONAL]; + * @return \Google\Protobuf\Internal\RepeatedField + */ + public function getKeyIds() + { + return $this->key_ids; + } + + /** + * 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. + * + * Generated from protobuf field repeated string key_ids = 1 [(.google.api.field_behavior) = OPTIONAL]; + * @param array|\Google\Protobuf\Internal\RepeatedField $var + * @return $this + */ + public function setKeyIds($var) + { + $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING); + $this->key_ids = $arr; + + return $this; + } + +} + + diff --git a/ConfidentialComputing/src/V1/TokenType.php b/ConfidentialComputing/src/V1/TokenType.php index d67ad7c7c78c..5e6637b6bd84 100644 --- a/ConfidentialComputing/src/V1/TokenType.php +++ b/ConfidentialComputing/src/V1/TokenType.php @@ -38,12 +38,19 @@ class TokenType * Generated from protobuf enum TOKEN_TYPE_LIMITED_AWS = 3; */ const TOKEN_TYPE_LIMITED_AWS = 3; + /** + * Principal-tag-based token for AWS integration + * + * Generated from protobuf enum TOKEN_TYPE_AWS_PRINCIPALTAGS = 4; + */ + const TOKEN_TYPE_AWS_PRINCIPALTAGS = 4; private static $valueToName = [ self::TOKEN_TYPE_UNSPECIFIED => 'TOKEN_TYPE_UNSPECIFIED', self::TOKEN_TYPE_OIDC => 'TOKEN_TYPE_OIDC', self::TOKEN_TYPE_PKI => 'TOKEN_TYPE_PKI', self::TOKEN_TYPE_LIMITED_AWS => 'TOKEN_TYPE_LIMITED_AWS', + self::TOKEN_TYPE_AWS_PRINCIPALTAGS => 'TOKEN_TYPE_AWS_PRINCIPALTAGS', ]; public static function name($value) From c3b053fca639f285bc0bfdf4043d66aac2fb0abf Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 06:45:45 -0800 Subject: [PATCH 4/4] feat: add new `Status` field to DeployedModel in Endpoint (#7865) feat: add new `RequiredReplicaCount` field to DedicatedResources in MachineResources PiperOrigin-RevId: 700839591 Source-Link: https://github.com/googleapis/googleapis/commit/3ea76408f8b6580d460cddde23c9352aa071040a Source-Link: https://github.com/googleapis/googleapis-gen/commit/4569feed758f28e1e49a86abb0ebc5b38132b569 Copy-Tag: eyJwIjoiQWlQbGF0Zm9ybS8uT3dsQm90LnlhbWwiLCJoIjoiNDU2OWZlZWQ3NThmMjhlMWU0OWE4NmFiYjBlYmM1YjM4MTMyYjU2OSJ9 --- AiPlatform/metadata/V1/Endpoint.php | Bin 4578 -> 4778 bytes AiPlatform/metadata/V1/MachineResources.php | 7 +- AiPlatform/src/V1/DedicatedResources.php | 54 ++++++++ AiPlatform/src/V1/DeployedModel.php | 44 ++++++ AiPlatform/src/V1/DeployedModel/Status.php | 146 ++++++++++++++++++++ 5 files changed, 248 insertions(+), 3 deletions(-) create mode 100644 AiPlatform/src/V1/DeployedModel/Status.php diff --git a/AiPlatform/metadata/V1/Endpoint.php b/AiPlatform/metadata/V1/Endpoint.php index 7656844790d0f27815bfb87618ffce80676894f2..cbcb49763cfa0a212a186b02cfe9c4cd9534617c 100644 GIT binary patch delta 167 zcmaE)yh?S0B@4?^87|Gq7g=OBN3wipV`}8w9Kv-v_z>$%v1!9qeJT)7g=OBN3wipW7^5SIfz?|dGcnykj)+ZO3VNRO$>(s diff --git a/AiPlatform/metadata/V1/MachineResources.php b/AiPlatform/metadata/V1/MachineResources.php index 30228054f736..6d83334475ae 100644 --- a/AiPlatform/metadata/V1/MachineResources.php +++ b/AiPlatform/metadata/V1/MachineResources.php @@ -19,18 +19,19 @@ public static function initOnce() { \GPBMetadata\Google\Cloud\Aiplatform\V1\ReservationAffinity::initOnce(); $pool->internalAddGeneratedFile( ' - + 2google/cloud/aiplatform/v1/machine_resources.protogoogle.cloud.aiplatform.v11google/cloud/aiplatform/v1/accelerator_type.proto5google/cloud/aiplatform/v1/reservation_affinity.proto" MachineSpec machine_type ( BAJ accelerator_type (2+.google.cloud.aiplatform.v1.AcceleratorTypeBA accelerator_count ( tpu_topology ( BAU -reservation_affinity ( 2/.google.cloud.aiplatform.v1.ReservationAffinityBAA" +reservation_affinity ( 2/.google.cloud.aiplatform.v1.ReservationAffinityBAA" DedicatedResourcesE machine_spec ( 2\'.google.cloud.aiplatform.v1.MachineSpecBAA! min_replica_count (BAA -max_replica_count (BAX +max_replica_count (BA# +required_replica_count (BAX autoscaling_metric_specs ( 21.google.cloud.aiplatform.v1.AutoscalingMetricSpecBA spot (BA"T AutomaticResources diff --git a/AiPlatform/src/V1/DedicatedResources.php b/AiPlatform/src/V1/DedicatedResources.php index 9e4bbc97a1f2..8dc7bf512443 100644 --- a/AiPlatform/src/V1/DedicatedResources.php +++ b/AiPlatform/src/V1/DedicatedResources.php @@ -52,6 +52,17 @@ class DedicatedResources extends \Google\Protobuf\Internal\Message * Generated from protobuf field int32 max_replica_count = 3 [(.google.api.field_behavior) = IMMUTABLE]; */ protected $max_replica_count = 0; + /** + * Optional. Number of required available replicas for the deployment to + * succeed. This field is only needed when partial model deployment/mutation + * is desired. If set, the model deploy/mutate operation will succeed once + * available_replica_count reaches required_replica_count, and the rest of + * the replicas will be retried. If not set, the default + * required_replica_count will be min_replica_count. + * + * Generated from protobuf field int32 required_replica_count = 9 [(.google.api.field_behavior) = OPTIONAL]; + */ + protected $required_replica_count = 0; /** * Immutable. The metric specifications that overrides a resource * utilization metric (CPU utilization, accelerator's duty cycle, and so on) @@ -115,6 +126,13 @@ class DedicatedResources extends \Google\Protobuf\Internal\Message * quotas. Specifically, you will be charged for (max_replica_count * * number of cores in the selected machine type) and (max_replica_count * * number of GPUs per replica in the selected machine type). + * @type int $required_replica_count + * Optional. Number of required available replicas for the deployment to + * succeed. This field is only needed when partial model deployment/mutation + * is desired. If set, the model deploy/mutate operation will succeed once + * available_replica_count reaches required_replica_count, and the rest of + * the replicas will be retried. If not set, the default + * required_replica_count will be min_replica_count. * @type array<\Google\Cloud\AIPlatform\V1\AutoscalingMetricSpec>|\Google\Protobuf\Internal\RepeatedField $autoscaling_metric_specs * Immutable. The metric specifications that overrides a resource * utilization metric (CPU utilization, accelerator's duty cycle, and so on) @@ -270,6 +288,42 @@ public function setMaxReplicaCount($var) return $this; } + /** + * Optional. Number of required available replicas for the deployment to + * succeed. This field is only needed when partial model deployment/mutation + * is desired. If set, the model deploy/mutate operation will succeed once + * available_replica_count reaches required_replica_count, and the rest of + * the replicas will be retried. If not set, the default + * required_replica_count will be min_replica_count. + * + * Generated from protobuf field int32 required_replica_count = 9 [(.google.api.field_behavior) = OPTIONAL]; + * @return int + */ + public function getRequiredReplicaCount() + { + return $this->required_replica_count; + } + + /** + * Optional. Number of required available replicas for the deployment to + * succeed. This field is only needed when partial model deployment/mutation + * is desired. If set, the model deploy/mutate operation will succeed once + * available_replica_count reaches required_replica_count, and the rest of + * the replicas will be retried. If not set, the default + * required_replica_count will be min_replica_count. + * + * Generated from protobuf field int32 required_replica_count = 9 [(.google.api.field_behavior) = OPTIONAL]; + * @param int $var + * @return $this + */ + public function setRequiredReplicaCount($var) + { + GPBUtil::checkInt32($var); + $this->required_replica_count = $var; + + return $this; + } + /** * Immutable. The metric specifications that overrides a resource * utilization metric (CPU utilization, accelerator's duty cycle, and so on) diff --git a/AiPlatform/src/V1/DeployedModel.php b/AiPlatform/src/V1/DeployedModel.php index 2d30eb47c1bd..3f33119f03f8 100644 --- a/AiPlatform/src/V1/DeployedModel.php +++ b/AiPlatform/src/V1/DeployedModel.php @@ -136,6 +136,12 @@ class DeployedModel extends \Google\Protobuf\Internal\Message * Generated from protobuf field .google.cloud.aiplatform.v1.FasterDeploymentConfig faster_deployment_config = 23; */ protected $faster_deployment_config = null; + /** + * Output only. Runtime status of the deployed model. + * + * Generated from protobuf field .google.cloud.aiplatform.v1.DeployedModel.Status status = 26 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $status = null; /** * System labels to apply to Model Garden deployments. * System labels are managed by Google for internal use only. @@ -234,6 +240,8 @@ class DeployedModel extends \Google\Protobuf\Internal\Message * [network][google.cloud.aiplatform.v1.Endpoint.network] is configured. * @type \Google\Cloud\AIPlatform\V1\FasterDeploymentConfig $faster_deployment_config * Configuration for faster model deployment. + * @type \Google\Cloud\AIPlatform\V1\DeployedModel\Status $status + * Output only. Runtime status of the deployed model. * @type array|\Google\Protobuf\Internal\MapField $system_labels * System labels to apply to Model Garden deployments. * System labels are managed by Google for internal use only. @@ -795,6 +803,42 @@ public function setFasterDeploymentConfig($var) return $this; } + /** + * Output only. Runtime status of the deployed model. + * + * Generated from protobuf field .google.cloud.aiplatform.v1.DeployedModel.Status status = 26 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return \Google\Cloud\AIPlatform\V1\DeployedModel\Status|null + */ + public function getStatus() + { + return $this->status; + } + + public function hasStatus() + { + return isset($this->status); + } + + public function clearStatus() + { + unset($this->status); + } + + /** + * Output only. Runtime status of the deployed model. + * + * Generated from protobuf field .google.cloud.aiplatform.v1.DeployedModel.Status status = 26 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param \Google\Cloud\AIPlatform\V1\DeployedModel\Status $var + * @return $this + */ + public function setStatus($var) + { + GPBUtil::checkMessage($var, \Google\Cloud\AIPlatform\V1\DeployedModel\Status::class); + $this->status = $var; + + return $this; + } + /** * System labels to apply to Model Garden deployments. * System labels are managed by Google for internal use only. diff --git a/AiPlatform/src/V1/DeployedModel/Status.php b/AiPlatform/src/V1/DeployedModel/Status.php new file mode 100644 index 000000000000..67ad644fe40d --- /dev/null +++ b/AiPlatform/src/V1/DeployedModel/Status.php @@ -0,0 +1,146 @@ +google.cloud.aiplatform.v1.DeployedModel.Status + */ +class Status extends \Google\Protobuf\Internal\Message +{ + /** + * Output only. The latest deployed model's status message (if any). + * + * Generated from protobuf field string message = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $message = ''; + /** + * Output only. The time at which the status was last updated. + * + * Generated from protobuf field .google.protobuf.Timestamp last_update_time = 2 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $last_update_time = null; + /** + * Output only. The number of available replicas of the deployed model. + * + * Generated from protobuf field int32 available_replica_count = 3 [(.google.api.field_behavior) = OUTPUT_ONLY]; + */ + protected $available_replica_count = 0; + + /** + * Constructor. + * + * @param array $data { + * Optional. Data for populating the Message object. + * + * @type string $message + * Output only. The latest deployed model's status message (if any). + * @type \Google\Protobuf\Timestamp $last_update_time + * Output only. The time at which the status was last updated. + * @type int $available_replica_count + * Output only. The number of available replicas of the deployed model. + * } + */ + public function __construct($data = NULL) { + \GPBMetadata\Google\Cloud\Aiplatform\V1\Endpoint::initOnce(); + parent::__construct($data); + } + + /** + * Output only. The latest deployed model's status message (if any). + * + * Generated from protobuf field string message = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return string + */ + public function getMessage() + { + return $this->message; + } + + /** + * Output only. The latest deployed model's status message (if any). + * + * Generated from protobuf field string message = 1 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param string $var + * @return $this + */ + public function setMessage($var) + { + GPBUtil::checkString($var, True); + $this->message = $var; + + return $this; + } + + /** + * Output only. The time at which the status was last updated. + * + * Generated from protobuf field .google.protobuf.Timestamp last_update_time = 2 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return \Google\Protobuf\Timestamp|null + */ + public function getLastUpdateTime() + { + return $this->last_update_time; + } + + public function hasLastUpdateTime() + { + return isset($this->last_update_time); + } + + public function clearLastUpdateTime() + { + unset($this->last_update_time); + } + + /** + * Output only. The time at which the status was last updated. + * + * Generated from protobuf field .google.protobuf.Timestamp last_update_time = 2 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param \Google\Protobuf\Timestamp $var + * @return $this + */ + public function setLastUpdateTime($var) + { + GPBUtil::checkMessage($var, \Google\Protobuf\Timestamp::class); + $this->last_update_time = $var; + + return $this; + } + + /** + * Output only. The number of available replicas of the deployed model. + * + * Generated from protobuf field int32 available_replica_count = 3 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @return int + */ + public function getAvailableReplicaCount() + { + return $this->available_replica_count; + } + + /** + * Output only. The number of available replicas of the deployed model. + * + * Generated from protobuf field int32 available_replica_count = 3 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * @param int $var + * @return $this + */ + public function setAvailableReplicaCount($var) + { + GPBUtil::checkInt32($var); + $this->available_replica_count = $var; + + return $this; + } + +} + +