feat(v1beta1): add provisioned_resources_parent and kms_settings to W…

…orkload (#124) This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/5a650520-0329-4632-9f8e-b7348dd472b2/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 342580339 Source-Link: googleapis/googleapis@8d245ac
googleapis · Nov 18, 2020 · ca9e772 · ca9e772
1 parent cdf21a7
commit ca9e772
Show file tree

Hide file tree

Showing 7 changed files with 935 additions and 160 deletions.
diff --git a/...est/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java b/...est/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java
@@ -91,12 +91,14 @@ public void createWorkloadTest() throws Exception {
     String displayName = "displayName1615086568";
     String billingAccount = "billingAccount-545871767";
     String etag = "etag3123477";
+    String provisionedResourcesParent = "provisionedResourcesParent-158134097";
     Workload expectedResponse =
         Workload.newBuilder()
             .setName(name.toString())
             .setDisplayName(displayName)
             .setBillingAccount(billingAccount)
             .setEtag(etag)
+            .setProvisionedResourcesParent(provisionedResourcesParent)
             .build();
     Operation resultOperation =
         Operation.newBuilder()
@@ -150,12 +152,14 @@ public void updateWorkloadTest() {
     String displayName = "displayName1615086568";
     String billingAccount = "billingAccount-545871767";
     String etag = "etag3123477";
+    String provisionedResourcesParent = "provisionedResourcesParent-158134097";
     Workload expectedResponse =
         Workload.newBuilder()
             .setName(name.toString())
             .setDisplayName(displayName)
             .setBillingAccount(billingAccount)
             .setEtag(etag)
+            .setProvisionedResourcesParent(provisionedResourcesParent)
             .build();
     mockAssuredWorkloadsService.addResponse(expectedResponse);
 
@@ -238,12 +242,14 @@ public void getWorkloadTest() {
     String displayName = "displayName1615086568";
     String billingAccount = "billingAccount-545871767";
     String etag = "etag3123477";
+    String provisionedResourcesParent = "provisionedResourcesParent-158134097";
     Workload expectedResponse =
         Workload.newBuilder()
             .setName(name2.toString())
             .setDisplayName(displayName)
             .setBillingAccount(billingAccount)
             .setEtag(etag)
+            .setProvisionedResourcesParent(provisionedResourcesParent)
             .build();
     mockAssuredWorkloadsService.addResponse(expectedResponse);
 

diff --git a/proto-google-cloud-assured-workloads-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-assured-workloads-v1beta1/clirr-ignored-differences.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/assuredworkloads/v1beta1/*OrBuilder</className>
+    <method>* get*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/assuredworkloads/v1beta1/*OrBuilder</className>
+    <method>boolean contains*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/assuredworkloads/v1beta1/*OrBuilder</className>
+    <method>boolean has*(*)</method>
+  </difference>
+</differences>
diff --git a/...1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java b/...1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java
@@ -125,7 +125,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\"\331\017\n\010Worklo"
+          + "load\022\027\n\017next_page_token\030\002 \001(\t\"\364\020\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"
@@ -134,94 +134,98 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "1.Workload.ComplianceRegimeB\006\340A\002\340A\005\0227\n\013c"
           + "reate_time\030\005 \001(\0132\032.google.protobuf.Times"
           + "tampB\006\340A\003\340A\005\022\037\n\017billing_account\030\006 \001(\tB\006\340"
-          + "A\002\340A\004\022^\n\014il4_settings\030\007 \001(\0132;.google.clo"
+          + "A\002\340A\004\022`\n\014il4_settings\030\007 \001(\0132;.google.clo"
           + "ud.assuredworkloads.v1beta1.Workload.IL4"
-          + "SettingsB\t\340A\002\340A\004\340A\005H\000\022`\n\rcjis_settings\030\010"
-          + " \001(\0132<.google.cloud.assuredworkloads.v1b"
-          + "eta1.Workload.CJISSettingsB\t\340A\002\340A\004\340A\005H\000\022"
-          + "o\n\025fedramp_high_settings\030\013 \001(\0132C.google."
-          + "cloud.assuredworkloads.v1beta1.Workload."
-          + "FedrampHighSettingsB\t\340A\002\340A\004\340A\005H\000\022w\n\031fedr"
-          + "amp_moderate_settings\030\014 \001(\0132G.google.clo"
-          + "ud.assuredworkloads.v1beta1.Workload.Fed"
-          + "rampModerateSettingsB\t\340A\002\340A\004\340A\005H\000\022\021\n\004eta"
-          + "g\030\t \001(\tB\003\340A\001\022P\n\006labels\030\n \003(\0132;.google.cl"
-          + "oud.assuredworkloads.v1beta1.Workload.La"
-          + "belsEntryB\003\340A\001\032\347\001\n\014ResourceInfo\022\023\n\013resou"
-          + "rce_id\030\001 \001(\003\022`\n\rresource_type\030\002 \001(\0162I.go"
-          + "ogle.cloud.assuredworkloads.v1beta1.Work"
-          + "load.ResourceInfo.ResourceType\"`\n\014Resour"
-          + "ceType\022\035\n\031RESOURCE_TYPE_UNSPECIFIED\020\000\022\024\n"
-          + "\020CONSUMER_PROJECT\020\001\022\033\n\027ENCRYPTION_KEYS_P"
-          + "ROJECT\020\002\032\217\001\n\013KMSSettings\022A\n\022next_rotatio"
-          + "n_time\030\001 \001(\0132\032.google.protobuf.Timestamp"
-          + "B\t\340A\002\340A\004\340A\005\022=\n\017rotation_period\030\002 \001(\0132\031.g"
-          + "oogle.protobuf.DurationB\t\340A\002\340A\004\340A\005\032k\n\013IL"
-          + "4Settings\022\\\n\014kms_settings\030\001 \001(\0132;.google"
-          + ".cloud.assuredworkloads.v1beta1.Workload"
-          + ".KMSSettingsB\t\340A\002\340A\004\340A\005\032l\n\014CJISSettings\022"
-          + "\\\n\014kms_settings\030\001 \001(\0132;.google.cloud.ass"
-          + "uredworkloads.v1beta1.Workload.KMSSettin"
-          + "gsB\t\340A\002\340A\004\340A\005\032s\n\023FedrampHighSettings\022\\\n\014"
-          + "kms_settings\030\001 \001(\0132;.google.cloud.assure"
-          + "dworkloads.v1beta1.Workload.KMSSettingsB"
-          + "\t\340A\002\340A\004\340A\005\032w\n\027FedrampModerateSettings\022\\\n"
-          + "\014kms_settings\030\001 \001(\0132;.google.cloud.assur"
-          + "edworkloads.v1beta1.Workload.KMSSettings"
-          + "B\t\340A\002\340A\004\340A\005\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022"
-          + "\r\n\005value\030\002 \001(\t:\0028\001\"p\n\020ComplianceRegime\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\020FEDRAM"
-          + "P_MODERATE\020\004:u\352Ar\n(assuredworkloads.goog"
-          + "leapis.com/Workload\022Forganizations/{orga"
-          + "nization}/locations/{location}/workloads"
-          + "/{workload}B\034\n\032compliance_regime_setting"
-          + "s\"\351\001\n\037CreateWorkloadOperationMetadata\0224\n"
-          + "\013create_time\030\001 \001(\0132\032.google.protobuf.Tim"
-          + "estampB\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_regime"
-          + "\030\004 \001(\0162@.google.cloud.assuredworkloads.v"
-          + "1beta1.Workload.ComplianceRegimeB\003\340A\0012\243\t"
-          + "\n\027AssuredWorkloadsService\022\371\001\n\016CreateWork"
-          + "load\022<.google.cloud.assuredworkloads.v1b"
-          + "eta1.CreateWorkloadRequest\032\035.google.long"
-          + "running.Operation\"\211\001\202\323\344\223\002C\"7/v1beta1/{pa"
-          + "rent=organizations/*/locations/*}/worklo"
-          + "ads:\010workload\332A\017parent,workload\312A+\n\010Work"
-          + "load\022\037CreateWorkloadOperationMetadata\022\352\001"
-          + "\n\016UpdateWorkload\022<.google.cloud.assuredw"
-          + "orkloads.v1beta1.UpdateWorkloadRequest\032/"
-          + ".google.cloud.assuredworkloads.v1beta1.W"
-          + "orkload\"i\202\323\344\223\002L2@/v1beta1/{workload.name"
-          + "=organizations/*/locations/*/workloads/*"
-          + "}:\010workload\332A\024workload,update_mask\022\256\001\n\016D"
-          + "eleteWorkload\022<.google.cloud.assuredwork"
-          + "loads.v1beta1.DeleteWorkloadRequest\032\026.go"
-          + "ogle.protobuf.Empty\"F\202\323\344\223\0029*7/v1beta1/{n"
-          + "ame=organizations/*/locations/*/workload"
-          + "s/*}\332A\004name\022\301\001\n\013GetWorkload\0229.google.clo"
-          + "ud.assuredworkloads.v1beta1.GetWorkloadR"
-          + "equest\032/.google.cloud.assuredworkloads.v"
-          + "1beta1.Workload\"F\202\323\344\223\0029\0227/v1beta1/{name="
-          + "organizations/*/locations/*/workloads/*}"
-          + "\332A\004name\022\324\001\n\rListWorkloads\022;.google.cloud"
-          + ".assuredworkloads.v1beta1.ListWorkloadsR"
-          + "equest\032<.google.cloud.assuredworkloads.v"
-          + "1beta1.ListWorkloadsResponse\"H\202\323\344\223\0029\0227/v"
-          + "1beta1/{parent=organizations/*/locations"
-          + "/*}/workloads\332A\006parent\032S\312A\037assuredworklo"
-          + "ads.googleapis.com\322A.https://www.googlea"
-          + "pis.com/auth/cloud-platformB\366\002\n)com.goog"
-          + "le.cloud.assuredworkloads.v1beta1B\025Assur"
-          + "edworkloadsProtoP\001ZUgoogle.golang.org/ge"
-          + "nproto/googleapis/cloud/assuredworkloads"
-          + "/v1beta1;assuredworkloads\252\002%Google.Cloud"
-          + ".AssuredWorkloads.V1Beta1\312\002%Google\\Cloud"
-          + "\\AssuredWorkloads\\V1beta1\352\002(Google::Clou"
-          + "d::AssuredWorkloads::V1beta1\352A]\n(assured"
-          + "workloads.googleapis.com/Location\0221organ"
-          + "izations/{organization}/locations/{locat"
-          + "ion}b\006proto3"
+          + "SettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022b\n\rcjis_settings"
+          + "\030\010 \001(\0132<.google.cloud.assuredworkloads.v"
+          + "1beta1.Workload.CJISSettingsB\013\030\001\340A\002\340A\004\340A"
+          + "\005H\000\022q\n\025fedramp_high_settings\030\013 \001(\0132C.goo"
+          + "gle.cloud.assuredworkloads.v1beta1.Workl"
+          + "oad.FedrampHighSettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022y"
+          + "\n\031fedramp_moderate_settings\030\014 \001(\0132G.goog"
+          + "le.cloud.assuredworkloads.v1beta1.Worklo"
+          + "ad.FedrampModerateSettingsB\013\030\001\340A\002\340A\004\340A\005H"
+          + "\000\022\021\n\004etag\030\t \001(\tB\003\340A\001\022P\n\006labels\030\n \003(\0132;.g"
+          + "oogle.cloud.assuredworkloads.v1beta1.Wor"
+          + "kload.LabelsEntryB\003\340A\001\022)\n\034provisioned_re"
+          + "sources_parent\030\r \001(\tB\003\340A\004\022V\n\014kms_setting"
+          + "s\030\016 \001(\0132;.google.cloud.assuredworkloads."
+          + "v1beta1.Workload.KMSSettingsB\003\340A\004\032\347\001\n\014Re"
+          + "sourceInfo\022\023\n\013resource_id\030\001 \001(\003\022`\n\rresou"
+          + "rce_type\030\002 \001(\0162I.google.cloud.assuredwor"
+          + "kloads.v1beta1.Workload.ResourceInfo.Res"
+          + "ourceType\"`\n\014ResourceType\022\035\n\031RESOURCE_TY"
+          + "PE_UNSPECIFIED\020\000\022\024\n\020CONSUMER_PROJECT\020\001\022\033"
+          + "\n\027ENCRYPTION_KEYS_PROJECT\020\002\032\217\001\n\013KMSSetti"
+          + "ngs\022A\n\022next_rotation_time\030\001 \001(\0132\032.google"
+          + ".protobuf.TimestampB\t\340A\002\340A\004\340A\005\022=\n\017rotati"
+          + "on_period\030\002 \001(\0132\031.google.protobuf.Durati"
+          + "onB\t\340A\002\340A\004\340A\005\032o\n\013IL4Settings\022\\\n\014kms_sett"
+          + "ings\030\001 \001(\0132;.google.cloud.assuredworkloa"
+          + "ds.v1beta1.Workload.KMSSettingsB\t\340A\002\340A\004\340"
+          + "A\005:\002\030\001\032p\n\014CJISSettings\022\\\n\014kms_settings\030\001"
+          + " \001(\0132;.google.cloud.assuredworkloads.v1b"
+          + "eta1.Workload.KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030\001"
+          + "\032w\n\023FedrampHighSettings\022\\\n\014kms_settings\030"
+          + "\001 \001(\0132;.google.cloud.assuredworkloads.v1"
+          + "beta1.Workload.KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030"
+          + "\001\032{\n\027FedrampModerateSettings\022\\\n\014kms_sett"
+          + "ings\030\001 \001(\0132;.google.cloud.assuredworkloa"
+          + "ds.v1beta1.Workload.KMSSettingsB\t\340A\002\340A\004\340"
+          + "A\005:\002\030\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va"
+          + "lue\030\002 \001(\t:\0028\001\"p\n\020ComplianceRegime\022!\n\035COM"
+          + "PLIANCE_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_MOD"
+          + "ERATE\020\004:u\352Ar\n(assuredworkloads.googleapi"
+          + "s.com/Workload\022Forganizations/{organizat"
+          + "ion}/locations/{location}/workloads/{wor"
+          + "kload}B\034\n\032compliance_regime_settings\"\351\001\n"
+          + "\037CreateWorkloadOperationMetadata\0224\n\013crea"
+          + "te_time\030\001 \001(\0132\032.google.protobuf.Timestam"
+          + "pB\003\340A\001\022\031\n\014display_name\030\002 \001(\tB\003\340A\001\022\023\n\006par"
+          + "ent\030\003 \001(\tB\003\340A\001\022`\n\021compliance_regime\030\004 \001("
+          + "\0162@.google.cloud.assuredworkloads.v1beta"
+          + "1.Workload.ComplianceRegimeB\003\340A\0012\243\t\n\027Ass"
+          + "uredWorkloadsService\022\371\001\n\016CreateWorkload\022"
+          + "<.google.cloud.assuredworkloads.v1beta1."
+          + "CreateWorkloadRequest\032\035.google.longrunni"
+          + "ng.Operation\"\211\001\202\323\344\223\002C\"7/v1beta1/{parent="
+          + "organizations/*/locations/*}/workloads:\010"
+          + "workload\332A\017parent,workload\312A+\n\010Workload\022"
+          + "\037CreateWorkloadOperationMetadata\022\352\001\n\016Upd"
+          + "ateWorkload\022<.google.cloud.assuredworklo"
+          + "ads.v1beta1.UpdateWorkloadRequest\032/.goog"
+          + "le.cloud.assuredworkloads.v1beta1.Worklo"
+          + "ad\"i\202\323\344\223\002L2@/v1beta1/{workload.name=orga"
+          + "nizations/*/locations/*/workloads/*}:\010wo"
+          + "rkload\332A\024workload,update_mask\022\256\001\n\016Delete"
+          + "Workload\022<.google.cloud.assuredworkloads"
+          + ".v1beta1.DeleteWorkloadRequest\032\026.google."
+          + "protobuf.Empty\"F\202\323\344\223\0029*7/v1beta1/{name=o"
+          + "rganizations/*/locations/*/workloads/*}\332"
+          + "A\004name\022\301\001\n\013GetWorkload\0229.google.cloud.as"
+          + "suredworkloads.v1beta1.GetWorkloadReques"
+          + "t\032/.google.cloud.assuredworkloads.v1beta"
+          + "1.Workload\"F\202\323\344\223\0029\0227/v1beta1/{name=organ"
+          + "izations/*/locations/*/workloads/*}\332A\004na"
+          + "me\022\324\001\n\rListWorkloads\022;.google.cloud.assu"
+          + "redworkloads.v1beta1.ListWorkloadsReques"
+          + "t\032<.google.cloud.assuredworkloads.v1beta"
+          + "1.ListWorkloadsResponse\"H\202\323\344\223\0029\0227/v1beta"
+          + "1/{parent=organizations/*/locations/*}/w"
+          + "orkloads\332A\006parent\032S\312A\037assuredworkloads.g"
+          + "oogleapis.com\322A.https://www.googleapis.c"
+          + "om/auth/cloud-platformB\366\002\n)com.google.cl"
+          + "oud.assuredworkloads.v1beta1B\025Assuredwor"
+          + "kloadsProtoP\001ZUgoogle.golang.org/genprot"
+          + "o/googleapis/cloud/assuredworkloads/v1be"
+          + "ta1;assuredworkloads\252\002%Google.Cloud.Assu"
+          + "redWorkloads.V1Beta1\312\002%Google\\Cloud\\Assu"
+          + "redWorkloads\\V1beta1\352\002(Google::Cloud::As"
+          + "suredWorkloads::V1beta1\352A]\n(assuredworkl"
+          + "oads.googleapis.com/Location\0221organizati"
+          + "ons/{organization}/locations/{location}b"
+          + "\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -303,6 +307,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "FedrampModerateSettings",
               "Etag",
               "Labels",
+              "ProvisionedResourcesParent",
+              "KmsSettings",
               "ComplianceRegimeSettings",
             });
     internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceInfo_descriptor =