Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-order resource name methods. #1838

Merged
merged 1 commit into from
Apr 23, 2019
Merged

Re-order resource name methods. #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions OsLogin/src/V1/Gapic/OsLoginServiceGapicClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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(),
];
}

Expand All @@ -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,
]);
}

Expand All @@ -206,29 +208,27 @@ 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,
]);
}

/**
* 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
Expand Down
48 changes: 24 additions & 24 deletions OsLogin/src/V1beta/Gapic/OsLoginServiceGapicClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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(),
];
}

Expand All @@ -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,
]);
}

Expand All @@ -206,29 +208,27 @@ 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,
]);
}

/**
* 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
Expand Down
10 changes: 5 additions & 5 deletions OsLogin/synth.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
],
Expand Down