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.

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

chore!: promote GkeMultiCloud, GSuiteAddOns, Run, StorageInsights, VideoLiveStream, VideoStitcher, VmwareEngine APIs to v1 #7465

Merged
merged 7 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions .repo-metadata-full.json
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@
"GSuiteAddOns": {
"language": "php",
"distribution_name": "google/cloud-gsuite-addons",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-gsuite-addons/latest",
"library_type": "GAPIC_AUTO",
"product_documentation": "https://developers.google.com/workspace/add-ons/overview",
Expand Down Expand Up @@ -736,7 +736,7 @@
"GkeMultiCloud": {
"language": "php",
"distribution_name": "google/cloud-gke-multi-cloud",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-gke-multi-cloud/latest",
"library_type": "GAPIC_AUTO",
"api_shortname": "gkemulticloud"
Expand Down Expand Up @@ -1138,7 +1138,7 @@
"Run": {
"language": "php",
"distribution_name": "google/cloud-run",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-run/latest",
"library_type": "GAPIC_AUTO",
"api_shortname": "run"
Expand Down Expand Up @@ -1385,7 +1385,7 @@
"StorageInsights": {
"language": "php",
"distribution_name": "google/cloud-storageinsights",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-storageinsights/latest",
"library_type": "GAPIC_AUTO",
"api_shortname": "storageinsights"
Expand Down Expand Up @@ -1473,15 +1473,15 @@
"VideoLiveStream": {
"language": "php",
"distribution_name": "google/cloud-video-live-stream",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-video-live-stream/latest",
"library_type": "GAPIC_AUTO",
"api_shortname": "livestream"
},
"VideoStitcher": {
"language": "php",
"distribution_name": "google/cloud-video-stitcher",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-video-stitcher/latest",
"library_type": "GAPIC_AUTO",
"api_shortname": "videostitcher"
Expand Down Expand Up @@ -1513,7 +1513,7 @@
"VmwareEngine": {
"language": "php",
"distribution_name": "google/cloud-vmware-engine",
"release_level": "preview",
"release_level": "stable",
"client_documentation": "https://cloud.google.com/php/docs/reference/cloud-vmware-engine/latest",
"library_type": "GAPIC_AUTO",
"product_documentation": "https://cloud.google.com/vmware-engine/docs",
Expand Down
4 changes: 2 additions & 2 deletions GSuiteAddOns/.OwlBot.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deep-copy-regex:
- source: /google/cloud/gsuiteaddons/v1/.*-php/(.*)
dest: /owl-bot-staging/GSuiteAddOns/v1/$1
- source: /google/cloud/gsuiteaddons/(v1)/.*-php/(.*)
dest: /owl-bot-staging/GSuiteAddOns/$1/$2
api-name: GSuiteAddOns
41 changes: 4 additions & 37 deletions GSuiteAddOns/owlbot.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Google LLC
# Copyright 2023 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,14 +30,7 @@
# Added so that we can pass copy_excludes in the owlbot_main() call
_tracked_paths.add(src)

php.owlbot_main(
src=src,
dest=dest,
copy_excludes=[
src / "**/[A-Z]*_*.php",
src / "**/*GrpcClient.php"
]
)
php.owlbot_main(src=src, dest=dest)

# remove class_alias code
s.replace(
Expand All @@ -48,32 +41,6 @@
+ "\n",
'')

### [START] protoc backwards compatibility fixes

# roll back to private properties.
s.replace(
"src/**/V*/**/*.php",
r"Generated from protobuf field ([^\n]{0,})\n\s{5}\*/\n\s{4}protected \$",
r"""Generated from protobuf field \1
*/
private $""")

# Replace "Unwrapped" with "Value" for method names.
s.replace(
"src/**/V*/**/*.php",
r"public function ([s|g]\w{3,})Unwrapped",
r"public function \1Value"
)

### [END] protoc backwards compatibility fixes

# fix relative cloud.google.com links
s.replace(
"src/**/V*/**/*.php",
r"(.{0,})\]\((/.{0,})\)",
r"\1](https://cloud.google.com\2)"
)

# format generated clients
subprocess.run([
'npm',
Expand All @@ -82,8 +49,8 @@
'--package=@prettier/plugin-php@^0.16',
'--',
'prettier',
'**/Gapic/*',
'**/Client/*',
'--write',
'--parser=php',
'--single-quote',
'--print-width=80'])
'--print-width=120'])
16 changes: 8 additions & 8 deletions GSuiteAddOns/src/V1/AddOns.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions GSuiteAddOns/src/V1/Authorization.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions GSuiteAddOns/src/V1/Client/GSuiteAddOnsClient.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/*
* Copyright 2023 Google LLC
* Copyright 2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -120,9 +120,7 @@ final class GSuiteAddOnsClient
private const CODEGEN_NAME = 'gapic';

/** The default scopes required by the service. */
public static $serviceScopes = [
'https://www.googleapis.com/auth/cloud-platform',
];
public static $serviceScopes = ['https://www.googleapis.com/auth/cloud-platform'];

private static function getClientDefaults()
{
Expand Down
6 changes: 3 additions & 3 deletions GSuiteAddOns/src/V1/CreateDeploymentRequest.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions GSuiteAddOns/src/V1/DeleteDeploymentRequest.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions GSuiteAddOns/src/V1/Deployment.php

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 0 additions & 34 deletions GSuiteAddOns/src/V1/GSuiteAddOnsClient.php

This file was deleted.

Loading
Loading