Skip to content

Commit 8d79ca8

Browse files
gcf-owl-bot[bot]ohmayr
gcf-owl-bot[bot]
and
ohmayr
authored
feat: [google-shopping-merchant-accounts] add 'force' parameter for accounts.delete method (#13111)
BEGIN_COMMIT_OVERRIDE feat: add 'force' parameter for accounts.delete method docs: updated descriptions for the DeleteAccount and ListAccounts RPCs 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](https://www.google.com/url?sa=D&q=http%3A%2F%2Fmerchantapi.googleapis.com%2FAutofeedSettings)` 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` END_COMMIT_OVERRIDE - [ ] Regenerate this pull request now. docs: updated descriptions for the DeleteAccount and ListAccounts RPCs PiperOrigin-RevId: 680468173 Source-Link: googleapis/googleapis@1b2f804 Source-Link: googleapis/googleapis-gen@aaf00b0 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXNob3BwaW5nLW1lcmNoYW50LWFjY291bnRzLy5Pd2xCb3QueWFtbCIsImgiOiJhYWYwMGIwNzBlMDAwMzc0ZTBmNTMxMzE5ZTRiN2RkNzk3ZGUzMTY1In0= BEGIN_NESTED_COMMIT fix!: [google-shopping-merchant-accounts] 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= END_NESTED_COMMIT --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: ohmayr <omairn@google.com> Co-authored-by: ohmayr <omairnaveed@ymail.com>
1 parent 052585c commit 8d79ca8

51 files changed

Lines changed: 7363 additions & 91 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/google-shopping-merchant-accounts/docs/merchant_accounts_v1beta/autofeed_settings_service.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
AutofeedSettingsService
2+
-----------------------------------------
3+
4+
.. automodule:: google.shopping.merchant_accounts_v1beta.services.autofeed_settings_service
5+
:members:
6+
:inherited-members:

‎packages/google-shopping-merchant-accounts/docs/merchant_accounts_v1beta/services_.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Services for Google Shopping Merchant Accounts v1beta API
66
account_issue_service
77
accounts_service
88
account_tax_service
9+
autofeed_settings_service
910
business_identity_service
1011
business_info_service
1112
email_preferences_service

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts/__init__.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
from google.shopping.merchant_accounts_v1beta.services.accounts_service.client import (
3737
AccountsServiceClient,
3838
)
39+
from google.shopping.merchant_accounts_v1beta.services.autofeed_settings_service.async_client import (
40+
AutofeedSettingsServiceAsyncClient,
41+
)
42+
from google.shopping.merchant_accounts_v1beta.services.autofeed_settings_service.client import (
43+
AutofeedSettingsServiceClient,
44+
)
3945
from google.shopping.merchant_accounts_v1beta.services.business_identity_service.async_client import (
4046
BusinessIdentityServiceAsyncClient,
4147
)
@@ -126,6 +132,14 @@
126132
ListSubAccountsResponse,
127133
UpdateAccountRequest,
128134
)
135+
from google.shopping.merchant_accounts_v1beta.types.accountservices import (
136+
AccountAggregation,
137+
)
138+
from google.shopping.merchant_accounts_v1beta.types.autofeedsettings import (
139+
AutofeedSettings,
140+
GetAutofeedSettingsRequest,
141+
UpdateAutofeedSettingsRequest,
142+
)
129143
from google.shopping.merchant_accounts_v1beta.types.businessidentity import (
130144
BusinessIdentity,
131145
GetBusinessIdentityRequest,
@@ -234,6 +248,8 @@
234248
"AccountsServiceAsyncClient",
235249
"AccountTaxServiceClient",
236250
"AccountTaxServiceAsyncClient",
251+
"AutofeedSettingsServiceClient",
252+
"AutofeedSettingsServiceAsyncClient",
237253
"BusinessIdentityServiceClient",
238254
"BusinessIdentityServiceAsyncClient",
239255
"BusinessInfoServiceClient",
@@ -274,6 +290,10 @@
274290
"ListSubAccountsRequest",
275291
"ListSubAccountsResponse",
276292
"UpdateAccountRequest",
293+
"AccountAggregation",
294+
"AutofeedSettings",
295+
"GetAutofeedSettingsRequest",
296+
"UpdateAutofeedSettingsRequest",
277297
"BusinessIdentity",
278298
"GetBusinessIdentityRequest",
279299
"UpdateBusinessIdentityRequest",

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/__init__.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
AccountTaxServiceClient,
2828
)
2929
from .services.accounts_service import AccountsServiceAsyncClient, AccountsServiceClient
30+
from .services.autofeed_settings_service import (
31+
AutofeedSettingsServiceAsyncClient,
32+
AutofeedSettingsServiceClient,
33+
)
3034
from .services.business_identity_service import (
3135
BusinessIdentityServiceAsyncClient,
3236
BusinessIdentityServiceClient,
@@ -83,6 +87,12 @@
8387
ListSubAccountsResponse,
8488
UpdateAccountRequest,
8589
)
90+
from .types.accountservices import AccountAggregation
91+
from .types.autofeedsettings import (
92+
AutofeedSettings,
93+
GetAutofeedSettingsRequest,
94+
UpdateAutofeedSettingsRequest,
95+
)
8696
from .types.businessidentity import (
8797
BusinessIdentity,
8898
GetBusinessIdentityRequest,
@@ -182,6 +192,7 @@
182192
"AccountIssueServiceAsyncClient",
183193
"AccountTaxServiceAsyncClient",
184194
"AccountsServiceAsyncClient",
195+
"AutofeedSettingsServiceAsyncClient",
185196
"BusinessIdentityServiceAsyncClient",
186197
"BusinessInfoServiceAsyncClient",
187198
"EmailPreferencesServiceAsyncClient",
@@ -197,12 +208,15 @@
197208
"Accepted",
198209
"AccessRight",
199210
"Account",
211+
"AccountAggregation",
200212
"AccountIssue",
201213
"AccountIssueServiceClient",
202214
"AccountTax",
203215
"AccountTaxServiceClient",
204216
"AccountsServiceClient",
205217
"Address",
218+
"AutofeedSettings",
219+
"AutofeedSettingsServiceClient",
206220
"BusinessDayConfig",
207221
"BusinessIdentity",
208222
"BusinessIdentityServiceClient",
@@ -226,6 +240,7 @@
226240
"EnableProgramRequest",
227241
"GetAccountRequest",
228242
"GetAccountTaxRequest",
243+
"GetAutofeedSettingsRequest",
229244
"GetBusinessIdentityRequest",
230245
"GetBusinessInfoRequest",
231246
"GetEmailPreferencesRequest",
@@ -285,6 +300,7 @@
285300
"UnclaimHomepageRequest",
286301
"UpdateAccountRequest",
287302
"UpdateAccountTaxRequest",
303+
"UpdateAutofeedSettingsRequest",
288304
"UpdateBusinessIdentityRequest",
289305
"UpdateBusinessInfoRequest",
290306
"UpdateEmailPreferencesRequest",

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/gapic_metadata.json‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,55 @@
212212
}
213213
}
214214
},
215+
"AutofeedSettingsService": {
216+
"clients": {
217+
"grpc": {
218+
"libraryClient": "AutofeedSettingsServiceClient",
219+
"rpcs": {
220+
"GetAutofeedSettings": {
221+
"methods": [
222+
"get_autofeed_settings"
223+
]
224+
},
225+
"UpdateAutofeedSettings": {
226+
"methods": [
227+
"update_autofeed_settings"
228+
]
229+
}
230+
}
231+
},
232+
"grpc-async": {
233+
"libraryClient": "AutofeedSettingsServiceAsyncClient",
234+
"rpcs": {
235+
"GetAutofeedSettings": {
236+
"methods": [
237+
"get_autofeed_settings"
238+
]
239+
},
240+
"UpdateAutofeedSettings": {
241+
"methods": [
242+
"update_autofeed_settings"
243+
]
244+
}
245+
}
246+
},
247+
"rest": {
248+
"libraryClient": "AutofeedSettingsServiceClient",
249+
"rpcs": {
250+
"GetAutofeedSettings": {
251+
"methods": [
252+
"get_autofeed_settings"
253+
]
254+
},
255+
"UpdateAutofeedSettings": {
256+
"methods": [
257+
"update_autofeed_settings"
258+
]
259+
}
260+
}
261+
}
262+
}
263+
},
215264
"BusinessIdentityService": {
216265
"clients": {
217266
"grpc": {

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/accounts_service/async_client.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,12 @@ async def delete_account(
465465
metadata: Sequence[Tuple[str, str]] = (),
466466
) -> None:
467467
r"""Deletes the specified account regardless of its type:
468-
standalone, MCA or sub-account. Deleting an MCA leads to
469-
the deletion of all of its sub-accounts. Executing this
470-
method requires admin access.
468+
standalone, MCA or sub-account. Deleting an MCA leads to the
469+
deletion of all of its sub-accounts. Executing this method
470+
requires admin access. The deletion succeeds only if the account
471+
does not provide services to any other account and has no
472+
processed offers. You can use the ``force`` parameter to
473+
override this.
471474
472475
.. code-block:: python
473476
@@ -685,7 +688,9 @@ async def list_accounts(
685688
size or filters. This is not just listing the
686689
sub-accounts of an MCA, but all accounts the calling
687690
user has access to including other MCAs, linked
688-
accounts, standalone accounts and so on.
691+
accounts, standalone accounts and so on. If no filter is
692+
provided, then it returns accounts the user is directly
693+
added to.
689694
690695
.. code-block:: python
691696

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/accounts_service/client.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -904,9 +904,12 @@ def delete_account(
904904
metadata: Sequence[Tuple[str, str]] = (),
905905
) -> None:
906906
r"""Deletes the specified account regardless of its type:
907-
standalone, MCA or sub-account. Deleting an MCA leads to
908-
the deletion of all of its sub-accounts. Executing this
909-
method requires admin access.
907+
standalone, MCA or sub-account. Deleting an MCA leads to the
908+
deletion of all of its sub-accounts. Executing this method
909+
requires admin access. The deletion succeeds only if the account
910+
does not provide services to any other account and has no
911+
processed offers. You can use the ``force`` parameter to
912+
override this.
910913
911914
.. code-block:: python
912915
@@ -1118,7 +1121,9 @@ def list_accounts(
11181121
size or filters. This is not just listing the
11191122
sub-accounts of an MCA, but all accounts the calling
11201123
user has access to including other MCAs, linked
1121-
accounts, standalone accounts and so on.
1124+
accounts, standalone accounts and so on. If no filter is
1125+
provided, then it returns accounts the user is directly
1126+
added to.
11221127
11231128
.. code-block:: python
11241129

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/accounts_service/transports/grpc.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,12 @@ def delete_account(
297297
r"""Return a callable for the delete account method over gRPC.
298298
299299
Deletes the specified account regardless of its type:
300-
standalone, MCA or sub-account. Deleting an MCA leads to
301-
the deletion of all of its sub-accounts. Executing this
302-
method requires admin access.
300+
standalone, MCA or sub-account. Deleting an MCA leads to the
301+
deletion of all of its sub-accounts. Executing this method
302+
requires admin access. The deletion succeeds only if the account
303+
does not provide services to any other account and has no
304+
processed offers. You can use the ``force`` parameter to
305+
override this.
303306
304307
Returns:
305308
Callable[[~.DeleteAccountRequest],
@@ -358,7 +361,9 @@ def list_accounts(
358361
size or filters. This is not just listing the
359362
sub-accounts of an MCA, but all accounts the calling
360363
user has access to including other MCAs, linked
361-
accounts, standalone accounts and so on.
364+
accounts, standalone accounts and so on. If no filter is
365+
provided, then it returns accounts the user is directly
366+
added to.
362367
363368
Returns:
364369
Callable[[~.ListAccountsRequest],

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/accounts_service/transports/grpc_asyncio.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,12 @@ def delete_account(
305305
r"""Return a callable for the delete account method over gRPC.
306306
307307
Deletes the specified account regardless of its type:
308-
standalone, MCA or sub-account. Deleting an MCA leads to
309-
the deletion of all of its sub-accounts. Executing this
310-
method requires admin access.
308+
standalone, MCA or sub-account. Deleting an MCA leads to the
309+
deletion of all of its sub-accounts. Executing this method
310+
requires admin access. The deletion succeeds only if the account
311+
does not provide services to any other account and has no
312+
processed offers. You can use the ``force`` parameter to
313+
override this.
311314
312315
Returns:
313316
Callable[[~.DeleteAccountRequest],
@@ -368,7 +371,9 @@ def list_accounts(
368371
size or filters. This is not just listing the
369372
sub-accounts of an MCA, but all accounts the calling
370373
user has access to including other MCAs, linked
371-
accounts, standalone accounts and so on.
374+
accounts, standalone accounts and so on. If no filter is
375+
provided, then it returns accounts the user is directly
376+
added to.
372377
373378
Returns:
374379
Callable[[~.ListAccountsRequest],

‎packages/google-shopping-merchant-accounts/google/shopping/merchant_accounts_v1beta/services/autofeed_settings_service/__init__.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2024 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
from .async_client import AutofeedSettingsServiceAsyncClient
17+
from .client import AutofeedSettingsServiceClient
18+
19+
__all__ = (
20+
"AutofeedSettingsServiceClient",
21+
"AutofeedSettingsServiceAsyncClient",
22+
)

0 commit comments

Comments
 (0)