Skip to content

Commit

Permalink
fix!: [merchantapi] The type of an existing field time_zone is chan…
Browse files Browse the repository at this point in the history
…ged from `message` to `string` in message `.google.shopping.merchant.accounts.v1beta.ListAccountIssuesRequest` (#5714)

* fix!: The type of an existing field `time_zone` is changed from `message` to `string` in message `.google.shopping.merchant.accounts.v1beta.ListAccountIssuesRequest`
fix!: An existing field `account_aggregation` is removed from message `.google.shopping.merchant.accounts.v1beta.CreateAndConfigureAccountRequest`
fix!: Changed field behavior for an existing field `service` in message `.google.shopping.merchant.accounts.v1beta.CreateAndConfigureAccountRequest`
fix!: Changed field behavior for an existing field `region_code` in message `.google.shopping.merchant.accounts.v1beta.RetrieveLatestTermsOfServiceRequest`
fix!: Changed field behavior for an existing field `kind` in message `.google.shopping.merchant.accounts.v1beta.RetrieveLatestTermsOfServiceRequest`
feat: A new field `account_aggregation` is added to message `.google.shopping.merchant.accounts.v1beta.CreateAndConfigureAccountRequest`
feat: A new message `AccountAggregation` is added
feat: A new service `AutofeedSettingsService` is added
feat: A new message `AutofeedSettings` is added
feat: A new resource_definition `merchantapi.googleapis.com/AutofeedSettings` is added
feat: A new message `GetAutofeedSettingsRequest` is added
feat: A new message `UpdateAutofeedSettingsRequest` is added
feat: A new field `korean_business_registration_number` is added to message `.google.shopping.merchant.accounts.v1beta.BusinessInfo`

PiperOrigin-RevId: 678841094

Source-Link: googleapis/googleapis@005df46

Source-Link: googleapis/googleapis-gen@1c58da1
Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LWFjY291bnRzLy5Pd2xCb3QueWFtbCIsImgiOiIxYzU4ZGExMDA1MzFkMDllOTEyMzMzMWQxMjFmNDEwZTdkMDBlNGFhIn0=

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Bankhead <[email protected]>
  • Loading branch information
3 people authored Sep 27, 2024
1 parent aff2a08 commit 8928489
Show file tree
Hide file tree
Showing 81 changed files with 5,924 additions and 254 deletions.
6 changes: 4 additions & 2 deletions packages/google-shopping-merchant-accounts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained].
1. [Select or create a Cloud Platform project][projects].
1. [Enable billing for your project][billing].
1. [Enable the Merchant API API][enable_api].
1. [Set up authentication with a service account][auth] so you can access the
1. [Set up authentication][auth] so you can access the
API from your local workstation.

