Skip to content

Commit

Permalink
fix(deps): require google-api-core>=1.32.0,>=2.8.0 (#177)
Browse files Browse the repository at this point in the history
- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 459095142

Source-Link: googleapis/googleapis@4f1be99

Source-Link: googleapis/googleapis-gen@ae686d9
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWU2ODZkOWNkZTRmYzNlMzZkMGFjMDJlZmI4NjQzYjE1ODkwYzFlZCJ9

feat: ITAR June Preview Launch
Committer: @Guisin
PiperOrigin-RevId: 458302463

Source-Link: googleapis/googleapis@523fdaf

Source-Link: googleapis/googleapis-gen@b3f1325
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjNmMTMyNWFmOGJkZmMxOWQ5MmQzNGVlYzAyZTA2Y2RiZWQxNDQ3OSJ9

feat: add audience parameter
PiperOrigin-RevId: 456827138

Source-Link: googleapis/googleapis@23f1a15

Source-Link: googleapis/googleapis-gen@4075a85
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDA3NWE4NTE0ZjY3NjY5MWVjMTU2Njg4YTViYmYxODNhYTk4OTNjZSJ9
  • Loading branch information
gcf-owl-bot[bot] authored Jul 16, 2022
1 parent 7b5b1a7 commit bf2d3e8
Show file tree
Hide file tree
Showing 26 changed files with 156 additions and 41 deletions.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ async def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"
request = assuredworkloads_v1.CreateWorkloadRequest(
Expand Down Expand Up @@ -362,7 +362,7 @@ async def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"
request = assuredworkloads_v1.UpdateWorkloadRequest(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ def __init__(
quota_project_id=client_options.quota_project_id,
client_info=client_info,
always_use_jwt_access=True,
api_audience=client_options.api_audience,
)

def create_workload(
Expand All @@ -453,7 +454,7 @@ def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"
request = assuredworkloads_v1.CreateWorkloadRequest(
Expand Down Expand Up @@ -579,7 +580,7 @@ def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"
request = assuredworkloads_v1.UpdateWorkloadRequest(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def __init__(
quota_project_id: Optional[str] = None,
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
always_use_jwt_access: Optional[bool] = False,
api_audience: Optional[str] = None,
**kwargs,
) -> None:
"""Instantiate the transport.
Expand Down Expand Up @@ -84,11 +85,6 @@ def __init__(
be used for service account credentials.
"""

# Save the hostname. Default to port 443 (HTTPS) if none is specified.
if ":" not in host:
host += ":443"
self._host = host

scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}

# Save the scopes.
Expand All @@ -109,6 +105,11 @@ def __init__(
credentials, _ = google.auth.default(
**scopes_kwargs, quota_project_id=quota_project_id
)
# Don't apply audience if the credentials file passed from user.
if hasattr(credentials, "with_gdch_audience"):
credentials = credentials.with_gdch_audience(
api_audience if api_audience else host
)

# If the credentials are service account credentials, then always try to use self signed JWT.
if (
Expand All @@ -121,6 +122,11 @@ def __init__(
# Save the credentials.
self._credentials = credentials

# Save the hostname. Default to port 443 (HTTPS) if none is specified.
if ":" not in host:
host += ":443"
self._host = host

def _prep_wrapped_messages(self, client_info):
# Precompute the wrapped methods.
self._wrapped_methods = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def __init__(
quota_project_id: Optional[str] = None,
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
always_use_jwt_access: Optional[bool] = False,
api_audience: Optional[str] = None,
) -> None:
"""Instantiate the transport.
Expand Down Expand Up @@ -157,6 +158,7 @@ def __init__(
quota_project_id=quota_project_id,
client_info=client_info,
always_use_jwt_access=always_use_jwt_access,
api_audience=api_audience,
)

if not self._grpc_channel:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def __init__(
quota_project_id=None,
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
always_use_jwt_access: Optional[bool] = False,
api_audience: Optional[str] = None,
) -> None:
"""Instantiate the transport.
Expand Down Expand Up @@ -202,6 +203,7 @@ def __init__(
quota_project_id=quota_project_id,
client_info=client_info,
always_use_jwt_access=always_use_jwt_access,
api_audience=api_audience,
)

if not self._grpc_channel:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ class ComplianceRegime(proto.Enum):
HITRUST = 7
EU_REGIONS_AND_SUPPORT = 8
CA_REGIONS_AND_SUPPORT = 9
ITAR = 10

class KajEnrollmentState(proto.Enum):
r"""Key Access Justifications(KAJ) Enrollment State."""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ async def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
request = assuredworkloads_v1beta1.CreateWorkloadRequest(
parent="parent_value",
Expand Down Expand Up @@ -363,7 +363,7 @@ async def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
request = assuredworkloads_v1beta1.UpdateWorkloadRequest(
workload=workload,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ def __init__(
quota_project_id=client_options.quota_project_id,
client_info=client_info,
always_use_jwt_access=True,
api_audience=client_options.api_audience,
)

def create_workload(
Expand All @@ -455,7 +456,7 @@ def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
request = assuredworkloads_v1beta1.CreateWorkloadRequest(
parent="parent_value",
Expand Down Expand Up @@ -580,7 +581,7 @@ def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
request = assuredworkloads_v1beta1.UpdateWorkloadRequest(
workload=workload,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def __init__(
quota_project_id: Optional[str] = None,
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
always_use_jwt_access: Optional[bool] = False,
api_audience: Optional[str] = None,
**kwargs,
) -> None:
"""Instantiate the transport.
Expand Down Expand Up @@ -84,11 +85,6 @@ def __init__(
be used for service account credentials.
"""

# Save the hostname. Default to port 443 (HTTPS) if none is specified.
if ":" not in host:
host += ":443"
self._host = host

scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}

# Save the scopes.
Expand All @@ -109,6 +105,11 @@ def __init__(
credentials, _ = google.auth.default(
**scopes_kwargs, quota_project_id=quota_project_id
)
# Don't apply audience if the credentials file passed from user.
if hasattr(credentials, "with_gdch_audience"):
credentials = credentials.with_gdch_audience(
api_audience if api_audience else host
)

# If the credentials are service account credentials, then always try to use self signed JWT.
if (
Expand All @@ -121,6 +122,11 @@ def __init__(
# Save the credentials.
self._credentials = credentials

# Save the hostname. Default to port 443 (HTTPS) if none is specified.
if ":" not in host:
host += ":443"
self._host = host

def _prep_wrapped_messages(self, client_info):
# Precompute the wrapped methods.
self._wrapped_methods = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def __init__(
quota_project_id: Optional[str] = None,
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
always_use_jwt_access: Optional[bool] = False,
api_audience: Optional[str] = None,
) -> None:
"""Instantiate the transport.
Expand Down Expand Up @@ -157,6 +158,7 @@ def __init__(
quota_project_id=quota_project_id,
client_info=client_info,
always_use_jwt_access=always_use_jwt_access,
api_audience=api_audience,
)

if not self._grpc_channel:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ def __init__(
quota_project_id=None,
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
always_use_jwt_access: Optional[bool] = False,
api_audience: Optional[str] = None,
) -> None:
"""Instantiate the transport.
Expand Down Expand Up @@ -202,6 +203,7 @@ def __init__(
quota_project_id=quota_project_id,
client_info=client_info,
always_use_jwt_access=always_use_jwt_access,
api_audience=api_audience,
)

if not self._grpc_channel:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ class ComplianceRegime(proto.Enum):
HITRUST = 7
EU_REGIONS_AND_SUPPORT = 8
CA_REGIONS_AND_SUPPORT = 9
ITAR = 10

class KajEnrollmentState(proto.Enum):
r"""Key Access Justifications(KAJ) Enrollment State."""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"

request = assuredworkloads_v1.CreateWorkloadRequest(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"

request = assuredworkloads_v1.CreateWorkloadRequest(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"

request = assuredworkloads_v1.UpdateWorkloadRequest(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"
workload.billing_account = "billing_account_value"

request = assuredworkloads_v1.UpdateWorkloadRequest(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"

request = assuredworkloads_v1beta1.CreateWorkloadRequest(
parent="parent_value",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def sample_create_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"

request = assuredworkloads_v1beta1.CreateWorkloadRequest(
parent="parent_value",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ async def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"

request = assuredworkloads_v1beta1.UpdateWorkloadRequest(
workload=workload,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def sample_update_workload():
# Initialize request argument(s)
workload = assuredworkloads_v1beta1.Workload()
workload.display_name = "display_name_value"
workload.compliance_regime = "CA_REGIONS_AND_SUPPORT"
workload.compliance_regime = "ITAR"

request = assuredworkloads_v1beta1.UpdateWorkloadRequest(
workload=workload,
Expand Down
5 changes: 1 addition & 4 deletions packages/google-cloud-assured-workloads/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@
platforms="Posix; MacOS X; Windows",
include_package_data=True,
install_requires=(
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
# Until this issue is closed
# https://github.com/googleapis/google-cloud-python/issues/10566
"google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
"google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
"proto-plus >= 1.15.0, <2.0.0dev",
"protobuf >= 3.19.0, <4.0.0dev",
),
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
#
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
# Then this file should have foo==1.14.0
google-api-core==1.31.5
google-api-core==1.32.0
proto-plus==1.15.0
protobuf==3.19.0
Loading

0 comments on commit bf2d3e8

Please sign in to comment.