feat: mark ChannelPartnerGranularity as deprecated and offer alternat…

…ives (#11636) Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Sep 8, 2023 · 8de7cc7 · 8de7cc7
1 parent e547532
commit 8de7cc7
Show file tree

Hide file tree

Showing 31 changed files with 1,343 additions and 161 deletions.
diff --git a/packages/google-cloud-channel/.flake8 b/packages/google-cloud-channel/.flake8
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2020 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.

diff --git a/packages/google-cloud-channel/CONTRIBUTING.rst b/packages/google-cloud-channel/CONTRIBUTING.rst
@@ -236,7 +236,7 @@ We support:
 
 Supported versions can be found in our ``noxfile.py`` `config`_.
 
-.. _config: https://github.com/googleapis/google-cloud-python/blob/main/noxfile.py
+.. _config: https://github.com/googleapis/google-cloud-python/blob/main/packages/google-cloud-channel/noxfile.py
 
 
 **********

diff --git a/packages/google-cloud-channel/MANIFEST.in b/packages/google-cloud-channel/MANIFEST.in
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2020 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.

diff --git a/packages/google-cloud-channel/README.rst b/packages/google-cloud-channel/README.rst
@@ -36,21 +36,24 @@ In order to use this library, you first need to go through the following steps:
 Installation
 ~~~~~~~~~~~~
 
-Install this library in a `virtualenv`_ using pip. `virtualenv`_ is a tool to
-create isolated Python environments. The basic problem it addresses is one of
-dependencies and versions, and indirectly permissions.
+Install this library in a virtual environment using `venv`_. `venv`_ is a tool that
+creates isolated Python environments. These isolated environments can have separate
+versions of Python packages, which allows you to isolate one project's dependencies
+from the dependencies of other projects.
 
-With `virtualenv`_, it's possible to install this library without needing system
+With `venv`_, it's possible to install this library without needing system
 install permissions, and without clashing with the installed system
 dependencies.
 
-.. _`virtualenv`: https://virtualenv.pypa.io/en/latest/
+.. _`venv`: https://docs.python.org/3/library/venv.html
 
 
 Code samples and snippets
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Code samples and snippets live in the `samples/` folder.
+Code samples and snippets live in the `samples/`_ folder.
+
+.. _samples/: https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-channel/samples
 
 
 Supported Python Versions
@@ -77,21 +80,19 @@ Mac/Linux
 
 .. code-block:: console
 
-    pip install virtualenv
-    virtualenv <your-env>
+    python3 -m venv <your-env>
     source <your-env>/bin/activate
-    <your-env>/bin/pip install google-cloud-channel
+    pip install google-cloud-channel
 
 
 Windows
 ^^^^^^^
 
 .. code-block:: console
 
-    pip install virtualenv
-    virtualenv <your-env>
-    <your-env>\Scripts\activate
-    <your-env>\Scripts\pip.exe install google-cloud-channel
+    py -m venv <your-env>
+    .\<your-env>\Scripts\activate
+    pip install google-cloud-channel
 
 Next Steps
 ~~~~~~~~~~

diff --git a/packages/google-cloud-channel/docs/conf.py b/packages/google-cloud-channel/docs/conf.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2021 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.

diff --git a/packages/google-cloud-channel/google/cloud/channel/__init__.py b/packages/google-cloud-channel/google/cloud/channel/__init__.py
@@ -30,6 +30,7 @@
 from google.cloud.channel_v1.services.cloud_channel_service.client import (
     CloudChannelServiceClient,
 )
+from google.cloud.channel_v1.types.billing_accounts import BillingAccount
 from google.cloud.channel_v1.types.channel_partner_links import (
     ChannelPartnerLink,
     ChannelPartnerLinkState,
@@ -109,6 +110,7 @@
 from google.cloud.channel_v1.types.service import (
     ActivateEntitlementRequest,
     BillableSku,
+    BillingAccountPurchaseInfo,
     CancelEntitlementRequest,
     ChangeOfferRequest,
     ChangeParametersRequest,
@@ -166,9 +168,12 @@
     ProvisionCloudIdentityRequest,
     PurchasableOffer,
     PurchasableSku,
+    QueryEligibleBillingAccountsRequest,
+    QueryEligibleBillingAccountsResponse,
     RegisterSubscriberRequest,
     RegisterSubscriberResponse,
     SkuGroup,
+    SkuPurchaseGroup,
     StartPaidServiceRequest,
     SuspendEntitlementRequest,
     TransferableOffer,
@@ -193,6 +198,7 @@
     "CloudChannelReportsServiceAsyncClient",
     "CloudChannelServiceClient",
     "CloudChannelServiceAsyncClient",
+    "BillingAccount",
     "ChannelPartnerLink",
     "ChannelPartnerLinkState",
     "ChannelPartnerLinkView",
@@ -258,6 +264,7 @@
     "RebillingBasis",
     "ActivateEntitlementRequest",
     "BillableSku",
+    "BillingAccountPurchaseInfo",
     "CancelEntitlementRequest",
     "ChangeOfferRequest",
     "ChangeParametersRequest",
@@ -315,9 +322,12 @@
     "ProvisionCloudIdentityRequest",
     "PurchasableOffer",
     "PurchasableSku",
+    "QueryEligibleBillingAccountsRequest",
+    "QueryEligibleBillingAccountsResponse",
     "RegisterSubscriberRequest",
     "RegisterSubscriberResponse",
     "SkuGroup",
+    "SkuPurchaseGroup",
     "StartPaidServiceRequest",
     "SuspendEntitlementRequest",
     "TransferableOffer",

diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py b/packages/google-cloud-channel/google/cloud/channel_v1/__init__.py
@@ -26,6 +26,7 @@
     CloudChannelServiceAsyncClient,
     CloudChannelServiceClient,
 )
+from .types.billing_accounts import BillingAccount
 from .types.channel_partner_links import (
     ChannelPartnerLink,
     ChannelPartnerLinkState,
@@ -94,6 +95,7 @@
 from .types.service import (
     ActivateEntitlementRequest,
     BillableSku,
+    BillingAccountPurchaseInfo,
     CancelEntitlementRequest,
     ChangeOfferRequest,
     ChangeParametersRequest,
@@ -151,9 +153,12 @@
     ProvisionCloudIdentityRequest,
     PurchasableOffer,
     PurchasableSku,
+    QueryEligibleBillingAccountsRequest,
+    QueryEligibleBillingAccountsResponse,
     RegisterSubscriberRequest,
     RegisterSubscriberResponse,
     SkuGroup,
+    SkuPurchaseGroup,
     StartPaidServiceRequest,
     SuspendEntitlementRequest,
     TransferableOffer,
@@ -176,6 +181,8 @@
     "AdminUser",
     "AssociationInfo",
     "BillableSku",
+    "BillingAccount",
+    "BillingAccountPurchaseInfo",
     "CancelEntitlementRequest",
     "ChangeOfferRequest",
     "ChangeParametersRequest",
@@ -278,6 +285,8 @@
     "ProvisionedService",
     "PurchasableOffer",
     "PurchasableSku",
+    "QueryEligibleBillingAccountsRequest",
+    "QueryEligibleBillingAccountsResponse",
     "RebillingBasis",
     "RegisterSubscriberRequest",
     "RegisterSubscriberResponse",
@@ -297,6 +306,7 @@
     "Sku",
     "SkuGroup",
     "SkuGroupCondition",
+    "SkuPurchaseGroup",
     "StartPaidServiceRequest",
     "SubscriberEvent",
     "SuspendEntitlementRequest",

diff --git a/packages/google-cloud-channel/google/cloud/channel_v1/gapic_metadata.json b/packages/google-cloud-channel/google/cloud/channel_v1/gapic_metadata.json
@@ -244,6 +244,11 @@
                 "provision_cloud_identity"
               ]
             },
+            "QueryEligibleBillingAccounts": {
+              "methods": [
+                "query_eligible_billing_accounts"
+              ]
+            },
             "RegisterSubscriber": {
               "methods": [
                 "register_subscriber"
@@ -489,6 +494,11 @@
                 "provision_cloud_identity"
               ]
             },
+            "QueryEligibleBillingAccounts": {
+              "methods": [
+                "query_eligible_billing_accounts"
+              ]
+            },
             "RegisterSubscriber": {
               "methods": [
                 "register_subscriber"

diff --git a/...ud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py b/...ud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/async_client.py
@@ -44,7 +44,7 @@
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.longrunning import operations_pb2
+from google.longrunning import operations_pb2  # type: ignore
 
 from google.cloud.channel_v1.services.cloud_channel_reports_service import pagers
 from google.cloud.channel_v1.types import operations, reports_service

diff --git a/...le-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py b/...le-cloud-channel/google/cloud/channel_v1/services/cloud_channel_reports_service/client.py
@@ -48,7 +48,7 @@
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.longrunning import operations_pb2
+from google.longrunning import operations_pb2  # type: ignore
 
 from google.cloud.channel_v1.services.cloud_channel_reports_service import pagers
 from google.cloud.channel_v1.types import operations, reports_service