### Installing the client library
Expand Down Expand Up @@ -124,6 +124,8 @@ Samples are in the [`samples/`](https://github.com/googleapis/google-cloud-node/
| Accounts_service.list_accounts | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/accounts_service.list_accounts.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/accounts_service.list_accounts.js,packages/google-shopping-merchant-accounts/samples/README.md) |
| Accounts_service.list_sub_accounts | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/accounts_service.list_sub_accounts.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/accounts_service.list_sub_accounts.js,packages/google-shopping-merchant-accounts/samples/README.md) |
| Accounts_service.update_account | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/accounts_service.update_account.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/accounts_service.update_account.js,packages/google-shopping-merchant-accounts/samples/README.md) |
| Autofeed_settings_service.get_autofeed_settings | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/autofeed_settings_service.get_autofeed_settings.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/autofeed_settings_service.get_autofeed_settings.js,packages/google-shopping-merchant-accounts/samples/README.md) |
| Autofeed_settings_service.update_autofeed_settings | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/autofeed_settings_service.update_autofeed_settings.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/autofeed_settings_service.update_autofeed_settings.js,packages/google-shopping-merchant-accounts/samples/README.md) |
| Business_identity_service.get_business_identity | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/business_identity_service.get_business_identity.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/business_identity_service.get_business_identity.js,packages/google-shopping-merchant-accounts/samples/README.md) |
| Business_identity_service.update_business_identity | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/business_identity_service.update_business_identity.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/business_identity_service.update_business_identity.js,packages/google-shopping-merchant-accounts/samples/README.md) |
| Business_info_service.get_business_info | [source code](https://github.com/googleapis/google-cloud-node/blob/main/packages/google-shopping-merchant-accounts/samples/generated/v1beta/business_info_service.get_business_info.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/google-cloud-node&page=editor&open_in_editor=packages/google-shopping-merchant-accounts/samples/generated/v1beta/business_info_service.get_business_info.js,packages/google-shopping-merchant-accounts/samples/README.md) |
Expand Down Expand Up @@ -226,4 +228,4 @@ See [LICENSE](https://github.com/googleapis/google-cloud-node/blob/main/LICENSE)
[projects]: https://console.cloud.google.com/project
[billing]: https://support.google.com/cloud/answer/6293499#enable-billing
[enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=merchantapi.googleapis.com
[auth]: https://cloud.google.com/docs/authentication/getting-started
[auth]: https://cloud.google.com/docs/authentication/external/set-up-adc-local
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/shopping/type/types.proto";
import "google/type/datetime.proto";

option go_package = "cloud.google.com/go/shopping/merchant/accounts/apiv1beta/accountspb;accountspb";
option java_multiple_files = true;
Expand Down Expand Up @@ -142,7 +141,7 @@ message ListAccountIssuesRequest {
// Optional. The [IANA](https://www.iana.org/time-zones) timezone used to
// localize times in human-readable fields. For example 'America/Los_Angeles'.
// If not set, 'America/Los_Angeles' will be used.
google.type.TimeZone time_zone = 5 [(google.api.field_behavior) = OPTIONAL];
string time_zone = 5 [(google.api.field_behavior) = OPTIONAL];
}

// Response message for the `ListAccountIssues` method.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/protobuf/empty.proto";
import "google/protobuf/field_mask.proto";
import "google/shopping/merchant/accounts/v1beta/accountservices.proto";
import "google/shopping/merchant/accounts/v1beta/user.proto";
import "google/type/datetime.proto";

Expand Down Expand Up @@ -156,7 +157,10 @@ message GetAccountRequest {
message CreateAndConfigureAccountRequest {
// Reference to a Terms of Service resource.
message AcceptTermsOfService {
// Required. The resource name of the terms of service version.
// Required. The resource name of the terms of service version in the format
// `termsOfService/{version}`. To retrieve the latest version, use the
// [termsOfService.retrieveLatest](/merchant/api/reference/rest/accounts_v1beta/termsOfService/retrieveLatest)
// method.
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand All @@ -173,12 +177,12 @@ message CreateAndConfigureAccountRequest {
// Additional instructions to add account services during creation of the
// account.
message AddAccountService {
// Currently only supports
// [Multi-client](https://support.google.com/merchants/answer/188487)
// parent account type.
// The service type to be added.
oneof service_type {
// The provider is an aggregator for the account.
google.protobuf.Empty account_aggregation = 2;
// The provider is an
// [aggregator](https://support.google.com/merchants/answer/188487) for
// the account. Payload for service type Account Aggregation.
AccountAggregation account_aggregation = 103;
}

// Optional. The provider of the service.
Expand All @@ -202,11 +206,14 @@ message CreateAndConfigureAccountRequest {
optional AcceptTermsOfService accept_terms_of_service = 3
[(google.api.field_behavior) = OPTIONAL];

// Optional. If specified, an account service between the account to be
// created and the provider account is initialized as part of the
// creation.
// Required. An account service between the account to be created and the
// provider account is initialized as part of the creation. At least one such
// service needs to be provided. Currently exactly one of these needs to be
// `account_aggregation`, which means you can only create sub accounts, not
// standalone account through this method. Additional `account_management` or
// `product_management` services may be provided.
repeated AddAccountService service = 4
[(google.api.field_behavior) = OPTIONAL];
[(google.api.field_behavior) = REQUIRED];
}

// Request message for the `DeleteAccount` method.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// 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.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package google.shopping.merchant.accounts.v1beta;

import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";

option go_package = "cloud.google.com/go/shopping/merchant/accounts/apiv1beta/accountspb;accountspb";
option java_multiple_files = true;
option java_outer_classname = "AccountServicesProto";
option java_package = "com.google.shopping.merchant.accounts.v1beta";

// `AccountAggregation` payload.
message AccountAggregation {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
// 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.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

syntax = "proto3";

package google.shopping.merchant.accounts.v1beta;

import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/protobuf/field_mask.proto";

option go_package = "cloud.google.com/go/shopping/merchant/accounts/apiv1beta/accountspb;accountspb";
option java_multiple_files = true;
option java_outer_classname = "AutofeedSettingsProto";
option java_package = "com.google.shopping.merchant.accounts.v1beta";

// Service to support
// [autofeed](https://support.google.com/merchants/answer/7538732) setting.
service AutofeedSettingsService {
option (google.api.default_host) = "merchantapi.googleapis.com";
option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/content";

// Retrieves the autofeed settings of an account.
rpc GetAutofeedSettings(GetAutofeedSettingsRequest)
returns (AutofeedSettings) {
option (google.api.http) = {
get: "/accounts/v1beta/{name=accounts/*/autofeedSettings}"
};
option (google.api.method_signature) = "name";
}

// Updates the autofeed settings of an account.
rpc UpdateAutofeedSettings(UpdateAutofeedSettingsRequest)
returns (AutofeedSettings) {
option (google.api.http) = {
patch: "/accounts/v1beta/{autofeed_settings.name=accounts/*/autofeedSettings}"
body: "autofeed_settings"
};
option (google.api.method_signature) = "autofeed_settings,update_mask";
}
}

// Collection of information related to the
// [autofeed](https://support.google.com/merchants/answer/7538732) settings.
message AutofeedSettings {
option (google.api.resource) = {
type: "merchantapi.googleapis.com/AutofeedSettings"
pattern: "accounts/{account}/autofeedSettings"
plural: "autofeedSettings"
singular: "autofeedSettings"
};

// Identifier. The resource name of the autofeed settings.
// Format: `accounts/{account}/autofeedSettings`.
string name = 1 [(google.api.field_behavior) = IDENTIFIER];

// Required. Enables or disables product crawling through the autofeed for the
// given account. Autofeed accounts must meet [certain
// conditions](https://support.google.com/merchants/answer/7538732#Configure_automated_feeds_Standard_Experience),
// which can be checked through the `eligible` field.
// The account must **not** be a marketplace.
// When the autofeed is enabled for the first time, the products usually
// appear instantly. When re-enabling, it might take up to 24 hours for
// products to appear.
bool enable_products = 2 [(google.api.field_behavior) = REQUIRED];

// Output only. Determines whether merchant is eligible for being enrolled
// into an autofeed.
bool eligible = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
}

// Request message for the `GetAutofeedSettings` method.
message GetAutofeedSettingsRequest {
// Required. The resource name of the autofeed settings.
// Format: `accounts/{account}/autofeedSettings`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
type: "merchantapi.googleapis.com/AutofeedSettings"
}
];
}

// Request message for the `UpdateAutofeedSettings` method.
message UpdateAutofeedSettingsRequest {
// Required. The new version of the autofeed setting.
AutofeedSettings autofeed_settings = 1
[(google.api.field_behavior) = REQUIRED];

// Required. List of fields being updated.
google.protobuf.FieldMask update_mask = 2
[(google.api.field_behavior) = REQUIRED];
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ message BusinessInfo {
// Optional. The customer service of the business.
optional CustomerService customer_service = 5
[(google.api.field_behavior) = OPTIONAL];

// Optional. The 10-digit [Korean business registration
// number](https://support.google.com/merchants/answer/9037766) separated with
// dashes in the format: XXX-XX-XXXXX.
optional string korean_business_registration_number = 6
[(google.api.field_behavior) = OPTIONAL];
}

// Request message for the `GetBusinessInfo` method.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ service ShippingSettingsService {
}

// The merchant account's [shipping
// setting]((https://support.google.com/merchants/answer/6069284).
// setting](https://support.google.com/merchants/answer/6069284).
message ShippingSettings {
option (google.api.resource) = {
type: "merchantapi.googleapis.com/ShippingSettings"
Expand Down Expand Up @@ -355,11 +355,15 @@ message DeliveryTime {

// Minimum number of business days spent before an order is shipped.
// 0 means same day shipped, 1 means next day shipped.
// 'min_handling_days' and 'max_handling_days' should be either set or not set
// at the same time.
optional int32 min_handling_days = 4;

// Maximum number of business days spent before an order is shipped.
// 0 means same day shipped, 1 means next day shipped.
// Must be greater than or equal to `min_handling_days`.
// 'min_handling_days' and 'max_handling_days' should be either set or not set
// at the same time.
optional int32 max_handling_days = 5;

// Transit time table, number of business days spent in transit based on row
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ message GetTermsOfServiceRequest {

// Request message for the `RetrieveLatestTermsOfService` method.
message RetrieveLatestTermsOfServiceRequest {
// Region code as defined by [CLDR](https://cldr.unicode.org/). This is either
// a country when the ToS applies specifically to that country or 001 when it
// applies globally.
string region_code = 1;
// Required. Region code as defined by [CLDR](https://cldr.unicode.org/). This
// is either a country when the ToS applies specifically to that country or
// 001 when it applies globally.
string region_code = 1 [(google.api.field_behavior) = REQUIRED];

// The Kind this terms of service version applies to.
TermsOfServiceKind kind = 2;
// Required. The Kind this terms of service version applies to.
TermsOfServiceKind kind = 2 [(google.api.field_behavior) = REQUIRED];
}

// Request message for the `AcceptTermsOfService` method.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ message TermsOfServiceAgreementState {

// Identifier. The resource name of the terms of service version.
// Format: `accounts/{account}/termsOfServiceAgreementState/{identifier}`
// The identifier format is: `{TermsOfServiceKind}-{country}`
// For example, an identifier could be: `MERCHANT_CENTER-US`
string name = 1 [(google.api.field_behavior) = IDENTIFIER];

// Region code as defined by https://cldr.unicode.org/. This is the
Expand Down Expand Up @@ -144,6 +146,7 @@ message Required {
message GetTermsOfServiceAgreementStateRequest {
// Required. The resource name of the terms of service version.
// Format: `accounts/{account}/termsOfServiceAgreementState/{identifier}`
// The identifier format is: `{TermsOfServiceKind}-{country}`
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
Expand Down
Loading

0 comments on commit 8928489

Please sign in to comment.