Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [assuredworkloads] Add compliant_but_disallowed_services field to the v1beta1 Workload proto #8283

Merged
merged 2 commits into from
Sep 6, 2022
Merged

feat: [assuredworkloads] Add compliant_but_disallowed_services field to the v1beta1 Workload proto #8283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02a4337
feat: Add compliant_but_disallowed_services field to the v1beta1 Work…
gcf-owl-bot[bot] Sep 2, 2022
168b87c
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...rc/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,8 +721,7 @@ public final UnaryCallable<GetWorkloadRequest, Workload> 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
*
* <p>Sample code:
*
Expand Down Expand Up @@ -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
*
* <p>Sample code:
*
Expand All @@ -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
*
* <p>Sample code:
*
Expand Down
2 changes: 2 additions & 0 deletions .../com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientHttpJsonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public void createWorkloadTest() throws Exception {
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
.setEnableSovereignControls(true)
.setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build())
.addAllCompliantButDisallowedServices(new ArrayList<String>())
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -156,6 +157,7 @@ public void createWorkloadTest2() throws Exception {
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
.setEnableSovereignControls(true)
.setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build())
.addAllCompliantButDisallowedServices(new ArrayList<String>())
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down
5 changes: 5 additions & 0 deletions ...est/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public void createWorkloadTest() throws Exception {
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
.setEnableSovereignControls(true)
.setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build())
.addAllCompliantButDisallowedServices(new ArrayList<String>())
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -164,6 +165,7 @@ public void createWorkloadTest2() throws Exception {
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
.setEnableSovereignControls(true)
.setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build())
.addAllCompliantButDisallowedServices(new ArrayList<String>())
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -224,6 +226,7 @@ public void updateWorkloadTest() throws Exception {
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
.setEnableSovereignControls(true)
.setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build())
.addAllCompliantButDisallowedServices(new ArrayList<String>())
.build();
mockAssuredWorkloadsService.addResponse(expectedResponse);

Expand Down Expand Up @@ -384,6 +387,7 @@ public void getWorkloadTest() throws Exception {
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
.setEnableSovereignControls(true)
.setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build())
.addAllCompliantButDisallowedServices(new ArrayList<String>())
.build();
mockAssuredWorkloadsService.addResponse(expectedResponse);

Expand Down Expand Up @@ -433,6 +437,7 @@ public void getWorkloadTest2() throws Exception {
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
.setEnableSovereignControls(true)
.setSaaEnrollmentResponse(Workload.SaaEnrollmentResponse.newBuilder().build())
.addAllCompliantButDisallowedServices(new ArrayList<String>())
.build();
mockAssuredWorkloadsService.addResponse(expectedResponse);

Expand Down
16 changes: 8 additions & 8 deletions .../src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,8 +520,8 @@ public void getWorkload(
*
*
* <pre>
* 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
* </pre>
*/
public void analyzeWorkloadMove(
Expand Down Expand Up @@ -722,8 +722,8 @@ public void getWorkload(
*
*
* <pre>
* 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
* </pre>
*/
public void analyzeWorkloadMove(
Expand Down Expand Up @@ -858,8 +858,8 @@ public com.google.cloud.assuredworkloads.v1beta1.Workload getWorkload(
*
*
* <pre>
* 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
* </pre>
*/
public com.google.cloud.assuredworkloads.v1beta1.AnalyzeWorkloadMoveResponse
Expand Down Expand Up @@ -989,8 +989,8 @@ protected AssuredWorkloadsServiceFutureStub build(
*
*
* <pre>
* 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
* </pre>
*/
public com.google.common.util.concurrent.ListenableFuture<
Expand Down
148 changes: 75 additions & 73 deletions ...1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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(\[email protected]."
+ "v1beta1.Workload.ComplianceRegimeB\003\340A\001\022`"
+ "\n\021resource_settings\030\005 \003(\[email protected]"
+ ".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(\[email protected]"
+ "rkloads.v1beta1.Workload.ComplianceRegim"
+ "eB\003\340A\001\022`\n\021resource_settings\030\005 \003(\[email protected]"
+ "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(
Expand Down Expand Up @@ -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 =
Expand Down
Loading