Skip to content

Commit 513f7b4

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: Add compliant_but_disallowed_services field to the v1beta1 Workload proto (#201)
* feat: Add compliant_but_disallowed_services field to the v1beta1 Workload proto Committer: @samhutton PiperOrigin-RevId: 471822190 Source-Link: googleapis/googleapis@61f75b4 Source-Link: googleapis/googleapis-gen@9abf7bc Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOWFiZjdiYzI3MTU3MGY3MDczYzg5YzBkNGJlYjNiODZhNjY2NzhjYiJ9 * 🦉 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>
1 parent 4f7a0ba commit 513f7b4

6 files changed

Lines changed: 44 additions & 12 deletions

File tree

‎packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/async_client.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -736,9 +736,8 @@ async def analyze_workload_move(
736736
timeout: float = None,
737737
metadata: Sequence[Tuple[str, str]] = (),
738738
) -> assuredworkloads.AnalyzeWorkloadMoveResponse:
739-
r"""A request to analyze a hypothetical move of a source
740-
project or project-based workload to a target
741-
(destination) folder-based workload.
739+
r"""Analyze if the source Assured Workloads can be moved
740+
to the target Assured Workload
742741
743742
.. code-block:: python
744743

‎packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/client.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -939,9 +939,8 @@ def analyze_workload_move(
939939
timeout: float = None,
940940
metadata: Sequence[Tuple[str, str]] = (),
941941
) -> assuredworkloads.AnalyzeWorkloadMoveResponse:
942-
r"""A request to analyze a hypothetical move of a source
943-
project or project-based workload to a target
944-
(destination) folder-based workload.
942+
r"""Analyze if the source Assured Workloads can be moved
943+
to the target Assured Workload
945944
946945
.. code-block:: python
947946

‎packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,8 @@ def analyze_workload_move(
405405
]:
406406
r"""Return a callable for the analyze workload move method over gRPC.
407407
408-
A request to analyze a hypothetical move of a source
409-
project or project-based workload to a target
410-
(destination) folder-based workload.
408+
Analyze if the source Assured Workloads can be moved
409+
to the target Assured Workload
411410
412411
Returns:
413412
Callable[[~.AnalyzeWorkloadMoveRequest],

‎packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/services/assured_workloads_service/transports/grpc_asyncio.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,8 @@ def analyze_workload_move(
416416
]:
417417
r"""Return a callable for the analyze workload move method over gRPC.
418418
419-
A request to analyze a hypothetical move of a source
420-
project or project-based workload to a target
421-
(destination) folder-based workload.
419+
Analyze if the source Assured Workloads can be moved
420+
to the target Assured Workload
422421
423422
Returns:
424423
Callable[[~.AnalyzeWorkloadMoveRequest],

‎packages/google-cloud-assured-workloads/google/cloud/assuredworkloads_v1beta1/types/assuredworkloads.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,14 @@ class Workload(proto.Message):
419419
response is queried during GetWorkload call. In
420420
failure cases, user friendly error message is
421421
shown in SAA details page.
422+
compliant_but_disallowed_services (Sequence[str]):
423+
Output only. Urls for services which are
424+
compliant for this Assured Workload, but which
425+
are currently disallowed by the
426+
ResourceUsageRestriction org policy. Invoke
427+
RestrictAllowedResources endpoint to allow your
428+
project developers to use these services in
429+
their environment.".
422430
"""
423431

424432
class ComplianceRegime(proto.Enum):
@@ -722,6 +730,10 @@ class SetupError(proto.Enum):
722730
number=20,
723731
message=SaaEnrollmentResponse,
724732
)
733+
compliant_but_disallowed_services = proto.RepeatedField(
734+
proto.STRING,
735+
number=24,
736+
)
725737

726738

727739
class CreateWorkloadOperationMetadata(proto.Message):

‎packages/google-cloud-assured-workloads/tests/unit/gapic/assuredworkloads_v1beta1/test_assured_workloads_service.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,9 @@ def test_update_workload(request_type, transport: str = "grpc"):
986986
provisioned_resources_parent="provisioned_resources_parent_value",
987987
kaj_enrollment_state=assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING,
988988
enable_sovereign_controls=True,
989+
compliant_but_disallowed_services=[
990+
"compliant_but_disallowed_services_value"
991+
],
989992
il4_settings=assuredworkloads.Workload.IL4Settings(
990993
kms_settings=assuredworkloads.Workload.KMSSettings(
991994
next_rotation_time=timestamp_pb2.Timestamp(seconds=751)
@@ -1012,6 +1015,9 @@ def test_update_workload(request_type, transport: str = "grpc"):
10121015
== assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING
10131016
)
10141017
assert response.enable_sovereign_controls is True
1018+
assert response.compliant_but_disallowed_services == [
1019+
"compliant_but_disallowed_services_value"
1020+
]
10151021

10161022

10171023
def test_update_workload_empty_call():
@@ -1056,6 +1062,9 @@ async def test_update_workload_async(
10561062
provisioned_resources_parent="provisioned_resources_parent_value",
10571063
kaj_enrollment_state=assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING,
10581064
enable_sovereign_controls=True,
1065+
compliant_but_disallowed_services=[
1066+
"compliant_but_disallowed_services_value"
1067+
],
10591068
)
10601069
)
10611070
response = await client.update_workload(request)
@@ -1078,6 +1087,9 @@ async def test_update_workload_async(
10781087
== assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING
10791088
)
10801089
assert response.enable_sovereign_controls is True
1090+
assert response.compliant_but_disallowed_services == [
1091+
"compliant_but_disallowed_services_value"
1092+
]
10811093

10821094

10831095
@pytest.mark.asyncio
@@ -1581,6 +1593,9 @@ def test_get_workload(request_type, transport: str = "grpc"):
15811593
provisioned_resources_parent="provisioned_resources_parent_value",
15821594
kaj_enrollment_state=assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING,
15831595
enable_sovereign_controls=True,
1596+
compliant_but_disallowed_services=[
1597+
"compliant_but_disallowed_services_value"
1598+
],
15841599
il4_settings=assuredworkloads.Workload.IL4Settings(
15851600
kms_settings=assuredworkloads.Workload.KMSSettings(
15861601
next_rotation_time=timestamp_pb2.Timestamp(seconds=751)
@@ -1607,6 +1622,9 @@ def test_get_workload(request_type, transport: str = "grpc"):
16071622
== assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING
16081623
)
16091624
assert response.enable_sovereign_controls is True
1625+
assert response.compliant_but_disallowed_services == [
1626+
"compliant_but_disallowed_services_value"
1627+
]
16101628

16111629

16121630
def test_get_workload_empty_call():
@@ -1651,6 +1669,9 @@ async def test_get_workload_async(
16511669
provisioned_resources_parent="provisioned_resources_parent_value",
16521670
kaj_enrollment_state=assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING,
16531671
enable_sovereign_controls=True,
1672+
compliant_but_disallowed_services=[
1673+
"compliant_but_disallowed_services_value"
1674+
],
16541675
)
16551676
)
16561677
response = await client.get_workload(request)
@@ -1673,6 +1694,9 @@ async def test_get_workload_async(
16731694
== assuredworkloads.Workload.KajEnrollmentState.KAJ_ENROLLMENT_STATE_PENDING
16741695
)
16751696
assert response.enable_sovereign_controls is True
1697+
assert response.compliant_but_disallowed_services == [
1698+
"compliant_but_disallowed_services_value"
1699+
]
16761700

16771701

16781702
@pytest.mark.asyncio

0 commit comments

Comments
 (0)