From 499b94d9c190be5d363fffd60bfead7def349c65 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Fri, 21 Aug 2026 18:22:33 +0000 Subject: [PATCH 1/5] chore: update owlbot.py --- OsLogin/owlbot.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OsLogin/owlbot.py b/OsLogin/owlbot.py index ee8d3ef0a174..7d3128f2b59a 100644 --- a/OsLogin/owlbot.py +++ b/OsLogin/owlbot.py @@ -30,6 +30,13 @@ # Added so that we can pass copy_excludes in the owlbot_main() call _tracked_paths.add(src) +# copy "common" protos +php.owlbot_copy_version( + src=src / "common-protos", + dest=dest, + version_string="common", +) + php.owlbot_main(src=src, dest=dest) # format generated clients From a0c7ce7eb117d08d71786de4a131ed3c3c747f3a Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Sun, 23 Aug 2026 00:18:55 +0000 Subject: [PATCH 2/5] update library --- OsLogin/metadata/Common/Common.php | Bin 1639 -> 2217 bytes OsLogin/metadata/V1/Oslogin.php | 51 +----------------- OsLogin/owlbot.py | 25 ++++++--- OsLogin/src/Common/PosixAccount.php | 2 +- OsLogin/src/Common/SshPublicKey.php | 14 ++--- OsLogin/src/V1/CreateSshPublicKeyRequest.php | 2 +- OsLogin/src/V1/DeletePosixAccountRequest.php | 2 +- OsLogin/src/V1/DeleteSshPublicKeyRequest.php | 2 +- OsLogin/src/V1/GetLoginProfileRequest.php | 2 +- OsLogin/src/V1/GetSshPublicKeyRequest.php | 2 +- OsLogin/src/V1/ImportSshPublicKeyRequest.php | 8 +-- OsLogin/src/V1/ImportSshPublicKeyResponse.php | 2 +- OsLogin/src/V1/LoginProfile.php | 8 +-- OsLogin/src/V1/UpdateSshPublicKeyRequest.php | 2 +- 14 files changed, 40 insertions(+), 82 deletions(-) diff --git a/OsLogin/metadata/Common/Common.php b/OsLogin/metadata/Common/Common.php index 58e5d425988ea0d4b0b5b1d94b5cba370ed0c736..012990fbfd524ad955ed52b2d4df9d6a30ae4e71 100644 GIT binary patch literal 2217 zcma)7{g2`{5dA%Wh3}&h*N;G!{UY0Km4tv$?+990U9XCSLNMTKh@;r4*q->`J7YV6 zWtUTtATfC}^Ze$;^Xu=$rm)_TAWW zGFc`viH9ma4lq8BbbK7B_&du=vqT7@m)19nz^AAd8B2+fiG<60Cgv<>k|i1Y7xr;a zR!Jr(gucYCsyvm9=L7?yJf*DMAC@hF$H%#$qcQ<0Xeki47# z)OFWXHUi>5tq-OwreiD8(i~m)1<89N%ZeUXC#0mZD)T$V8x!oCyZ9Boyn@98Mzf_) zH_1PYm#%x*)gj5b&XH!GsI8^U{=8xzrUp zNDZIe6eZgxj}EHI1XHn@s1xfCiakY}Hs1ML{q@|6rp*p|8WK5|bXPFcjpuX8z#&jN zHSIju(l}1p8q51D(3zItcl8oriGw{)q|mHhmG9uzlNk3w$)|dIPQKHfx1MPyj&uP5 zkNEC?oSD6M&oui7eEueygb&_qG#<{UU#7G0(|q=263!pT(@7YN2BQ#O6bD~u_$t{! zS>?*BkE8M9pXMR-=~+*1K99!z==0P(zJOj0Fp24>GXP_J&!5=aAQB&O45|t8*QGw! zYEOf&*8KHBSuF1KsaGuGori5iTl+&bA#F7wZIjv#)P#g%_XHN3NeZJ>ae%c!hBY$O z30+rZbX|jlb%XSN(powGnOEZx{BM*Cj@t^vJJ;|sNZx(hOo^ZMv^yG(X9uG~>hZO= H_LlV@wo>Ru delta 593 zcmY*WO^ee&7&eopN#16=?f9{&kyh%;DhmpFtEbdODV9yKF6*HZvgw!xlT64Yutj8l z#9Rf>3W8oed-CER@Ze48$zLE&(yicWcpm0`pO5!_`Zh%~bb5j;T zETaYL+>l+vlpE7fzR=5p1Te6(QuGpki)DD2R zc2shD$qnV7wu~LPOjDA1d6)$5`Bc74i3#FQlfSLq>)>}Lb z1EqJ?|001gWs6C15{3Q~vMiIlBJ0#Tz6O`bX&RO~G;#A#gc2?IRRc0Mq484alT1{V zr_BPUGA8TsxbY(kmgR+PQVR9#+G>C}DyNb5;pFA(>`zBm;HsPjKBhN%Md=vQB zdcW7YfOSyDqr;=;ElJo_k4J|G&hfN`hQB4~@du(!gS+Zb{(vn0QMGozA?tCaH=8|- zXfdD795ya(2u$OcCM(qCf7GtBviHH_+scl0ByNq3^5X37>+*SXQcp9Q)BAgzXa|1* DdFr0i diff --git a/OsLogin/metadata/V1/Oslogin.php b/OsLogin/metadata/V1/Oslogin.php index 8c82c08fb98d..2bf0c3bc7254 100644 --- a/OsLogin/metadata/V1/Oslogin.php +++ b/OsLogin/metadata/V1/Oslogin.php @@ -22,56 +22,7 @@ public static function initOnce() { \GPBMetadata\Google\Protobuf\GPBEmpty::initOnce(); \GPBMetadata\Google\Protobuf\FieldMask::initOnce(); $pool->internalAddGeneratedFile( - ' -’ -%google/cloud/oslogin/v1/oslogin.protogoogle.cloud.oslogin.v1google/api/client.protogoogle/api/field_behavior.protogoogle/api/resource.proto(google/cloud/oslogin/common/common.protogoogle/protobuf/empty.proto google/protobuf/field_mask.proto"˜ - LoginProfile -name ( BàAA -posix_accounts ( 2).google.cloud.oslogin.common.PosixAccountQ -ssh_public_keys ( 28.google.cloud.oslogin.v1.LoginProfile.SshPublicKeysEntry_ -SshPublicKeysEntry -key ( 8 -value ( 2).google.cloud.oslogin.common.SshPublicKey:8"  -CreateSshPublicKeyRequest; -parent ( B+àAúA%#oslogin.googleapis.com/SshPublicKeyF -ssh_public_key ( 2).google.cloud.oslogin.common.SshPublicKeyBàA"V -DeletePosixAccountRequest9 -name ( B+àAúA% -#oslogin.googleapis.com/PosixAccount"V -DeleteSshPublicKeyRequest9 -name ( B+àAúA% -#oslogin.googleapis.com/SshPublicKey"z -GetLoginProfileRequest9 -name ( B+àAúA%#oslogin.googleapis.com/PosixAccount - -project_id (  - system_id ( "S -GetSshPublicKeyRequest9 -name ( B+àAúA% -#oslogin.googleapis.com/SshPublicKey"Ê -ImportSshPublicKeyRequest; -parent ( B+àAúA%#oslogin.googleapis.com/SshPublicKeyF -ssh_public_key ( 2).google.cloud.oslogin.common.SshPublicKeyBàA - -project_id (  -regions ( BàA"k -ImportSshPublicKeyResponse< - login_profile ( 2%.google.cloud.oslogin.v1.LoginProfile -details ( "Ï -UpdateSshPublicKeyRequest9 -name ( B+àAúA% -#oslogin.googleapis.com/SshPublicKeyF -ssh_public_key ( 2).google.cloud.oslogin.common.SshPublicKeyBàA/ - update_mask ( 2.google.protobuf.FieldMask2† -OsLoginServiceÇ -CreateSshPublicKey2.google.cloud.oslogin.v1.CreateSshPublicKeyRequest).google.cloud.oslogin.common.SshPublicKey"RÚAparent,ssh_public_key‚Óä“4""/v1/{parent=users/*}/sshPublicKeys:ssh_public_keyŽ -DeletePosixAccount2.google.cloud.oslogin.v1.DeletePosixAccountRequest.google.protobuf.Empty",ÚAname‚Óä“*/v1/{name=users/*/projects/*}“ -DeleteSshPublicKey2.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest.google.protobuf.Empty"1ÚAname‚Óä“$*"/v1/{name=users/*/sshPublicKeys/*}™ -GetLoginProfile/.google.cloud.oslogin.v1.GetLoginProfileRequest%.google.cloud.oslogin.v1.LoginProfile".ÚAname‚Óä“!/v1/{name=users/*}/loginProfile  -GetSshPublicKey/.google.cloud.oslogin.v1.GetSshPublicKeyRequest).google.cloud.oslogin.common.SshPublicKey"1ÚAname‚Óä“$"/v1/{name=users/*/sshPublicKeys/*}ù -ImportSshPublicKey2.google.cloud.oslogin.v1.ImportSshPublicKeyRequest3.google.cloud.oslogin.v1.ImportSshPublicKeyResponse"zÚAparent,ssh_public_keyÚA parent,ssh_public_key,project_id‚Óä“9"\'/v1/{parent=users/*}:importSshPublicKey:ssh_public_keyç -UpdateSshPublicKey2.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest).google.cloud.oslogin.common.SshPublicKey"rÚAname,ssh_public_keyÚAname,ssh_public_key,update_mask‚Óä“42"/v1/{name=users/*/sshPublicKeys/*}:ssh_public_keyÝÊAoslogin.googleapis.comÒAÀhttps://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/cloud-platform.read-only,https://www.googleapis.com/auth/compute,https://www.googleapis.com/auth/compute.readonlyBµ -com.google.cloud.oslogin.v1B OsLoginProtoPZ5cloud.google.com/go/oslogin/apiv1/osloginpb;osloginpbªGoogle.Cloud.OsLogin.V1ÊGoogle\\Cloud\\OsLogin\\V1êGoogle::Cloud::OsLogin::V1bproto3' + "\x0A\x92\x1A\x0A%google/cloud/oslogin/v1/oslogin.proto\x12\x17google.cloud.oslogin.v1\x1A\x17google/api/client.proto\x1A\x1Fgoogle/api/field_behavior.proto\x1A\x19google/api/resource.proto\x1A(google/cloud/oslogin/common/common.proto\x1A\x1Bgoogle/protobuf/empty.proto\x1A google/protobuf/field_mask.proto\"\x98\x02\x0A\x0CLoginProfile\x12\x11\x0A\x04name\x18\x01 \x01(\x09B\x03\xE0A\x02\x12A\x0A\x0Eposix_accounts\x18\x02 \x03(\x0B2).google.cloud.oslogin.common.PosixAccount\x12Q\x0A\x0Fssh_public_keys\x18\x03 \x03(\x0B28.google.cloud.oslogin.v1.LoginProfile.SshPublicKeysEntry\x1A_\x0A\x12SshPublicKeysEntry\x12\x0B\x0A\x03key\x18\x01 \x01(\x09\x128\x0A\x05value\x18\x02 \x01(\x0B2).google.cloud.oslogin.common.SshPublicKey:\x028\x01\"\xA0\x01\x0A\x19CreateSshPublicKeyRequest\x12;\x0A\x06parent\x18\x01 \x01(\x09B+\xE0A\x02\xFAA%\x12#oslogin.googleapis.com/SshPublicKey\x12F\x0A\x0Essh_public_key\x18\x02 \x01(\x0B2).google.cloud.oslogin.common.SshPublicKeyB\x03\xE0A\x02\"V\x0A\x19DeletePosixAccountRequest\x129\x0A\x04name\x18\x01 \x01(\x09B+\xE0A\x02\xFAA%\x0A#oslogin.googleapis.com/PosixAccount\"V\x0A\x19DeleteSshPublicKeyRequest\x129\x0A\x04name\x18\x01 \x01(\x09B+\xE0A\x02\xFAA%\x0A#oslogin.googleapis.com/SshPublicKey\"z\x0A\x16GetLoginProfileRequest\x129\x0A\x04name\x18\x01 \x01(\x09B+\xE0A\x02\xFAA%\x12#oslogin.googleapis.com/PosixAccount\x12\x12\x0A\x0Aproject_id\x18\x02 \x01(\x09\x12\x11\x0A\x09system_id\x18\x03 \x01(\x09\"S\x0A\x16GetSshPublicKeyRequest\x129\x0A\x04name\x18\x01 \x01(\x09B+\xE0A\x02\xFAA%\x0A#oslogin.googleapis.com/SshPublicKey\"\xCA\x01\x0A\x19ImportSshPublicKeyRequest\x12;\x0A\x06parent\x18\x01 \x01(\x09B+\xE0A\x02\xFAA%\x12#oslogin.googleapis.com/SshPublicKey\x12F\x0A\x0Essh_public_key\x18\x02 \x01(\x0B2).google.cloud.oslogin.common.SshPublicKeyB\x03\xE0A\x01\x12\x12\x0A\x0Aproject_id\x18\x03 \x01(\x09\x12\x14\x0A\x07regions\x18\x05 \x03(\x09B\x03\xE0A\x01\"k\x0A\x1AImportSshPublicKeyResponse\x12<\x0A\x0Dlogin_profile\x18\x01 \x01(\x0B2%.google.cloud.oslogin.v1.LoginProfile\x12\x0F\x0A\x07details\x18\x02 \x01(\x09\"\xCF\x01\x0A\x19UpdateSshPublicKeyRequest\x129\x0A\x04name\x18\x01 \x01(\x09B+\xE0A\x02\xFAA%\x0A#oslogin.googleapis.com/SshPublicKey\x12F\x0A\x0Essh_public_key\x18\x02 \x01(\x0B2).google.cloud.oslogin.common.SshPublicKeyB\x03\xE0A\x02\x12/\x0A\x0Bupdate_mask\x18\x03 \x01(\x0B2\x1A.google.protobuf.FieldMask2\x86\x0C\x0A\x0EOsLoginService\x12\xC7\x01\x0A\x12CreateSshPublicKey\x122.google.cloud.oslogin.v1.CreateSshPublicKeyRequest\x1A).google.cloud.oslogin.common.SshPublicKey\"R\xDAA\x15parent,ssh_public_key\x82\xD3\xE4\x93\x024\"\"/v1/{parent=users/*}/sshPublicKeys:\x0Essh_public_key\x12\x8E\x01\x0A\x12DeletePosixAccount\x122.google.cloud.oslogin.v1.DeletePosixAccountRequest\x1A\x16.google.protobuf.Empty\",\xDAA\x04name\x82\xD3\xE4\x93\x02\x1F*\x1D/v1/{name=users/*/projects/*}\x12\x93\x01\x0A\x12DeleteSshPublicKey\x122.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest\x1A\x16.google.protobuf.Empty\"1\xDAA\x04name\x82\xD3\xE4\x93\x02\$*\"/v1/{name=users/*/sshPublicKeys/*}\x12\x99\x01\x0A\x0FGetLoginProfile\x12/.google.cloud.oslogin.v1.GetLoginProfileRequest\x1A%.google.cloud.oslogin.v1.LoginProfile\".\xDAA\x04name\x82\xD3\xE4\x93\x02!\x12\x1F/v1/{name=users/*}/loginProfile\x12\xA0\x01\x0A\x0FGetSshPublicKey\x12/.google.cloud.oslogin.v1.GetSshPublicKeyRequest\x1A).google.cloud.oslogin.common.SshPublicKey\"1\xDAA\x04name\x82\xD3\xE4\x93\x02\$\x12\"/v1/{name=users/*/sshPublicKeys/*}\x12\xF9\x01\x0A\x12ImportSshPublicKey\x122.google.cloud.oslogin.v1.ImportSshPublicKeyRequest\x1A3.google.cloud.oslogin.v1.ImportSshPublicKeyResponse\"z\xDAA\x15parent,ssh_public_key\xDAA parent,ssh_public_key,project_id\x82\xD3\xE4\x93\x029\"'/v1/{parent=users/*}:importSshPublicKey:\x0Essh_public_key\x12\xE7\x01\x0A\x12UpdateSshPublicKey\x122.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest\x1A).google.cloud.oslogin.common.SshPublicKey\"r\xDAA\x13name,ssh_public_key\xDAA\x1Fname,ssh_public_key,update_mask\x82\xD3\xE4\x93\x0242\"/v1/{name=users/*/sshPublicKeys/*}:\x0Essh_public_key\x1A\xDD\x01\xCAA\x16oslogin.googleapis.com\xD2A\xC0\x01https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/cloud-platform.read-only,https://www.googleapis.com/auth/compute,https://www.googleapis.com/auth/compute.readonlyB\xB5\x01\x0A\x1Bcom.google.cloud.oslogin.v1B\x0COsLoginProtoP\x01Z5cloud.google.com/go/oslogin/apiv1/osloginpb;osloginpb\xAA\x02\x17Google.Cloud.OsLogin.V1\xCA\x02\x17Google\\Cloud\\OsLogin\\V1\xEA\x02\x1AGoogle::Cloud::OsLogin::V1b\x06proto3" , true); static::$is_initialized = true; diff --git a/OsLogin/owlbot.py b/OsLogin/owlbot.py index 7d3128f2b59a..694aa26503b7 100644 --- a/OsLogin/owlbot.py +++ b/OsLogin/owlbot.py @@ -15,6 +15,7 @@ """This script is used to synthesize generated parts of this library.""" import logging +import shutil from pathlib import Path import subprocess @@ -30,13 +31,23 @@ # Added so that we can pass copy_excludes in the owlbot_main() call _tracked_paths.add(src) -# copy "common" protos -php.owlbot_copy_version( - src=src / "common-protos", - dest=dest, - version_string="common", -) - +# 1. Handle common protos if staged separately (Librarian pipeline) +if (src / "common-protos").exists(): + php.owlbot_copy_version( + src=src / "common-protos", + dest=dest, + version_string="common", + ) +# 2. Handle common protos bundled inside v1 staging (Legacy OwlBot pipeline) +proto_common = src / "v1/proto/src/Google/Cloud/OsLogin/Common" +metadata_common = src / "v1/proto/src/GPBMetadata/Google/Cloud/Oslogin/Common" +if proto_common.exists(): + s.move([proto_common], dest / "src/Common", merge=php._merge) + shutil.rmtree(proto_common) +if metadata_common.exists(): + s.move([metadata_common], dest / "metadata/Common", merge=php._merge) + shutil.rmtree(metadata_common) +# 3. Copy V1 protos and GAPIC files php.owlbot_main(src=src, dest=dest) # format generated clients diff --git a/OsLogin/src/Common/PosixAccount.php b/OsLogin/src/Common/PosixAccount.php index 99d5713285c0..21c5f38b900a 100644 --- a/OsLogin/src/Common/PosixAccount.php +++ b/OsLogin/src/Common/PosixAccount.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\Common; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * The POSIX account information associated with a Google account. diff --git a/OsLogin/src/Common/SshPublicKey.php b/OsLogin/src/Common/SshPublicKey.php index 185588081e3e..a6a22948e91d 100644 --- a/OsLogin/src/Common/SshPublicKey.php +++ b/OsLogin/src/Common/SshPublicKey.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\Common; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * The SSH public key information associated with a Google account. @@ -17,8 +17,7 @@ class SshPublicKey extends \Google\Protobuf\Internal\Message { /** * Public key text in SSH format, defined by - * RFC4253 - * section 6.6. + * [RFC4253](https://www.ietf.org/rfc/rfc4253.txt) section 6.6. * * Generated from protobuf field string key = 1; */ @@ -50,8 +49,7 @@ class SshPublicKey extends \Google\Protobuf\Internal\Message * * @type string $key * Public key text in SSH format, defined by - * RFC4253 - * section 6.6. + * [RFC4253](https://www.ietf.org/rfc/rfc4253.txt) section 6.6. * @type int|string $expiration_time_usec * An expiration time in microseconds since epoch. * @type string $fingerprint @@ -67,8 +65,7 @@ public function __construct($data = NULL) { /** * Public key text in SSH format, defined by - * RFC4253 - * section 6.6. + * [RFC4253](https://www.ietf.org/rfc/rfc4253.txt) section 6.6. * * Generated from protobuf field string key = 1; * @return string @@ -80,8 +77,7 @@ public function getKey() /** * Public key text in SSH format, defined by - * RFC4253 - * section 6.6. + * [RFC4253](https://www.ietf.org/rfc/rfc4253.txt) section 6.6. * * Generated from protobuf field string key = 1; * @param string $var diff --git a/OsLogin/src/V1/CreateSshPublicKeyRequest.php b/OsLogin/src/V1/CreateSshPublicKeyRequest.php index 76728c29f5e7..42dcb515aba8 100644 --- a/OsLogin/src/V1/CreateSshPublicKeyRequest.php +++ b/OsLogin/src/V1/CreateSshPublicKeyRequest.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A request message for creating an SSH public key. diff --git a/OsLogin/src/V1/DeletePosixAccountRequest.php b/OsLogin/src/V1/DeletePosixAccountRequest.php index 965160ab977f..9759d348125e 100644 --- a/OsLogin/src/V1/DeletePosixAccountRequest.php +++ b/OsLogin/src/V1/DeletePosixAccountRequest.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A request message for deleting a POSIX account entry. diff --git a/OsLogin/src/V1/DeleteSshPublicKeyRequest.php b/OsLogin/src/V1/DeleteSshPublicKeyRequest.php index 11383a19392f..a83f0eee3a47 100644 --- a/OsLogin/src/V1/DeleteSshPublicKeyRequest.php +++ b/OsLogin/src/V1/DeleteSshPublicKeyRequest.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A request message for deleting an SSH public key. diff --git a/OsLogin/src/V1/GetLoginProfileRequest.php b/OsLogin/src/V1/GetLoginProfileRequest.php index 85992364fab9..592913c0420a 100644 --- a/OsLogin/src/V1/GetLoginProfileRequest.php +++ b/OsLogin/src/V1/GetLoginProfileRequest.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A request message for retrieving the login profile information for a user. diff --git a/OsLogin/src/V1/GetSshPublicKeyRequest.php b/OsLogin/src/V1/GetSshPublicKeyRequest.php index 6e6de1d0ec84..dbda93eac149 100644 --- a/OsLogin/src/V1/GetSshPublicKeyRequest.php +++ b/OsLogin/src/V1/GetSshPublicKeyRequest.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A request message for retrieving an SSH public key. diff --git a/OsLogin/src/V1/ImportSshPublicKeyRequest.php b/OsLogin/src/V1/ImportSshPublicKeyRequest.php index 122ed6f2f131..e7142e79b044 100644 --- a/OsLogin/src/V1/ImportSshPublicKeyRequest.php +++ b/OsLogin/src/V1/ImportSshPublicKeyRequest.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A request message for importing an SSH public key. @@ -88,7 +88,7 @@ public static function buildFromParentSshPublicKeyProjectId(string $parent, \Goo * Optional. The SSH public key and expiration time. * @type string $project_id * The project ID of the Google Cloud Platform project. - * @type array|\Google\Protobuf\Internal\RepeatedField $regions + * @type string[] $regions * Optional. The regions to which to assert that the key was written. * If unspecified, defaults to all regions. * Regions are listed at https://cloud.google.com/about/locations#region. @@ -193,7 +193,7 @@ public function setProjectId($var) * Regions are listed at https://cloud.google.com/about/locations#region. * * Generated from protobuf field repeated string regions = 5 [(.google.api.field_behavior) = OPTIONAL]; - * @return \Google\Protobuf\Internal\RepeatedField + * @return RepeatedField */ public function getRegions() { @@ -206,7 +206,7 @@ public function getRegions() * Regions are listed at https://cloud.google.com/about/locations#region. * * Generated from protobuf field repeated string regions = 5 [(.google.api.field_behavior) = OPTIONAL]; - * @param array|\Google\Protobuf\Internal\RepeatedField $var + * @param string[] $var * @return $this */ public function setRegions($var) diff --git a/OsLogin/src/V1/ImportSshPublicKeyResponse.php b/OsLogin/src/V1/ImportSshPublicKeyResponse.php index c9c749a53bee..5a0fb928fe21 100644 --- a/OsLogin/src/V1/ImportSshPublicKeyResponse.php +++ b/OsLogin/src/V1/ImportSshPublicKeyResponse.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A response message for importing an SSH public key. diff --git a/OsLogin/src/V1/LoginProfile.php b/OsLogin/src/V1/LoginProfile.php index 6abe567377c1..3381d644032c 100644 --- a/OsLogin/src/V1/LoginProfile.php +++ b/OsLogin/src/V1/LoginProfile.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * The user profile information used for logging in to a virtual machine on @@ -43,7 +43,7 @@ class LoginProfile extends \Google\Protobuf\Internal\Message * * @type string $name * Required. A unique user ID. - * @type array<\Google\Cloud\OsLogin\Common\PosixAccount>|\Google\Protobuf\Internal\RepeatedField $posix_accounts + * @type \Google\Cloud\OsLogin\Common\PosixAccount[] $posix_accounts * The list of POSIX accounts associated with the user. * @type array|\Google\Protobuf\Internal\MapField $ssh_public_keys * A map from SSH public key fingerprint to the associated key object. @@ -84,7 +84,7 @@ public function setName($var) * The list of POSIX accounts associated with the user. * * Generated from protobuf field repeated .google.cloud.oslogin.common.PosixAccount posix_accounts = 2; - * @return \Google\Protobuf\Internal\RepeatedField + * @return RepeatedField<\Google\Cloud\OsLogin\Common\PosixAccount> */ public function getPosixAccounts() { @@ -95,7 +95,7 @@ public function getPosixAccounts() * The list of POSIX accounts associated with the user. * * Generated from protobuf field repeated .google.cloud.oslogin.common.PosixAccount posix_accounts = 2; - * @param array<\Google\Cloud\OsLogin\Common\PosixAccount>|\Google\Protobuf\Internal\RepeatedField $var + * @param \Google\Cloud\OsLogin\Common\PosixAccount[] $var * @return $this */ public function setPosixAccounts($var) diff --git a/OsLogin/src/V1/UpdateSshPublicKeyRequest.php b/OsLogin/src/V1/UpdateSshPublicKeyRequest.php index 421c2a2586c5..1e00af3a1876 100644 --- a/OsLogin/src/V1/UpdateSshPublicKeyRequest.php +++ b/OsLogin/src/V1/UpdateSshPublicKeyRequest.php @@ -5,8 +5,8 @@ namespace Google\Cloud\OsLogin\V1; use Google\Protobuf\Internal\GPBType; -use Google\Protobuf\Internal\RepeatedField; use Google\Protobuf\Internal\GPBUtil; +use Google\Protobuf\RepeatedField; /** * A request message for updating an SSH public key. From 9a13297462d05836391836a1d94708c83576ffe4 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Tue, 25 Aug 2026 17:36:03 +0000 Subject: [PATCH 3/5] update config --- librarian.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/librarian.yaml b/librarian.yaml index e0dcfa80d119..405efcec2240 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -1606,6 +1606,11 @@ libraries: php: additional_protos: - google/cloud/location/locations.proto + keep: + - tests/data/generated/GPBMetadata/Data/User.php + - tests/data/generated/Testing/Data/Book.php + - tests/data/generated/Testing/Data/User.php + - tests/data/generated/Testing/Data/User/Address.php output: Speech - name: sql version: 1.11.1 From 1673151d307b6429fbc2b28275513c686a2fba35 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Tue, 25 Aug 2026 17:37:13 +0000 Subject: [PATCH 4/5] update config --- librarian.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/librarian.yaml b/librarian.yaml index 405efcec2240..296660865205 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -1598,6 +1598,11 @@ libraries: - path: google/spanner/admin/instance/v1 php: staging_subdir: v1/Admin/Instance/v1 + keep: + - tests/data/generated/GPBMetadata/Data/User.php + - tests/data/generated/Testing/Data/Book.php + - tests/data/generated/Testing/Data/User.php + - tests/data/generated/Testing/Data/User/Address.php output: Spanner - name: speech version: 2.5.4 @@ -1606,11 +1611,6 @@ libraries: php: additional_protos: - google/cloud/location/locations.proto - keep: - - tests/data/generated/GPBMetadata/Data/User.php - - tests/data/generated/Testing/Data/Book.php - - tests/data/generated/Testing/Data/User.php - - tests/data/generated/Testing/Data/User/Address.php output: Speech - name: sql version: 1.11.1 From 5b5df8f348801b9525dcf6488278051747e89232 Mon Sep 17 00:00:00 2001 From: JoeWang1127 Date: Tue, 25 Aug 2026 17:39:05 +0000 Subject: [PATCH 5/5] restore --- librarian.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/librarian.yaml b/librarian.yaml index 296660865205..e0dcfa80d119 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -1598,11 +1598,6 @@ libraries: - path: google/spanner/admin/instance/v1 php: staging_subdir: v1/Admin/Instance/v1 - keep: - - tests/data/generated/GPBMetadata/Data/User.php - - tests/data/generated/Testing/Data/Book.php - - tests/data/generated/Testing/Data/User.php - - tests/data/generated/Testing/Data/User/Address.php output: Spanner - name: speech version: 2.5.4