Skip to content

chore(Bigtable): add prettier formatting step to owlbot.py and format clients #9565

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

Open
JoeWang1127 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(Bigtable): add prettier formatting step to owlbot.py and format clients #9565

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
13 changes: 13 additions & 0 deletions Bigtable/owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,16 @@
s.move(admin_library / f'proto/src/Google/Cloud/Bigtable', f'src/', merge=preserve_copyright_year)
s.move(admin_library / f'proto/src/GPBMetadata/Google/Bigtable', f'metadata/', merge=preserve_copyright_year)

# format generated clients
subprocess.run([
'npm',
'exec',
'--yes',
'--package=@prettier/plugin-php@^0.19',
'--',
'prettier',
'**/Client/*',
'--write',
'--parser=php',
'--single-quote',
'--print-width=120'])
41 changes: 28 additions & 13 deletions Bigtable/src/Admin/V2/Client/BigtableInstanceAdminClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,10 @@ public function getOperationsClient()
*/
public function resumeOperation($operationName, $methodName = null)
{
$options = $methodName && isset($this->descriptors[$methodName]['longRunning']) ? $this->descriptors[$methodName]['longRunning'] : [];
$options =
$methodName && isset($this->descriptors[$methodName]['longRunning'])
? $this->descriptors[$methodName]['longRunning']
: [];
$operation = new OperationResponse($operationName, $this->getOperationsClient(), $options);
$operation->reload();
return $operation;
Expand Down Expand Up @@ -641,8 +644,10 @@ public function createLogicalView(CreateLogicalViewRequest $request, array $call
*
* @throws ApiException Thrown if the API call fails.
*/
public function createMaterializedView(CreateMaterializedViewRequest $request, array $callOptions = []): OperationResponse
{
public function createMaterializedView(
CreateMaterializedViewRequest $request,
array $callOptions = []
): OperationResponse {
return $this->startApiCall('CreateMaterializedView', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -1082,8 +1087,10 @@ public function listLogicalViews(ListLogicalViewsRequest $request, array $callOp
*
* @throws ApiException Thrown if the API call fails.
*/
public function listMaterializedViews(ListMaterializedViewsRequest $request, array $callOptions = []): PagedListResponse
{
public function listMaterializedViews(
ListMaterializedViewsRequest $request,
array $callOptions = []
): PagedListResponse {
return $this->startApiCall('ListMaterializedViews', $request, $callOptions);
}

Expand Down Expand Up @@ -1120,8 +1127,10 @@ public function listMaterializedViews(ListMaterializedViewsRequest $request, arr
*
* @throws ApiException Thrown if the API call fails.
*/
public function partialUpdateCluster(PartialUpdateClusterRequest $request, array $callOptions = []): OperationResponse
{
public function partialUpdateCluster(
PartialUpdateClusterRequest $request,
array $callOptions = []
): OperationResponse {
return $this->startApiCall('PartialUpdateCluster', $request, $callOptions)->wait();
}

Expand All @@ -1148,8 +1157,10 @@ public function partialUpdateCluster(PartialUpdateClusterRequest $request, array
*
* @throws ApiException Thrown if the API call fails.
*/
public function partialUpdateInstance(PartialUpdateInstanceRequest $request, array $callOptions = []): OperationResponse
{
public function partialUpdateInstance(
PartialUpdateInstanceRequest $request,
array $callOptions = []
): OperationResponse {
return $this->startApiCall('PartialUpdateInstance', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -1202,8 +1213,10 @@ public function setIamPolicy(SetIamPolicyRequest $request, array $callOptions =
*
* @throws ApiException Thrown if the API call fails.
*/
public function testIamPermissions(TestIamPermissionsRequest $request, array $callOptions = []): TestIamPermissionsResponse
{
public function testIamPermissions(
TestIamPermissionsRequest $request,
array $callOptions = []
): TestIamPermissionsResponse {
return $this->startApiCall('TestIamPermissions', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -1341,8 +1354,10 @@ public function updateLogicalView(UpdateLogicalViewRequest $request, array $call
*
* @throws ApiException Thrown if the API call fails.
*/
public function updateMaterializedView(UpdateMaterializedViewRequest $request, array $callOptions = []): OperationResponse
{
public function updateMaterializedView(
UpdateMaterializedViewRequest $request,
array $callOptions = []
): OperationResponse {
return $this->startApiCall('UpdateMaterializedView', $request, $callOptions)->wait();
}

Expand Down
66 changes: 47 additions & 19 deletions Bigtable/src/Admin/V2/Client/BigtableTableAdminClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ public function getOperationsClient()
*/
public function resumeOperation($operationName, $methodName = null)
{
$options = $methodName && isset($this->descriptors[$methodName]['longRunning']) ? $this->descriptors[$methodName]['longRunning'] : [];
$options =
$methodName && isset($this->descriptors[$methodName]['longRunning'])
? $this->descriptors[$methodName]['longRunning']
: [];
$operation = new OperationResponse($operationName, $this->getOperationsClient(), $options);
$operation->reload();
return $operation;
Expand Down Expand Up @@ -257,8 +260,12 @@ private function createOperationsClient(array $options)
*
* @return string The formatted authorized_view resource.
*/
public static function authorizedViewName(string $project, string $instance, string $table, string $authorizedView): string
{
public static function authorizedViewName(
string $project,
string $instance,
string $table,
string $authorizedView
): string {
return self::getPathTemplate('authorizedView')->render([
'project' => $project,
'instance' => $instance,
Expand Down Expand Up @@ -319,8 +326,13 @@ public static function clusterName(string $project, string $instance, string $cl
*
* @return string The formatted crypto_key_version resource.
*/
public static function cryptoKeyVersionName(string $project, string $location, string $keyRing, string $cryptoKey, string $cryptoKeyVersion): string
{
public static function cryptoKeyVersionName(
string $project,
string $location,
string $keyRing,
string $cryptoKey,
string $cryptoKeyVersion
): string {
return self::getPathTemplate('cryptoKeyVersion')->render([
'project' => $project,
'location' => $location,
Expand Down Expand Up @@ -375,8 +387,12 @@ public static function locationName(string $project, string $location): string
*
* @return string The formatted schema_bundle resource.
*/
public static function schemaBundleName(string $project, string $instance, string $table, string $schemaBundle): string
{
public static function schemaBundleName(
string $project,
string $instance,
string $table,
string $schemaBundle
): string {
return self::getPathTemplate('schemaBundle')->render([
'project' => $project,
'instance' => $instance,
Expand Down Expand Up @@ -571,8 +587,10 @@ public function __call($method, $args)
*
* @throws ApiException Thrown if the API call fails.
*/
public function checkConsistency(CheckConsistencyRequest $request, array $callOptions = []): CheckConsistencyResponse
{
public function checkConsistency(
CheckConsistencyRequest $request,
array $callOptions = []
): CheckConsistencyResponse {
return $this->startApiCall('CheckConsistency', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -625,8 +643,10 @@ public function copyBackup(CopyBackupRequest $request, array $callOptions = []):
*
* @throws ApiException Thrown if the API call fails.
*/
public function createAuthorizedView(CreateAuthorizedViewRequest $request, array $callOptions = []): OperationResponse
{
public function createAuthorizedView(
CreateAuthorizedViewRequest $request,
array $callOptions = []
): OperationResponse {
return $this->startApiCall('CreateAuthorizedView', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -747,8 +767,10 @@ public function createTable(CreateTableRequest $request, array $callOptions = []
*
* @throws ApiException Thrown if the API call fails.
*/
public function createTableFromSnapshot(CreateTableFromSnapshotRequest $request, array $callOptions = []): OperationResponse
{
public function createTableFromSnapshot(
CreateTableFromSnapshotRequest $request,
array $callOptions = []
): OperationResponse {
return $this->startApiCall('CreateTableFromSnapshot', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -931,8 +953,10 @@ public function dropRowRange(DropRowRangeRequest $request, array $callOptions =
*
* @throws ApiException Thrown if the API call fails.
*/
public function generateConsistencyToken(GenerateConsistencyTokenRequest $request, array $callOptions = []): GenerateConsistencyTokenResponse
{
public function generateConsistencyToken(
GenerateConsistencyTokenRequest $request,
array $callOptions = []
): GenerateConsistencyTokenResponse {
return $this->startApiCall('GenerateConsistencyToken', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -1383,8 +1407,10 @@ public function snapshotTable(SnapshotTableRequest $request, array $callOptions
*
* @throws ApiException Thrown if the API call fails.
*/
public function testIamPermissions(TestIamPermissionsRequest $request, array $callOptions = []): TestIamPermissionsResponse
{
public function testIamPermissions(
TestIamPermissionsRequest $request,
array $callOptions = []
): TestIamPermissionsResponse {
return $this->startApiCall('TestIamPermissions', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -1436,8 +1462,10 @@ public function undeleteTable(UndeleteTableRequest $request, array $callOptions
*
* @throws ApiException Thrown if the API call fails.
*/
public function updateAuthorizedView(UpdateAuthorizedViewRequest $request, array $callOptions = []): OperationResponse
{
public function updateAuthorizedView(
UpdateAuthorizedViewRequest $request,
array $callOptions = []
): OperationResponse {
return $this->startApiCall('UpdateAuthorizedView', $request, $callOptions)->wait();
}

Expand Down
32 changes: 22 additions & 10 deletions Bigtable/src/V2/Client/BigtableClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,12 @@ private static function getClientDefaults()
*
* @return string The formatted authorized_view resource.
*/
public static function authorizedViewName(string $project, string $instance, string $table, string $authorizedView): string
{
public static function authorizedViewName(
string $project,
string $instance,
string $table,
string $authorizedView
): string {
return self::getPathTemplate('authorizedView')->render([
'project' => $project,
'instance' => $instance,
Expand Down Expand Up @@ -355,8 +359,10 @@ public function __call($method, $args)
*
* @throws ApiException Thrown if the API call fails.
*/
public function checkAndMutateRow(CheckAndMutateRowRequest $request, array $callOptions = []): CheckAndMutateRowResponse
{
public function checkAndMutateRow(
CheckAndMutateRowRequest $request,
array $callOptions = []
): CheckAndMutateRowResponse {
return $this->startApiCall('CheckAndMutateRow', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -402,8 +408,10 @@ public function executeQuery(ExecuteQueryRequest $request, array $callOptions =
*
* @throws ApiException Thrown if the API call fails.
*/
public function generateInitialChangeStreamPartitions(GenerateInitialChangeStreamPartitionsRequest $request, array $callOptions = []): ServerStream
{
public function generateInitialChangeStreamPartitions(
GenerateInitialChangeStreamPartitionsRequest $request,
array $callOptions = []
): ServerStream {
return $this->startApiCall('GenerateInitialChangeStreamPartitions', $request, $callOptions);
}

Expand All @@ -430,8 +438,10 @@ public function generateInitialChangeStreamPartitions(GenerateInitialChangeStrea
*
* @throws ApiException Thrown if the API call fails.
*/
public function getClientConfiguration(GetClientConfigurationRequest $request, array $callOptions = []): ClientConfiguration
{
public function getClientConfiguration(
GetClientConfigurationRequest $request,
array $callOptions = []
): ClientConfiguration {
return $this->startApiCall('GetClientConfiguration', $request, $callOptions)->wait();
}

Expand Down Expand Up @@ -658,8 +668,10 @@ public function readChangeStream(ReadChangeStreamRequest $request, array $callOp
*
* @throws ApiException Thrown if the API call fails.
*/
public function readModifyWriteRow(ReadModifyWriteRowRequest $request, array $callOptions = []): ReadModifyWriteRowResponse
{
public function readModifyWriteRow(
ReadModifyWriteRowRequest $request,
array $callOptions = []
): ReadModifyWriteRowResponse {
return $this->startApiCall('ReadModifyWriteRow', $request, $callOptions)->wait();
}

Expand Down
Loading
Loading