diff --git a/OsLogin/src/V1/Gapic/OsLoginServiceGapicClient.php b/OsLogin/src/V1/Gapic/OsLoginServiceGapicClient.php index ff4be301a200..67efd06cc86d 100644 --- a/OsLogin/src/V1/Gapic/OsLoginServiceGapicClient.php +++ b/OsLogin/src/V1/Gapic/OsLoginServiceGapicClient.php @@ -106,9 +106,9 @@ class OsLoginServiceGapicClient 'https://www.googleapis.com/auth/compute', 'https://www.googleapis.com/auth/compute.readonly', ]; - private static $userNameTemplate; - private static $projectNameTemplate; private static $fingerprintNameTemplate; + private static $projectNameTemplate; + private static $userNameTemplate; private static $pathTemplateMap; private static function getClientDefaults() @@ -130,13 +130,13 @@ private static function getClientDefaults() ]; } - private static function getUserNameTemplate() + private static function getFingerprintNameTemplate() { - if (null == self::$userNameTemplate) { - self::$userNameTemplate = new PathTemplate('users/{user}'); + if (null == self::$fingerprintNameTemplate) { + self::$fingerprintNameTemplate = new PathTemplate('users/{user}/sshPublicKeys/{fingerprint}'); } - return self::$userNameTemplate; + return self::$fingerprintNameTemplate; } private static function getProjectNameTemplate() @@ -148,22 +148,22 @@ private static function getProjectNameTemplate() return self::$projectNameTemplate; } - private static function getFingerprintNameTemplate() + private static function getUserNameTemplate() { - if (null == self::$fingerprintNameTemplate) { - self::$fingerprintNameTemplate = new PathTemplate('users/{user}/sshPublicKeys/{fingerprint}'); + if (null == self::$userNameTemplate) { + self::$userNameTemplate = new PathTemplate('users/{user}'); } - return self::$fingerprintNameTemplate; + return self::$userNameTemplate; } private static function getPathTemplateMap() { if (null == self::$pathTemplateMap) { self::$pathTemplateMap = [ - 'user' => self::getUserNameTemplate(), - 'project' => self::getProjectNameTemplate(), 'fingerprint' => self::getFingerprintNameTemplate(), + 'project' => self::getProjectNameTemplate(), + 'user' => self::getUserNameTemplate(), ]; } @@ -172,17 +172,19 @@ private static function getPathTemplateMap() /** * Formats a string containing the fully-qualified path to represent - * a user resource. + * a fingerprint resource. * * @param string $user + * @param string $fingerprint * - * @return string The formatted user resource. + * @return string The formatted fingerprint resource. * @experimental */ - public static function userName($user) + public static function fingerprintName($user, $fingerprint) { - return self::getUserNameTemplate()->render([ + return self::getFingerprintNameTemplate()->render([ 'user' => $user, + 'fingerprint' => $fingerprint, ]); } @@ -206,19 +208,17 @@ public static function projectName($user, $project) /** * Formats a string containing the fully-qualified path to represent - * a fingerprint resource. + * a user resource. * * @param string $user - * @param string $fingerprint * - * @return string The formatted fingerprint resource. + * @return string The formatted user resource. * @experimental */ - public static function fingerprintName($user, $fingerprint) + public static function userName($user) { - return self::getFingerprintNameTemplate()->render([ + return self::getUserNameTemplate()->render([ 'user' => $user, - 'fingerprint' => $fingerprint, ]); } @@ -226,9 +226,9 @@ public static function fingerprintName($user, $fingerprint) * Parses a formatted name string and returns an associative array of the components in the name. * The following name formats are supported: * Template: Pattern - * - user: users/{user} + * - fingerprint: users/{user}/sshPublicKeys/{fingerprint} * - project: users/{user}/projects/{project} - * - fingerprint: users/{user}/sshPublicKeys/{fingerprint}. + * - user: users/{user}. * * The optional $template argument can be supplied to specify a particular pattern, and must * match one of the templates listed above. If no $template argument is provided, or if the diff --git a/OsLogin/src/V1beta/Gapic/OsLoginServiceGapicClient.php b/OsLogin/src/V1beta/Gapic/OsLoginServiceGapicClient.php index 89c72d245761..3f86d99d0446 100644 --- a/OsLogin/src/V1beta/Gapic/OsLoginServiceGapicClient.php +++ b/OsLogin/src/V1beta/Gapic/OsLoginServiceGapicClient.php @@ -106,9 +106,9 @@ class OsLoginServiceGapicClient 'https://www.googleapis.com/auth/compute', 'https://www.googleapis.com/auth/compute.readonly', ]; - private static $userNameTemplate; - private static $projectNameTemplate; private static $fingerprintNameTemplate; + private static $projectNameTemplate; + private static $userNameTemplate; private static $pathTemplateMap; private static function getClientDefaults() @@ -130,13 +130,13 @@ private static function getClientDefaults() ]; } - private static function getUserNameTemplate() + private static function getFingerprintNameTemplate() { - if (null == self::$userNameTemplate) { - self::$userNameTemplate = new PathTemplate('users/{user}'); + if (null == self::$fingerprintNameTemplate) { + self::$fingerprintNameTemplate = new PathTemplate('users/{user}/sshPublicKeys/{fingerprint}'); } - return self::$userNameTemplate; + return self::$fingerprintNameTemplate; } private static function getProjectNameTemplate() @@ -148,22 +148,22 @@ private static function getProjectNameTemplate() return self::$projectNameTemplate; } - private static function getFingerprintNameTemplate() + private static function getUserNameTemplate() { - if (null == self::$fingerprintNameTemplate) { - self::$fingerprintNameTemplate = new PathTemplate('users/{user}/sshPublicKeys/{fingerprint}'); + if (null == self::$userNameTemplate) { + self::$userNameTemplate = new PathTemplate('users/{user}'); } - return self::$fingerprintNameTemplate; + return self::$userNameTemplate; } private static function getPathTemplateMap() { if (null == self::$pathTemplateMap) { self::$pathTemplateMap = [ - 'user' => self::getUserNameTemplate(), - 'project' => self::getProjectNameTemplate(), 'fingerprint' => self::getFingerprintNameTemplate(), + 'project' => self::getProjectNameTemplate(), + 'user' => self::getUserNameTemplate(), ]; } @@ -172,17 +172,19 @@ private static function getPathTemplateMap() /** * Formats a string containing the fully-qualified path to represent - * a user resource. + * a fingerprint resource. * * @param string $user + * @param string $fingerprint * - * @return string The formatted user resource. + * @return string The formatted fingerprint resource. * @experimental */ - public static function userName($user) + public static function fingerprintName($user, $fingerprint) { - return self::getUserNameTemplate()->render([ + return self::getFingerprintNameTemplate()->render([ 'user' => $user, + 'fingerprint' => $fingerprint, ]); } @@ -206,19 +208,17 @@ public static function projectName($user, $project) /** * Formats a string containing the fully-qualified path to represent - * a fingerprint resource. + * a user resource. * * @param string $user - * @param string $fingerprint * - * @return string The formatted fingerprint resource. + * @return string The formatted user resource. * @experimental */ - public static function fingerprintName($user, $fingerprint) + public static function userName($user) { - return self::getFingerprintNameTemplate()->render([ + return self::getUserNameTemplate()->render([ 'user' => $user, - 'fingerprint' => $fingerprint, ]); } @@ -226,9 +226,9 @@ public static function fingerprintName($user, $fingerprint) * Parses a formatted name string and returns an associative array of the components in the name. * The following name formats are supported: * Template: Pattern - * - user: users/{user} + * - fingerprint: users/{user}/sshPublicKeys/{fingerprint} * - project: users/{user}/projects/{project} - * - fingerprint: users/{user}/sshPublicKeys/{fingerprint}. + * - user: users/{user}. * * The optional $template argument can be supplied to specify a particular pattern, and must * match one of the templates listed above. If no $template argument is provided, or if the diff --git a/OsLogin/synth.metadata b/OsLogin/synth.metadata index ca278ebad76a..51a99c70bd40 100644 --- a/OsLogin/synth.metadata +++ b/OsLogin/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-30T10:02:16.213365Z", + "updateTime": "2019-04-23T10:02:25.197916Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.21", - "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" + "version": "0.17.0", + "dockerImage": "googleapis/artman@sha256:c58f4ec3838eb4e0718eb1bccc6512bd6850feaa85a360a9e38f6f848ec73bc2" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", - "internalRef": "241096997" + "sha": "547e19e7df398e9290e8e3674d7351efc500f9b0", + "internalRef": "244712781" } } ],