Skip to content

Commit 6e10b00

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix(deps): require google-api-core>=1.32.0,>=2.8.0 (#236)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 459095142 Source-Link: googleapis/googleapis@4f1be99 Source-Link: googleapis/googleapis-gen@ae686d9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWU2ODZkOWNkZTRmYzNlMzZkMGFjMDJlZmI4NjQzYjE1ODkwYzFlZCJ9 feat: release the Google Analytics Admin API V1 Beta PiperOrigin-RevId: 458479633 Source-Link: googleapis/googleapis@6ef569e Source-Link: googleapis/googleapis-gen@e375910 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTM3NTkxMDM0YjcxNzI4ZmNkNjFhY2Q2MWIwYmUwY2FhNzYyNWM5ZSJ9 feat: add audience parameter PiperOrigin-RevId: 456827138 Source-Link: googleapis/googleapis@23f1a15 Source-Link: googleapis/googleapis-gen@4075a85 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDA3NWE4NTE0ZjY3NjY5MWVjMTU2Njg4YTViYmYxODNhYTk4OTNjZSJ9
1 parent 89cc398 commit 6e10b00

File tree

125 files changed

+46823
-20
lines changed

Some content is hidden

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

125 files changed

+46823
-20
lines changed

‎packages/google-analytics-admin/docs/admin_v1beta/analytics_admin_service.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
AnalyticsAdminService
2+
---------------------------------------
3+
4+
.. automodule:: google.analytics.admin_v1beta.services.analytics_admin_service
5+
:members:
6+
:inherited-members:
7+
8+
.. automodule:: google.analytics.admin_v1beta.services.analytics_admin_service.pagers
9+
:members:
10+
:inherited-members:

‎packages/google-analytics-admin/docs/admin_v1beta/services.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Services for Google Analytics Admin v1beta API
2+
==============================================
3+
.. toctree::
4+
:maxdepth: 2
5+
6+
analytics_admin_service

‎packages/google-analytics-admin/docs/admin_v1beta/types.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Types for Google Analytics Admin v1beta API
2+
===========================================
3+
4+
.. automodule:: google.analytics.admin_v1beta.types
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

‎packages/google-analytics-admin/docs/index.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
.. include:: multiprocessing.rst
44

5+
This package includes clients for multiple versions of Analytics Admin.
6+
By default, you will get version ``admin_v1alpha``.
7+
58

69
API Reference
710
-------------
@@ -11,6 +14,14 @@ API Reference
1114
admin_v1alpha/services
1215
admin_v1alpha/types
1316

17+
API Reference
18+
-------------
19+
.. toctree::
20+
:maxdepth: 2
21+
22+
admin_v1beta/services
23+
admin_v1beta/types
24+
1425

1526
Changelog
1627
---------

‎packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ def __init__(
715715
quota_project_id=client_options.quota_project_id,
716716
client_info=client_info,
717717
always_use_jwt_access=True,
718+
api_audience=client_options.api_audience,
718719
)
719720

720721
def get_account(

‎packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/base.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ def __init__(
6060
quota_project_id: Optional[str] = None,
6161
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
6262
always_use_jwt_access: Optional[bool] = False,
63+
api_audience: Optional[str] = None,
6364
**kwargs,
6465
) -> None:
6566
"""Instantiate the transport.
@@ -87,11 +88,6 @@ def __init__(
8788
be used for service account credentials.
8889
"""
8990

90-
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
91-
if ":" not in host:
92-
host += ":443"
93-
self._host = host
94-
9591
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9692

9793
# Save the scopes.
@@ -112,6 +108,11 @@ def __init__(
112108
credentials, _ = google.auth.default(
113109
**scopes_kwargs, quota_project_id=quota_project_id
114110
)
111+
# Don't apply audience if the credentials file passed from user.
112+
if hasattr(credentials, "with_gdch_audience"):
113+
credentials = credentials.with_gdch_audience(
114+
api_audience if api_audience else host
115+
)
115116

116117
# If the credentials are service account credentials, then always try to use self signed JWT.
117118
if (
@@ -124,6 +125,11 @@ def __init__(
124125
# Save the credentials.
125126
self._credentials = credentials
126127

128+
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
129+
if ":" not in host:
130+
host += ":443"
131+
self._host = host
132+
127133
def _prep_wrapped_messages(self, client_info):
128134
# Precompute the wrapped methods.
129135
self._wrapped_methods = {

‎packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ def __init__(
5858
quota_project_id: Optional[str] = None,
5959
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
6060
always_use_jwt_access: Optional[bool] = False,
61+
api_audience: Optional[str] = None,
6162
) -> None:
6263
"""Instantiate the transport.
6364
@@ -153,6 +154,7 @@ def __init__(
153154
quota_project_id=quota_project_id,
154155
client_info=client_info,
155156
always_use_jwt_access=always_use_jwt_access,
157+
api_audience=api_audience,
156158
)
157159

158160
if not self._grpc_channel:

‎packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ def __init__(
103103
quota_project_id=None,
104104
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
105105
always_use_jwt_access: Optional[bool] = False,
106+
api_audience: Optional[str] = None,
106107
) -> None:
107108
"""Instantiate the transport.
108109
@@ -198,6 +199,7 @@ def __init__(
198199
quota_project_id=quota_project_id,
199200
client_info=client_info,
200201
always_use_jwt_access=always_use_jwt_access,
202+
api_audience=api_audience,
201203
)
202204

203205
if not self._grpc_channel:

‎packages/google-analytics-admin/google/analytics/admin_v1beta/__init__.py‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright 2022 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+
17+
from .services.analytics_admin_service import (
18+
AnalyticsAdminServiceAsyncClient,
19+
AnalyticsAdminServiceClient,
20+
)
21+
from .types.analytics_admin import (
22+
AcknowledgeUserDataCollectionRequest,
23+
AcknowledgeUserDataCollectionResponse,
24+
ArchiveCustomDimensionRequest,
25+
ArchiveCustomMetricRequest,
26+
CreateConversionEventRequest,
27+
CreateCustomDimensionRequest,
28+
CreateCustomMetricRequest,
29+
CreateDataStreamRequest,
30+
CreateFirebaseLinkRequest,
31+
CreateGoogleAdsLinkRequest,
32+
CreateMeasurementProtocolSecretRequest,
33+
CreatePropertyRequest,
34+
DeleteAccountRequest,
35+
DeleteConversionEventRequest,
36+
DeleteDataStreamRequest,
37+
DeleteFirebaseLinkRequest,
38+
DeleteGoogleAdsLinkRequest,
39+
DeleteMeasurementProtocolSecretRequest,
40+
DeletePropertyRequest,
41+
GetAccountRequest,
42+
GetConversionEventRequest,
43+
GetCustomDimensionRequest,
44+
GetCustomMetricRequest,
45+
GetDataRetentionSettingsRequest,
46+
GetDataSharingSettingsRequest,
47+
GetDataStreamRequest,
48+
GetMeasurementProtocolSecretRequest,
49+
GetPropertyRequest,
50+
ListAccountsRequest,
51+
ListAccountsResponse,
52+
ListAccountSummariesRequest,
53+
ListAccountSummariesResponse,
54+
ListConversionEventsRequest,
55+
ListConversionEventsResponse,
56+
ListCustomDimensionsRequest,
57+
ListCustomDimensionsResponse,
58+
ListCustomMetricsRequest,
59+
ListCustomMetricsResponse,
60+
ListDataStreamsRequest,
61+
ListDataStreamsResponse,
62+
ListFirebaseLinksRequest,
63+
ListFirebaseLinksResponse,
64+
ListGoogleAdsLinksRequest,
65+
ListGoogleAdsLinksResponse,
66+
ListMeasurementProtocolSecretsRequest,
67+
ListMeasurementProtocolSecretsResponse,
68+
ListPropertiesRequest,
69+
ListPropertiesResponse,
70+
ProvisionAccountTicketRequest,
71+
ProvisionAccountTicketResponse,
72+
SearchChangeHistoryEventsRequest,
73+
SearchChangeHistoryEventsResponse,
74+
UpdateAccountRequest,
75+
UpdateCustomDimensionRequest,
76+
UpdateCustomMetricRequest,
77+
UpdateDataRetentionSettingsRequest,
78+
UpdateDataStreamRequest,
79+
UpdateGoogleAdsLinkRequest,
80+
UpdateMeasurementProtocolSecretRequest,
81+
UpdatePropertyRequest,
82+
)
83+
from .types.resources import (
84+
Account,
85+
AccountSummary,
86+
ActionType,
87+
ActorType,
88+
ChangeHistoryChange,
89+
ChangeHistoryEvent,
90+
ChangeHistoryResourceType,
91+
ConversionEvent,
92+
CustomDimension,
93+
CustomMetric,
94+
DataRetentionSettings,
95+
DataSharingSettings,
96+
DataStream,
97+
FirebaseLink,
98+
GoogleAdsLink,
99+
IndustryCategory,
100+
MeasurementProtocolSecret,
101+
Property,
102+
PropertySummary,
103+
PropertyType,
104+
ServiceLevel,
105+
)
106+
107+
__all__ = (
108+
"AnalyticsAdminServiceAsyncClient",
109+
"Account",
110+
"AccountSummary",
111+
"AcknowledgeUserDataCollectionRequest",
112+
"AcknowledgeUserDataCollectionResponse",
113+
"ActionType",
114+
"ActorType",
115+
"AnalyticsAdminServiceClient",
116+
"ArchiveCustomDimensionRequest",
117+
"ArchiveCustomMetricRequest",
118+
"ChangeHistoryChange",
119+
"ChangeHistoryEvent",
120+
"ChangeHistoryResourceType",
121+
"ConversionEvent",
122+
"CreateConversionEventRequest",
123+
"CreateCustomDimensionRequest",
124+
"CreateCustomMetricRequest",
125+
"CreateDataStreamRequest",
126+
"CreateFirebaseLinkRequest",
127+
"CreateGoogleAdsLinkRequest",
128+
"CreateMeasurementProtocolSecretRequest",
129+
"CreatePropertyRequest",
130+
"CustomDimension",
131+
"CustomMetric",
132+
"DataRetentionSettings",
133+
"DataSharingSettings",
134+
"DataStream",
135+
"DeleteAccountRequest",
136+
"DeleteConversionEventRequest",
137+
"DeleteDataStreamRequest",
138+
"DeleteFirebaseLinkRequest",
139+
"DeleteGoogleAdsLinkRequest",
140+
"DeleteMeasurementProtocolSecretRequest",
141+
"DeletePropertyRequest",
142+
"FirebaseLink",
143+
"GetAccountRequest",
144+
"GetConversionEventRequest",
145+
"GetCustomDimensionRequest",
146+
"GetCustomMetricRequest",
147+
"GetDataRetentionSettingsRequest",
148+
"GetDataSharingSettingsRequest",
149+
"GetDataStreamRequest",
150+
"GetMeasurementProtocolSecretRequest",
151+
"GetPropertyRequest",
152+
"GoogleAdsLink",
153+
"IndustryCategory",
154+
"ListAccountSummariesRequest",
155+
"ListAccountSummariesResponse",
156+
"ListAccountsRequest",
157+
"ListAccountsResponse",
158+
"ListConversionEventsRequest",
159+
"ListConversionEventsResponse",
160+
"ListCustomDimensionsRequest",
161+
"ListCustomDimensionsResponse",
162+
"ListCustomMetricsRequest",
163+
"ListCustomMetricsResponse",
164+
"ListDataStreamsRequest",
165+
"ListDataStreamsResponse",
166+
"ListFirebaseLinksRequest",
167+
"ListFirebaseLinksResponse",
168+
"ListGoogleAdsLinksRequest",
169+
"ListGoogleAdsLinksResponse",
170+
"ListMeasurementProtocolSecretsRequest",
171+
"ListMeasurementProtocolSecretsResponse",
172+
"ListPropertiesRequest",
173+
"ListPropertiesResponse",
174+
"MeasurementProtocolSecret",
175+
"Property",
176+
"PropertySummary",
177+
"PropertyType",
178+
"ProvisionAccountTicketRequest",
179+
"ProvisionAccountTicketResponse",
180+
"SearchChangeHistoryEventsRequest",
181+
"SearchChangeHistoryEventsResponse",
182+
"ServiceLevel",
183+
"UpdateAccountRequest",
184+
"UpdateCustomDimensionRequest",
185+
"UpdateCustomMetricRequest",
186+
"UpdateDataRetentionSettingsRequest",
187+
"UpdateDataStreamRequest",
188+
"UpdateGoogleAdsLinkRequest",
189+
"UpdateMeasurementProtocolSecretRequest",
190+
"UpdatePropertyRequest",
191+
)

0 commit comments

Comments
 (0)