Skip to content

Commit ffac665

Browse files
Google APIscopybara-github
authored andcommitted
chore: migrate hostedmarketplace/v2 to the PHP microgenerator
Committer: @miraleung PiperOrigin-RevId: 369287039
1 parent db9e0c1 commit ffac665

4 files changed

Lines changed: 17 additions & 19 deletions

File tree

google/apps/market/v2/BUILD.bazel

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ go_gapic_library(
120120
srcs = [":marketplace_proto_with_info"],
121121
grpc_service_config = "service_grpc_service_config.json",
122122
importpath = "google.golang.org/ccc/hosted/marketplace/v2;marketplace",
123-
service_yaml = "appsmarket_v2.yaml",
124123
metadata = True,
124+
service_yaml = "appsmarket_v2.yaml",
125125
deps = [
126126
":marketplace_go_proto",
127127
],
@@ -139,8 +139,8 @@ go_gapic_assembly_pkg(
139139
name = "gapi-cloud-hosted-marketplace-v2-go",
140140
deps = [
141141
":marketplace_go_gapic",
142-
":marketplace_go_gapic_srcjar-test.srcjar",
143142
":marketplace_go_gapic_srcjar-metadata.srcjar",
143+
":marketplace_go_gapic_srcjar-test.srcjar",
144144
":marketplace_go_proto",
145145
],
146146
)
@@ -170,13 +170,14 @@ py_gapic_assembly_pkg(
170170

171171
##############################################################################
172172
# PHP
173+
# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules.
173174
##############################################################################
174175
load(
175176
"@com_google_googleapis_imports//:imports.bzl",
176-
"php_gapic_assembly_pkg",
177-
"php_gapic_library",
178-
"php_grpc_library",
179-
"php_proto_library",
177+
php_gapic_assembly_pkg = "php_gapic_assembly_pkg2",
178+
php_gapic_library = "php_gapic_library2",
179+
php_grpc_library = "php_grpc_library2",
180+
php_proto_library = "php_proto_library2",
180181
)
181182

182183
php_proto_library(
@@ -192,11 +193,8 @@ php_grpc_library(
192193

193194
php_gapic_library(
194195
name = "marketplace_php_gapic",
195-
src = ":marketplace_proto_with_info",
196-
gapic_yaml = "appsmarket_gapic.yaml",
196+
srcs = [":marketplace_proto_with_info"],
197197
grpc_service_config = "service_grpc_service_config.json",
198-
package = "ccc.hosted.marketplace.v2",
199-
service_yaml = "appsmarket_v2.yaml",
200198
deps = [
201199
":marketplace_php_grpc",
202200
":marketplace_php_proto",
@@ -246,8 +244,8 @@ nodejs_gapic_assembly_pkg(
246244
##############################################################################
247245
load(
248246
"@com_google_googleapis_imports//:imports.bzl",
249-
"ruby_gapic_assembly_pkg",
250247
"ruby_cloud_gapic_library",
248+
"ruby_gapic_assembly_pkg",
251249
"ruby_grpc_library",
252250
"ruby_proto_library",
253251
)

google/apps/market/v2/appsmarket_gapic.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

google/apps/market/v2/resources.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ option go_package = "google.golang.org/genproto/googleapis/ccc/hosted/marketplac
2222
option java_multiple_files = true;
2323
option java_outer_classname = "ResourcesProto";
2424
option java_package = "com.google.ccc.hosted.marketplace.v2";
25+
option php_namespace = "Google\\Apps\\Market\\V2";
2526

2627
message CustomerLicense {
2728
message Editions {

google/apps/market/v2/services.proto

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ option go_package = "google.golang.org/genproto/googleapis/ccc/hosted/marketplac
2424
option java_multiple_files = true;
2525
option java_outer_classname = "ServiceProto";
2626
option java_package = "com.google.ccc.hosted.marketplace.v2";
27+
option php_namespace = "Google\\Apps\\Market\\V2";
2728

2829
service CustomerLicenseService {
2930
option (google.api.default_host) = "appsmarket.googleapis.com";
30-
option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/appsmarketplace.license";
31+
option (google.api.oauth_scopes) =
32+
"https://www.googleapis.com/auth/appsmarketplace.license";
3133

3234
// Get the status of a license for a customer to determine if they have access
3335
// for a given app.
@@ -40,7 +42,8 @@ service CustomerLicenseService {
4042

4143
service LicenseNotificationService {
4244
option (google.api.default_host) = "appsmarket.googleapis.com";
43-
option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/appsmarketplace.license";
45+
option (google.api.oauth_scopes) =
46+
"https://www.googleapis.com/auth/appsmarketplace.license";
4447

4548
// Get a list of licensing notifications with regards to a given app.
4649
rpc List(LicenseNotificationListRequest) returns (LicenseNotificationList) {
@@ -53,7 +56,8 @@ service LicenseNotificationService {
5356

5457
service UserLicenseService {
5558
option (google.api.default_host) = "appsmarket.googleapis.com";
56-
option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/appsmarketplace.license";
59+
option (google.api.oauth_scopes) =
60+
"https://www.googleapis.com/auth/appsmarketplace.license";
5761

5862
// Get the user's licensing status for their permission to use a given app.
5963
rpc Get(UserLicenseGetRequest) returns (UserLicense) {

0 commit comments

Comments
 (0)