From cbcb55dab8966e927d3bdf51288cde3352bcfad4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 20:30:22 +0000 Subject: [PATCH] feat: Add compliant_but_disallowed_services field to the v1beta1 Workload proto (#476) - [ ] Regenerate this pull request now. Committer: @samhutton PiperOrigin-RevId: 471822190 Source-Link: https://github.com/googleapis/googleapis/commit/61f75b4f6093d7ad7d41ccaf86c224a6ced20c71 Source-Link: https://github.com/googleapis/googleapis-gen/commit/9abf7bc271570f7073c89c0d4beb3b86a66678cb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOWFiZjdiYzI3MTU3MGY3MDczYzg5YzBkNGJlYjNiODZhNjY2NzhjYiJ9 --- .../AssuredWorkloadsServiceClient.java | 9 +- ...redWorkloadsServiceClientHttpJsonTest.java | 2 + .../AssuredWorkloadsServiceClientTest.java | 5 + .../v1beta1/AssuredWorkloadsServiceGrpc.java | 16 +- .../v1beta1/AssuredworkloadsProto.java | 148 ++++---- .../assuredworkloads/v1beta1/Workload.java | 346 ++++++++++++++++++ .../v1beta1/WorkloadOrBuilder.java | 71 ++++ .../v1beta1/assuredworkloads.proto | 6 + .../v1beta1/assuredworkloads_service.proto | 4 +- 9 files changed, 518 insertions(+), 89 deletions(-) diff --git a/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java b/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java index 907cb482bef8..844f8b1596ed 100644 --- a/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java +++ b/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java @@ -721,8 +721,7 @@ public final UnaryCallable getWorkloadCallable() { // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * A request to analyze a hypothetical move of a source project or project-based workload to a - * target (destination) folder-based workload. + * Analyze if the source Assured Workloads can be moved to the target Assured Workload * *

Sample code: * @@ -757,8 +756,7 @@ public final AnalyzeWorkloadMoveResponse analyzeWorkloadMove(String project, Str // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * A request to analyze a hypothetical move of a source project or project-based workload to a - * target (destination) folder-based workload. + * Analyze if the source Assured Workloads can be moved to the target Assured Workload * *

Sample code: * @@ -783,8 +781,7 @@ public final AnalyzeWorkloadMoveResponse analyzeWorkloadMove(AnalyzeWorkloadMove // AUTO-GENERATED DOCUMENTATION AND METHOD. /** - * A request to analyze a hypothetical move of a source project or project-based workload to a - * target (destination) folder-based workload. + * Analyze if the source Assured Workloads can be moved to the target Assured Workload * *

Sample code: * diff --git a/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientHttpJsonTest.java b/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientHttpJsonTest.java index 878854e397bd..a2e9c7926a05 100644 --- a/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientHttpJsonTest.java +++ b/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientHttpJsonTest.java @@ -94,6 +94,7 @@ public void createWorkloadTest() throws Exception { .addAllResourceSettings(new ArrayList()) .setEnableSovereignControls(true) .setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build()) + .addAllCompliantButDisallowedServices(new ArrayList()) .build(); Operation resultOperation = Operation.newBuilder() @@ -156,6 +157,7 @@ public void createWorkloadTest2() throws Exception { .addAllResourceSettings(new ArrayList()) .setEnableSovereignControls(true) .setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build()) + .addAllCompliantButDisallowedServices(new ArrayList()) .build(); Operation resultOperation = Operation.newBuilder() diff --git a/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java b/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java index 05cbd44c3933..a0abdbd5f3da 100644 --- a/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java +++ b/java-assured-workloads/google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java @@ -104,6 +104,7 @@ public void createWorkloadTest() throws Exception { .addAllResourceSettings(new ArrayList()) .setEnableSovereignControls(true) .setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build()) + .addAllCompliantButDisallowedServices(new ArrayList()) .build(); Operation resultOperation = Operation.newBuilder() @@ -164,6 +165,7 @@ public void createWorkloadTest2() throws Exception { .addAllResourceSettings(new ArrayList()) .setEnableSovereignControls(true) .setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build()) + .addAllCompliantButDisallowedServices(new ArrayList()) .build(); Operation resultOperation = Operation.newBuilder() @@ -224,6 +226,7 @@ public void updateWorkloadTest() throws Exception { .addAllResourceSettings(new ArrayList()) .setEnableSovereignControls(true) .setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build()) + .addAllCompliantButDisallowedServices(new ArrayList()) .build(); mockAssuredWorkloadsService.addResponse(expectedResponse); @@ -384,6 +387,7 @@ public void getWorkloadTest() throws Exception { .addAllResourceSettings(new ArrayList()) .setEnableSovereignControls(true) .setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build()) + .addAllCompliantButDisallowedServices(new ArrayList()) .build(); mockAssuredWorkloadsService.addResponse(expectedResponse); @@ -433,6 +437,7 @@ public void getWorkloadTest2() throws Exception { .addAllResourceSettings(new ArrayList()) .setEnableSovereignControls(true) .setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build()) + .addAllCompliantButDisallowedServices(new ArrayList()) .build(); mockAssuredWorkloadsService.addResponse(expectedResponse); diff --git a/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java b/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java index 34f43801242e..472398c1360c 100644 --- a/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java +++ b/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java @@ -520,8 +520,8 @@ public void getWorkload( * * * 

-     * A request to analyze a hypothetical move of a source project or
-     * project-based workload to a target (destination) folder-based workload.
+     * Analyze if the source Assured Workloads can be moved to the target Assured
+     * Workload
      *
*/ public void analyzeWorkloadMove( @@ -722,8 +722,8 @@ public void getWorkload( * * * 
-     * A request to analyze a hypothetical move of a source project or
-     * project-based workload to a target (destination) folder-based workload.
+     * Analyze if the source Assured Workloads can be moved to the target Assured
+     * Workload
      *
*/ public void analyzeWorkloadMove( @@ -858,8 +858,8 @@ public com.google.cloud.assuredworkloads.v1beta1.Workload getWorkload( * * * 
-     * A request to analyze a hypothetical move of a source project or
-     * project-based workload to a target (destination) folder-based workload.
+     * Analyze if the source Assured Workloads can be moved to the target Assured
+     * Workload
      *
*/ public com.google.cloud.assuredworkloads.v1beta1.AnalyzeWorkloadMoveResponse @@ -989,8 +989,8 @@ protected AssuredWorkloadsServiceFutureStub build( * * * 
-     * A request to analyze a hypothetical move of a source project or
-     * project-based workload to a target (destination) folder-based workload.
+     * Analyze if the source Assured Workloads can be moved to the target Assured
+     * Workload
      *
*/ public com.google.common.util.concurrent.ListenableFuture< diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java index 802a8fc38e91..cca8811f41b1 100644 --- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java +++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java @@ -158,7 +158,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "age_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t\"t\n\025ListW" + "orkloadsResponse\022B\n\tworkloads\030\001 \003(\0132/.go" + "ogle.cloud.assuredworkloads.v1beta1.Work" - + "load\022\027\n\017next_page_token\030\002 \001(\t\"\242\033\n\010Worklo" + + "load\022\027\n\017next_page_token\030\002 \001(\t\"\322\033\n\010Worklo" + "ad\022\021\n\004name\030\001 \001(\tB\003\340A\001\022\031\n\014display_name\030\002 " + "\001(\tB\003\340A\002\022T\n\tresources\030\003 \003(\0132<.google.clo" + "ud.assuredworkloads.v1beta1.Workload.Res" @@ -192,79 +192,80 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "n_controls\030\022 \001(\010B\003\340A\001\022k\n\027saa_enrollment_" + "response\030\024 \001(\0132E.google.cloud.assuredwor" + "kloads.v1beta1.Workload.SaaEnrollmentRes" - + "ponseB\003\340A\003\032\216\002\n\014ResourceInfo\022\023\n\013resource_" - + "id\030\001 \001(\003\022`\n\rresource_type\030\002 \001(\0162I.google" - + ".cloud.assuredworkloads.v1beta1.Workload" - + ".ResourceInfo.ResourceType\"\206\001\n\014ResourceT" - + "ype\022\035\n\031RESOURCE_TYPE_UNSPECIFIED\020\000\022\030\n\020CO" - + "NSUMER_PROJECT\020\001\032\002\010\001\022\023\n\017CONSUMER_FOLDER\020" - + "\004\022\033\n\027ENCRYPTION_KEYS_PROJECT\020\002\022\013\n\007KEYRIN" - + "G\020\003\032\223\001\n\013KMSSettings\022A\n\022next_rotation_tim" - + "e\030\001 \001(\0132\032.google.protobuf.TimestampB\t\340A\002" - + "\340A\004\340A\005\022=\n\017rotation_period\030\002 \001(\0132\031.google" - + ".protobuf.DurationB\t\340A\002\340A\004\340A\005:\002\030\001\032l\n\013IL4" - + "Settings\022Y\n\014kms_settings\030\001 \001(\0132;.google." - + "cloud.assuredworkloads.v1beta1.Workload." - + "KMSSettingsB\006\340A\004\340A\005:\002\030\001\032m\n\014CJISSettings\022" - + "Y\n\014kms_settings\030\001 \001(\0132;.google.cloud.ass" - + "uredworkloads.v1beta1.Workload.KMSSettin" - + "gsB\006\340A\004\340A\005:\002\030\001\032t\n\023FedrampHighSettings\022Y\n" - + "\014kms_settings\030\001 \001(\0132;.google.cloud.assur" - + "edworkloads.v1beta1.Workload.KMSSettings" - + "B\006\340A\004\340A\005:\002\030\001\032x\n\027FedrampModerateSettings\022" - + "Y\n\014kms_settings\030\001 \001(\0132;.google.cloud.ass" - + "uredworkloads.v1beta1.Workload.KMSSettin" - + "gsB\006\340A\004\340A\005:\002\030\001\032\237\001\n\020ResourceSettings\022\023\n\013r" - + "esource_id\030\001 \001(\t\022`\n\rresource_type\030\002 \001(\0162" + + "ponseB\003\340A\003\022.\n!compliant_but_disallowed_s" + + "ervices\030\030 \003(\tB\003\340A\003\032\216\002\n\014ResourceInfo\022\023\n\013r" + + "esource_id\030\001 \001(\003\022`\n\rresource_type\030\002 \001(\0162" + "I.google.cloud.assuredworkloads.v1beta1." - + "Workload.ResourceInfo.ResourceType\022\024\n\014di" - + "splay_name\030\003 \001(\t\032\206\004\n\025SaaEnrollmentRespon" - + "se\022k\n\014setup_status\030\001 \001(\0162P.google.cloud." - + "assuredworkloads.v1beta1.Workload.SaaEnr" - + "ollmentResponse.SetupStateH\000\210\001\001\022f\n\014setup" - + "_errors\030\002 \003(\0162P.google.cloud.assuredwork" - + "loads.v1beta1.Workload.SaaEnrollmentResp" - + "onse.SetupError\"R\n\nSetupState\022\033\n\027SETUP_S" - + "TATE_UNSPECIFIED\020\000\022\022\n\016STATUS_PENDING\020\001\022\023" - + "\n\017STATUS_COMPLETE\020\002\"\262\001\n\nSetupError\022\033\n\027SE" - + "TUP_ERROR_UNSPECIFIED\020\000\022\034\n\030ERROR_INVALID" - + "_BASE_SETUP\020\001\022&\n\"ERROR_MISSING_EXTERNAL_" - + "SIGNING_KEY\020\002\022#\n\037ERROR_NOT_ALL_SERVICES_" - + "ENROLLED\020\003\022\034\n\030ERROR_SETUP_CHECK_FAILED\020\004" - + "B\017\n\r_setup_status\032-\n\013LabelsEntry\022\013\n\003key\030" - + "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\201\002\n\020ComplianceR" - + "egime\022!\n\035COMPLIANCE_REGIME_UNSPECIFIED\020\000" - + "\022\007\n\003IL4\020\001\022\010\n\004CJIS\020\002\022\020\n\014FEDRAMP_HIGH\020\003\022\024\n" - + "\020FEDRAMP_MODERATE\020\004\022\026\n\022US_REGIONAL_ACCES" - + "S\020\005\022\t\n\005HIPAA\020\006\022\013\n\007HITRUST\020\007\022\032\n\026EU_REGION" - + "S_AND_SUPPORT\020\010\022\032\n\026CA_REGIONS_AND_SUPPOR" - + "T\020\t\022\010\n\004ITAR\020\n\022\035\n\031AU_REGIONS_AND_US_SUPPO" - + "RT\020\013\"\177\n\022KajEnrollmentState\022$\n KAJ_ENROLL" - + "MENT_STATE_UNSPECIFIED\020\000\022 \n\034KAJ_ENROLLME" - + "NT_STATE_PENDING\020\001\022!\n\035KAJ_ENROLLMENT_STA" - + "TE_COMPLETE\020\002:u\352Ar\n(assuredworkloads.goo" - + "gleapis.com/Workload\022Forganizations/{org" - + "anization}/locations/{location}/workload" - + "s/{workload}B\034\n\032compliance_regime_settin" - + "gs\"\313\002\n\037CreateWorkloadOperationMetadata\0224" - + "\n\013create_time\030\001 \001(\0132\032.google.protobuf.Ti" - + "mestampB\003\340A\001\022\031\n\014display_name\030\002 \001(\tB\003\340A\001\022" - + "\023\n\006parent\030\003 \001(\tB\003\340A\001\022`\n\021compliance_regim" - + "e\030\004 \001(\0162@.google.cloud.assuredworkloads." - + "v1beta1.Workload.ComplianceRegimeB\003\340A\001\022`" - + "\n\021resource_settings\030\005 \003(\0132@.google.cloud" - + ".assuredworkloads.v1beta1.Workload.Resou" - + "rceSettingsB\003\340A\001B\366\002\n)com.google.cloud.as" - + "suredworkloads.v1beta1B\025Assuredworkloads" - + "ProtoP\001ZUgoogle.golang.org/genproto/goog" - + "leapis/cloud/assuredworkloads/v1beta1;as" - + "suredworkloads\252\002%Google.Cloud.AssuredWor" - + "kloads.V1Beta1\312\002%Google\\Cloud\\AssuredWor" - + "kloads\\V1beta1\352\002(Google::Cloud::AssuredW" - + "orkloads::V1beta1\352A]\n(assuredworkloads.g" - + "oogleapis.com/Location\0221organizations/{o" - + "rganization}/locations/{location}b\006proto" - + "3" + + "Workload.ResourceInfo.ResourceType\"\206\001\n\014R" + + "esourceType\022\035\n\031RESOURCE_TYPE_UNSPECIFIED" + + "\020\000\022\030\n\020CONSUMER_PROJECT\020\001\032\002\010\001\022\023\n\017CONSUMER" + + "_FOLDER\020\004\022\033\n\027ENCRYPTION_KEYS_PROJECT\020\002\022\013" + + "\n\007KEYRING\020\003\032\223\001\n\013KMSSettings\022A\n\022next_rota" + + "tion_time\030\001 \001(\0132\032.google.protobuf.Timest" + + "ampB\t\340A\002\340A\004\340A\005\022=\n\017rotation_period\030\002 \001(\0132" + + "\031.google.protobuf.DurationB\t\340A\002\340A\004\340A\005:\002\030" + + "\001\032l\n\013IL4Settings\022Y\n\014kms_settings\030\001 \001(\0132;" + + ".google.cloud.assuredworkloads.v1beta1.W" + + "orkload.KMSSettingsB\006\340A\004\340A\005:\002\030\001\032m\n\014CJISS" + + "ettings\022Y\n\014kms_settings\030\001 \001(\0132;.google.c" + + "loud.assuredworkloads.v1beta1.Workload.K" + + "MSSettingsB\006\340A\004\340A\005:\002\030\001\032t\n\023FedrampHighSet" + + "tings\022Y\n\014kms_settings\030\001 \001(\0132;.google.clo" + + "ud.assuredworkloads.v1beta1.Workload.KMS" + + "SettingsB\006\340A\004\340A\005:\002\030\001\032x\n\027FedrampModerateS" + + "ettings\022Y\n\014kms_settings\030\001 \001(\0132;.google.c" + + "loud.assuredworkloads.v1beta1.Workload.K" + + "MSSettingsB\006\340A\004\340A\005:\002\030\001\032\237\001\n\020ResourceSetti" + + "ngs\022\023\n\013resource_id\030\001 \001(\t\022`\n\rresource_typ" + + "e\030\002 \001(\0162I.google.cloud.assuredworkloads." + + "v1beta1.Workload.ResourceInfo.ResourceTy" + + "pe\022\024\n\014display_name\030\003 \001(\t\032\206\004\n\025SaaEnrollme" + + "ntResponse\022k\n\014setup_status\030\001 \001(\0162P.googl" + + "e.cloud.assuredworkloads.v1beta1.Workloa" + + "d.SaaEnrollmentResponse.SetupStateH\000\210\001\001\022" + + "f\n\014setup_errors\030\002 \003(\0162P.google.cloud.ass" + + "uredworkloads.v1beta1.Workload.SaaEnroll" + + "mentResponse.SetupError\"R\n\nSetupState\022\033\n" + + "\027SETUP_STATE_UNSPECIFIED\020\000\022\022\n\016STATUS_PEN" + + "DING\020\001\022\023\n\017STATUS_COMPLETE\020\002\"\262\001\n\nSetupErr" + + "or\022\033\n\027SETUP_ERROR_UNSPECIFIED\020\000\022\034\n\030ERROR" + + "_INVALID_BASE_SETUP\020\001\022&\n\"ERROR_MISSING_E" + + "XTERNAL_SIGNING_KEY\020\002\022#\n\037ERROR_NOT_ALL_S" + + "ERVICES_ENROLLED\020\003\022\034\n\030ERROR_SETUP_CHECK_" + + "FAILED\020\004B\017\n\r_setup_status\032-\n\013LabelsEntry" + + "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\201\002\n\020Com" + + "plianceRegime\022!\n\035COMPLIANCE_REGIME_UNSPE" + + "CIFIED\020\000\022\007\n\003IL4\020\001\022\010\n\004CJIS\020\002\022\020\n\014FEDRAMP_H" + + "IGH\020\003\022\024\n\020FEDRAMP_MODERATE\020\004\022\026\n\022US_REGION" + + "AL_ACCESS\020\005\022\t\n\005HIPAA\020\006\022\013\n\007HITRUST\020\007\022\032\n\026E" + + "U_REGIONS_AND_SUPPORT\020\010\022\032\n\026CA_REGIONS_AN" + + "D_SUPPORT\020\t\022\010\n\004ITAR\020\n\022\035\n\031AU_REGIONS_AND_" + + "US_SUPPORT\020\013\"\177\n\022KajEnrollmentState\022$\n KA" + + "J_ENROLLMENT_STATE_UNSPECIFIED\020\000\022 \n\034KAJ_" + + "ENROLLMENT_STATE_PENDING\020\001\022!\n\035KAJ_ENROLL" + + "MENT_STATE_COMPLETE\020\002:u\352Ar\n(assuredworkl" + + "oads.googleapis.com/Workload\022Forganizati" + + "ons/{organization}/locations/{location}/" + + "workloads/{workload}B\034\n\032compliance_regim" + + "e_settings\"\313\002\n\037CreateWorkloadOperationMe" + + "tadata\0224\n\013create_time\030\001 \001(\0132\032.google.pro" + + "tobuf.TimestampB\003\340A\001\022\031\n\014display_name\030\002 \001" + + "(\tB\003\340A\001\022\023\n\006parent\030\003 \001(\tB\003\340A\001\022`\n\021complian" + + "ce_regime\030\004 \001(\0162@.google.cloud.assuredwo" + + "rkloads.v1beta1.Workload.ComplianceRegim" + + "eB\003\340A\001\022`\n\021resource_settings\030\005 \003(\0132@.goog" + + "le.cloud.assuredworkloads.v1beta1.Worklo" + + "ad.ResourceSettingsB\003\340A\001B\366\002\n)com.google." + + "cloud.assuredworkloads.v1beta1B\025Assuredw" + + "orkloadsProtoP\001ZUgoogle.golang.org/genpr" + + "oto/googleapis/cloud/assuredworkloads/v1" + + "beta1;assuredworkloads\252\002%Google.Cloud.As" + + "suredWorkloads.V1Beta1\312\002%Google\\Cloud\\As" + + "suredWorkloads\\V1beta1\352\002(Google::Cloud::" + + "AssuredWorkloads::V1beta1\352A]\n(assuredwor" + + "kloads.googleapis.com/Location\0221organiza" + + "tions/{organization}/locations/{location" + + "}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -378,6 +379,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "KajEnrollmentState", "EnableSovereignControls", "SaaEnrollmentResponse", + "CompliantButDisallowedServices", "ComplianceRegimeSettings", }); internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceInfo_descriptor = diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java index b1a4ff93adbd..321004cd210b 100644 --- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java +++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java @@ -48,6 +48,7 @@ private Workload() { provisionedResourcesParent_ = ""; resourceSettings_ = java.util.Collections.emptyList(); kajEnrollmentState_ = 0; + compliantButDisallowedServices_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @java.lang.Override @@ -319,6 +320,16 @@ private Workload( saaEnrollmentResponse_ = subBuilder.buildPartial(); } + break; + } + case 194: + { + java.lang.String s = input.readStringRequireUtf8(); + if (!((mutable_bitField0_ & 0x00000008) != 0)) { + compliantButDisallowedServices_ = new com.google.protobuf.LazyStringArrayList(); + mutable_bitField0_ |= 0x00000008; + } + compliantButDisallowedServices_.add(s); break; } default: @@ -343,6 +354,9 @@ private Workload( if (((mutable_bitField0_ & 0x00000004) != 0)) { resourceSettings_ = java.util.Collections.unmodifiableList(resourceSettings_); } + if (((mutable_bitField0_ & 0x00000008) != 0)) { + compliantButDisallowedServices_ = compliantButDisallowedServices_.getUnmodifiableView(); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -10337,6 +10351,87 @@ public boolean hasSaaEnrollmentResponse() { return getSaaEnrollmentResponse(); } + public static final int COMPLIANT_BUT_DISALLOWED_SERVICES_FIELD_NUMBER = 24; + private com.google.protobuf.LazyStringList compliantButDisallowedServices_; + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @return A list containing the compliantButDisallowedServices. + */ + public com.google.protobuf.ProtocolStringList getCompliantButDisallowedServicesList() { + return compliantButDisallowedServices_; + } + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @return The count of compliantButDisallowedServices. + */ + public int getCompliantButDisallowedServicesCount() { + return compliantButDisallowedServices_.size(); + } + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param index The index of the element to return. + * @return The compliantButDisallowedServices at the given index. + */ + public java.lang.String getCompliantButDisallowedServices(int index) { + return compliantButDisallowedServices_.get(index); + } + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param index The index of the value to return. + * @return The bytes of the compliantButDisallowedServices at the given index. + */ + public com.google.protobuf.ByteString getCompliantButDisallowedServicesBytes(int index) { + return compliantButDisallowedServices_.getByteString(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -10422,6 +10517,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (saaEnrollmentResponse_ != null) { output.writeMessage(20, getSaaEnrollmentResponse()); } + for (int i = 0; i < compliantButDisallowedServices_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString( + output, 24, compliantButDisallowedServices_.getRaw(i)); + } unknownFields.writeTo(output); } @@ -10517,6 +10616,14 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(20, getSaaEnrollmentResponse()); } + { + int dataSize = 0; + for (int i = 0; i < compliantButDisallowedServices_.size(); i++) { + dataSize += computeStringSizeNoTag(compliantButDisallowedServices_.getRaw(i)); + } + size += dataSize; + size += 2 * getCompliantButDisallowedServicesList().size(); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -10557,6 +10664,8 @@ public boolean equals(final java.lang.Object obj) { if (hasSaaEnrollmentResponse()) { if (!getSaaEnrollmentResponse().equals(other.getSaaEnrollmentResponse())) return false; } + if (!getCompliantButDisallowedServicesList() + .equals(other.getCompliantButDisallowedServicesList())) return false; if (!getComplianceRegimeSettingsCase().equals(other.getComplianceRegimeSettingsCase())) return false; switch (complianceRegimeSettingsCase_) { @@ -10626,6 +10735,10 @@ public int hashCode() { hash = (37 * hash) + SAA_ENROLLMENT_RESPONSE_FIELD_NUMBER; hash = (53 * hash) + getSaaEnrollmentResponse().hashCode(); } + if (getCompliantButDisallowedServicesCount() > 0) { + hash = (37 * hash) + COMPLIANT_BUT_DISALLOWED_SERVICES_FIELD_NUMBER; + hash = (53 * hash) + getCompliantButDisallowedServicesList().hashCode(); + } switch (complianceRegimeSettingsCase_) { case 7: hash = (37 * hash) + IL4_SETTINGS_FIELD_NUMBER; @@ -10862,6 +10975,8 @@ public Builder clear() { saaEnrollmentResponse_ = null; saaEnrollmentResponseBuilder_ = null; } + compliantButDisallowedServices_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000008); complianceRegimeSettingsCase_ = 0; complianceRegimeSettings_ = null; return this; @@ -10963,6 +11078,11 @@ public com.google.cloud.assuredworkloads.v1beta1.Workload buildPartial() { } else { result.saaEnrollmentResponse_ = saaEnrollmentResponseBuilder_.build(); } + if (((bitField0_ & 0x00000008) != 0)) { + compliantButDisallowedServices_ = compliantButDisallowedServices_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.compliantButDisallowedServices_ = compliantButDisallowedServices_; result.complianceRegimeSettingsCase_ = complianceRegimeSettingsCase_; onBuilt(); return result; @@ -11107,6 +11227,16 @@ public Builder mergeFrom(com.google.cloud.assuredworkloads.v1beta1.Workload othe if (other.hasSaaEnrollmentResponse()) { mergeSaaEnrollmentResponse(other.getSaaEnrollmentResponse()); } + if (!other.compliantButDisallowedServices_.isEmpty()) { + if (compliantButDisallowedServices_.isEmpty()) { + compliantButDisallowedServices_ = other.compliantButDisallowedServices_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureCompliantButDisallowedServicesIsMutable(); + compliantButDisallowedServices_.addAll(other.compliantButDisallowedServices_); + } + onChanged(); + } switch (other.getComplianceRegimeSettingsCase()) { case IL4_SETTINGS: { @@ -14855,6 +14985,222 @@ public Builder clearSaaEnrollmentResponse() { return saaEnrollmentResponseBuilder_; } + private com.google.protobuf.LazyStringList compliantButDisallowedServices_ = + com.google.protobuf.LazyStringArrayList.EMPTY; + + private void ensureCompliantButDisallowedServicesIsMutable() { + if (!((bitField0_ & 0x00000008) != 0)) { + compliantButDisallowedServices_ = + new com.google.protobuf.LazyStringArrayList(compliantButDisallowedServices_); + bitField0_ |= 0x00000008; + } + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @return A list containing the compliantButDisallowedServices. + */ + public com.google.protobuf.ProtocolStringList getCompliantButDisallowedServicesList() { + return compliantButDisallowedServices_.getUnmodifiableView(); + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @return The count of compliantButDisallowedServices. + */ + public int getCompliantButDisallowedServicesCount() { + return compliantButDisallowedServices_.size(); + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param index The index of the element to return. + * @return The compliantButDisallowedServices at the given index. + */ + public java.lang.String getCompliantButDisallowedServices(int index) { + return compliantButDisallowedServices_.get(index); + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param index The index of the value to return. + * @return The bytes of the compliantButDisallowedServices at the given index. + */ + public com.google.protobuf.ByteString getCompliantButDisallowedServicesBytes(int index) { + return compliantButDisallowedServices_.getByteString(index); + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param index The index to set the value at. + * @param value The compliantButDisallowedServices to set. + * @return This builder for chaining. + */ + public Builder setCompliantButDisallowedServices(int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureCompliantButDisallowedServicesIsMutable(); + compliantButDisallowedServices_.set(index, value); + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param value The compliantButDisallowedServices to add. + * @return This builder for chaining. + */ + public Builder addCompliantButDisallowedServices(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureCompliantButDisallowedServicesIsMutable(); + compliantButDisallowedServices_.add(value); + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param values The compliantButDisallowedServices to add. + * @return This builder for chaining. + */ + public Builder addAllCompliantButDisallowedServices( + java.lang.Iterable values) { + ensureCompliantButDisallowedServicesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, compliantButDisallowedServices_); + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @return This builder for chaining. + */ + public Builder clearCompliantButDisallowedServices() { + compliantButDisallowedServices_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + return this; + } + /** + * + * + * 
+     * Output only. Urls for services which are compliant for this Assured Workload, but which
+     * are currently disallowed by the ResourceUsageRestriction org policy.
+     * Invoke RestrictAllowedResources endpoint to allow your project developers
+     * to use these services in their environment."
+     *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param value The bytes of the compliantButDisallowedServices to add. + * @return This builder for chaining. + */ + public Builder addCompliantButDisallowedServicesBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + ensureCompliantButDisallowedServicesIsMutable(); + compliantButDisallowedServices_.add(value); + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java index a3f9129e9ebb..fe8c234c1ee1 100644 --- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java +++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java @@ -822,6 +822,77 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceSettings getResourceS com.google.cloud.assuredworkloads.v1beta1.Workload.SaaEnrollmentResponseOrBuilder getSaaEnrollmentResponseOrBuilder(); + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @return A list containing the compliantButDisallowedServices. + */ + java.util.List getCompliantButDisallowedServicesList(); + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @return The count of compliantButDisallowedServices. + */ + int getCompliantButDisallowedServicesCount(); + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param index The index of the element to return. + * @return The compliantButDisallowedServices at the given index. + */ + java.lang.String getCompliantButDisallowedServices(int index); + /** + * + * + * 
+   * Output only. Urls for services which are compliant for this Assured Workload, but which
+   * are currently disallowed by the ResourceUsageRestriction org policy.
+   * Invoke RestrictAllowedResources endpoint to allow your project developers
+   * to use these services in their environment."
+   *
+ * + * + * repeated string compliant_but_disallowed_services = 24 [(.google.api.field_behavior) = OUTPUT_ONLY]; + * + * + * @param index The index of the value to return. + * @return The bytes of the compliantButDisallowedServices at the given index. + */ + com.google.protobuf.ByteString getCompliantButDisallowedServicesBytes(int index); + public com.google.cloud.assuredworkloads.v1beta1.Workload.ComplianceRegimeSettingsCase getComplianceRegimeSettingsCase(); } diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto index 589010c9ac1a..e6a83fae4ee8 100644 --- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto +++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto @@ -535,6 +535,12 @@ message Workload { // SAA enrollment response is queried during GetWorkload call. // In failure cases, user friendly error message is shown in SAA details page. SaaEnrollmentResponse saa_enrollment_response = 20 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Output only. Urls for services which are compliant for this Assured Workload, but which + // are currently disallowed by the ResourceUsageRestriction org policy. + // Invoke RestrictAllowedResources endpoint to allow your project developers + // to use these services in their environment." + repeated string compliant_but_disallowed_services = 24 [(google.api.field_behavior) = OUTPUT_ONLY]; } // Operation metadata to give request details of CreateWorkload. diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads_service.proto b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads_service.proto index 9fbedf47b10e..1af45f12a03f 100644 --- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads_service.proto +++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads_service.proto @@ -87,8 +87,8 @@ service AssuredWorkloadsService { option (google.api.method_signature) = "name"; } - // A request to analyze a hypothetical move of a source project or - // project-based workload to a target (destination) folder-based workload. + // Analyze if the source Assured Workloads can be moved to the target Assured + // Workload rpc AnalyzeWorkloadMove(AnalyzeWorkloadMoveRequest) returns (AnalyzeWorkloadMoveResponse) { option (google.api.method_signature) = "project,target"; }