Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 220564a

Browse files
yoshi-automationyoshi-automation
committed
feat: Add 'resource_settings' field to provide custom properties (ids) for the provisioned projects.
PiperOrigin-RevId: 363600693 Source-Author: Google APIs <noreply@google.com> Source-Date: Thu Mar 18 00:45:56 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: dd7c51a272f05456784067c0e8b6520a50503254 Source-Link: googleapis/googleapis@dd7c51a
1 parent 655ad2c commit 220564a

File tree

6 files changed

+3375
-1727
lines changed

6 files changed

+3375
-1727
lines changed

‎google-cloud-assured-workloads/src/test/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClientTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public void createWorkloadTest() throws Exception {
101101
.putAllLabels(new HashMap<String, String>())
102102
.setProvisionedResourcesParent("provisionedResourcesParent1733249115")
103103
.setKmsSettings(Workload.KMSSettings.newBuilder().build())
104+
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
104105
.build();
105106
Operation resultOperation =
106107
Operation.newBuilder()
@@ -158,6 +159,7 @@ public void createWorkloadTest2() throws Exception {
158159
.putAllLabels(new HashMap<String, String>())
159160
.setProvisionedResourcesParent("provisionedResourcesParent1733249115")
160161
.setKmsSettings(Workload.KMSSettings.newBuilder().build())
162+
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
161163
.build();
162164
Operation resultOperation =
163165
Operation.newBuilder()
@@ -215,6 +217,7 @@ public void updateWorkloadTest() throws Exception {
215217
.putAllLabels(new HashMap<String, String>())
216218
.setProvisionedResourcesParent("provisionedResourcesParent1733249115")
217219
.setKmsSettings(Workload.KMSSettings.newBuilder().build())
220+
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
218221
.build();
219222
mockAssuredWorkloadsService.addResponse(expectedResponse);
220223

@@ -332,6 +335,7 @@ public void getWorkloadTest() throws Exception {
332335
.putAllLabels(new HashMap<String, String>())
333336
.setProvisionedResourcesParent("provisionedResourcesParent1733249115")
334337
.setKmsSettings(Workload.KMSSettings.newBuilder().build())
338+
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
335339
.build();
336340
mockAssuredWorkloadsService.addResponse(expectedResponse);
337341

@@ -378,6 +382,7 @@ public void getWorkloadTest2() throws Exception {
378382
.putAllLabels(new HashMap<String, String>())
379383
.setProvisionedResourcesParent("provisionedResourcesParent1733249115")
380384
.setKmsSettings(Workload.KMSSettings.newBuilder().build())
385+
.addAllResourceSettings(new ArrayList<Workload.ResourceSettings>())
381386
.build();
382387
mockAssuredWorkloadsService.addResponse(expectedResponse);
383388

‎proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java‎

Lines changed: 99 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
7979
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_FedrampModerateSettings_descriptor;
8080
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
8181
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_FedrampModerateSettings_fieldAccessorTable;
82+
static final com.google.protobuf.Descriptors.Descriptor
83+
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceSettings_descriptor;
84+
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
85+
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceSettings_fieldAccessorTable;
8286
static final com.google.protobuf.Descriptors.Descriptor
8387
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_LabelsEntry_descriptor;
8488
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -125,7 +129,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
125129
+ "age_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t\"t\n\025ListW"
126130
+ "orkloadsResponse\022B\n\tworkloads\030\001 \003(\0132/.go"
127131
+ "ogle.cloud.assuredworkloads.v1beta1.Work"
128-
+ "load\022\027\n\017next_page_token\030\002 \001(\t\"\215\021\n\010Worklo"
132+
+ "load\022\027\n\017next_page_token\030\002 \001(\t\"\373\022\n\010Worklo"
129133
+ "ad\022\021\n\004name\030\001 \001(\tB\003\340A\001\022\031\n\014display_name\030\002 "
130134
+ "\001(\tB\003\340A\002\022T\n\tresources\030\003 \003(\0132<.google.clo"
131135
+ "ud.assuredworkloads.v1beta1.Workload.Res"
@@ -150,82 +154,88 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
150154
+ "kload.LabelsEntryB\003\340A\001\022)\n\034provisioned_re"
151155
+ "sources_parent\030\r \001(\tB\003\340A\004\022V\n\014kms_setting"
152156
+ "s\030\016 \001(\0132;.google.cloud.assuredworkloads."
153-
+ "v1beta1.Workload.KMSSettingsB\003\340A\004\032\347\001\n\014Re"
154-
+ "sourceInfo\022\023\n\013resource_id\030\001 \001(\003\022`\n\rresou"
155-
+ "rce_type\030\002 \001(\0162I.google.cloud.assuredwor"
156-
+ "kloads.v1beta1.Workload.ResourceInfo.Res"
157-
+ "ourceType\"`\n\014ResourceType\022\035\n\031RESOURCE_TY"
158-
+ "PE_UNSPECIFIED\020\000\022\024\n\020CONSUMER_PROJECT\020\001\022\033"
159-
+ "\n\027ENCRYPTION_KEYS_PROJECT\020\002\032\217\001\n\013KMSSetti"
160-
+ "ngs\022A\n\022next_rotation_time\030\001 \001(\0132\032.google"
161-
+ ".protobuf.TimestampB\t\340A\002\340A\004\340A\005\022=\n\017rotati"
162-
+ "on_period\030\002 \001(\0132\031.google.protobuf.Durati"
163-
+ "onB\t\340A\002\340A\004\340A\005\032o\n\013IL4Settings\022\\\n\014kms_sett"
164-
+ "ings\030\001 \001(\0132;.google.cloud.assuredworkloa"
165-
+ "ds.v1beta1.Workload.KMSSettingsB\t\340A\002\340A\004\340"
166-
+ "A\005:\002\030\001\032p\n\014CJISSettings\022\\\n\014kms_settings\030\001"
167-
+ " \001(\0132;.google.cloud.assuredworkloads.v1b"
168-
+ "eta1.Workload.KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030\001"
169-
+ "\032w\n\023FedrampHighSettings\022\\\n\014kms_settings\030"
170-
+ "\001 \001(\0132;.google.cloud.assuredworkloads.v1"
171-
+ "beta1.Workload.KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030"
172-
+ "\001\032{\n\027FedrampModerateSettings\022\\\n\014kms_sett"
173-
+ "ings\030\001 \001(\0132;.google.cloud.assuredworkloa"
174-
+ "ds.v1beta1.Workload.KMSSettingsB\t\340A\002\340A\004\340"
175-
+ "A\005:\002\030\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va"
176-
+ "lue\030\002 \001(\t:\0028\001\"\210\001\n\020ComplianceRegime\022!\n\035CO"
177-
+ "MPLIANCE_REGIME_UNSPECIFIED\020\000\022\007\n\003IL4\020\001\022\010"
178-
+ "\n\004CJIS\020\002\022\020\n\014FEDRAMP_HIGH\020\003\022\024\n\020FEDRAMP_MO"
179-
+ "DERATE\020\004\022\026\n\022US_REGIONAL_ACCESS\020\005:u\352Ar\n(a"
180-
+ "ssuredworkloads.googleapis.com/Workload\022"
181-
+ "Forganizations/{organization}/locations/"
182-
+ "{location}/workloads/{workload}B\034\n\032compl"
183-
+ "iance_regime_settings\"\351\001\n\037CreateWorkload"
184-
+ "OperationMetadata\0224\n\013create_time\030\001 \001(\0132\032"
185-
+ ".google.protobuf.TimestampB\003\340A\001\022\031\n\014displ"
186-
+ "ay_name\030\002 \001(\tB\003\340A\001\022\023\n\006parent\030\003 \001(\tB\003\340A\001\022"
187-
+ "`\n\021compliance_regime\030\004 \001(\0162@.google.clou"
188-
+ "d.assuredworkloads.v1beta1.Workload.Comp"
189-
+ "lianceRegimeB\003\340A\0012\243\t\n\027AssuredWorkloadsSe"
190-
+ "rvice\022\371\001\n\016CreateWorkload\022<.google.cloud."
191-
+ "assuredworkloads.v1beta1.CreateWorkloadR"
192-
+ "equest\032\035.google.longrunning.Operation\"\211\001"
193-
+ "\202\323\344\223\002C\"7/v1beta1/{parent=organizations/*"
194-
+ "/locations/*}/workloads:\010workload\332A\017pare"
195-
+ "nt,workload\312A+\n\010Workload\022\037CreateWorkload"
196-
+ "OperationMetadata\022\352\001\n\016UpdateWorkload\022<.g"
197-
+ "oogle.cloud.assuredworkloads.v1beta1.Upd"
198-
+ "ateWorkloadRequest\032/.google.cloud.assure"
199-
+ "dworkloads.v1beta1.Workload\"i\202\323\344\223\002L2@/v1"
200-
+ "beta1/{workload.name=organizations/*/loc"
201-
+ "ations/*/workloads/*}:\010workload\332A\024worklo"
202-
+ "ad,update_mask\022\256\001\n\016DeleteWorkload\022<.goog"
203-
+ "le.cloud.assuredworkloads.v1beta1.Delete"
204-
+ "WorkloadRequest\032\026.google.protobuf.Empty\""
205-
+ "F\202\323\344\223\0029*7/v1beta1/{name=organizations/*/"
206-
+ "locations/*/workloads/*}\332A\004name\022\301\001\n\013GetW"
207-
+ "orkload\0229.google.cloud.assuredworkloads."
208-
+ "v1beta1.GetWorkloadRequest\032/.google.clou"
209-
+ "d.assuredworkloads.v1beta1.Workload\"F\202\323\344"
210-
+ "\223\0029\0227/v1beta1/{name=organizations/*/loca"
211-
+ "tions/*/workloads/*}\332A\004name\022\324\001\n\rListWork"
212-
+ "loads\022;.google.cloud.assuredworkloads.v1"
213-
+ "beta1.ListWorkloadsRequest\032<.google.clou"
214-
+ "d.assuredworkloads.v1beta1.ListWorkloads"
215-
+ "Response\"H\202\323\344\223\0029\0227/v1beta1/{parent=organ"
216-
+ "izations/*/locations/*}/workloads\332A\006pare"
217-
+ "nt\032S\312A\037assuredworkloads.googleapis.com\322A"
218-
+ ".https://www.googleapis.com/auth/cloud-p"
219-
+ "latformB\366\002\n)com.google.cloud.assuredwork"
220-
+ "loads.v1beta1B\025AssuredworkloadsProtoP\001ZU"
221-
+ "google.golang.org/genproto/googleapis/cl"
222-
+ "oud/assuredworkloads/v1beta1;assuredwork"
223-
+ "loads\252\002%Google.Cloud.AssuredWorkloads.V1"
224-
+ "Beta1\312\002%Google\\Cloud\\AssuredWorkloads\\V1"
225-
+ "beta1\352\002(Google::Cloud::AssuredWorkloads:"
226-
+ ":V1beta1\352A]\n(assuredworkloads.googleapis"
227-
+ ".com/Location\0221organizations/{organizati"
228-
+ "on}/locations/{location}b\006proto3"
157+
+ "v1beta1.Workload.KMSSettingsB\003\340A\004\022`\n\021res"
158+
+ "ource_settings\030\017 \003(\0132@.google.cloud.assu"
159+
+ "redworkloads.v1beta1.Workload.ResourceSe"
160+
+ "ttingsB\003\340A\004\032\347\001\n\014ResourceInfo\022\023\n\013resource"
161+
+ "_id\030\001 \001(\003\022`\n\rresource_type\030\002 \001(\0162I.googl"
162+
+ "e.cloud.assuredworkloads.v1beta1.Workloa"
163+
+ "d.ResourceInfo.ResourceType\"`\n\014ResourceT"
164+
+ "ype\022\035\n\031RESOURCE_TYPE_UNSPECIFIED\020\000\022\024\n\020CO"
165+
+ "NSUMER_PROJECT\020\001\022\033\n\027ENCRYPTION_KEYS_PROJ"
166+
+ "ECT\020\002\032\217\001\n\013KMSSettings\022A\n\022next_rotation_t"
167+
+ "ime\030\001 \001(\0132\032.google.protobuf.TimestampB\t\340"
168+
+ "A\002\340A\004\340A\005\022=\n\017rotation_period\030\002 \001(\0132\031.goog"
169+
+ "le.protobuf.DurationB\t\340A\002\340A\004\340A\005\032o\n\013IL4Se"
170+
+ "ttings\022\\\n\014kms_settings\030\001 \001(\0132;.google.cl"
171+
+ "oud.assuredworkloads.v1beta1.Workload.KM"
172+
+ "SSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032p\n\014CJISSettings"
173+
+ "\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud.as"
174+
+ "suredworkloads.v1beta1.Workload.KMSSetti"
175+
+ "ngsB\t\340A\002\340A\004\340A\005:\002\030\001\032w\n\023FedrampHighSetting"
176+
+ "s\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud.a"
177+
+ "ssuredworkloads.v1beta1.Workload.KMSSett"
178+
+ "ingsB\t\340A\002\340A\004\340A\005:\002\030\001\032{\n\027FedrampModerateSe"
179+
+ "ttings\022\\\n\014kms_settings\030\001 \001(\0132;.google.cl"
180+
+ "oud.assuredworkloads.v1beta1.Workload.KM"
181+
+ "SSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032\211\001\n\020ResourceSet"
182+
+ "tings\022\023\n\013resource_id\030\001 \001(\t\022`\n\rresource_t"
183+
+ "ype\030\002 \001(\0162I.google.cloud.assuredworkload"
184+
+ "s.v1beta1.Workload.ResourceInfo.Resource"
185+
+ "Type\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu"
186+
+ "e\030\002 \001(\t:\0028\001\"\210\001\n\020ComplianceRegime\022!\n\035COMP"
187+
+ "LIANCE_REGIME_UNSPECIFIED\020\000\022\007\n\003IL4\020\001\022\010\n\004"
188+
+ "CJIS\020\002\022\020\n\014FEDRAMP_HIGH\020\003\022\024\n\020FEDRAMP_MODE"
189+
+ "RATE\020\004\022\026\n\022US_REGIONAL_ACCESS\020\005:u\352Ar\n(ass"
190+
+ "uredworkloads.googleapis.com/Workload\022Fo"
191+
+ "rganizations/{organization}/locations/{l"
192+
+ "ocation}/workloads/{workload}B\034\n\032complia"
193+
+ "nce_regime_settings\"\351\001\n\037CreateWorkloadOp"
194+
+ "erationMetadata\0224\n\013create_time\030\001 \001(\0132\032.g"
195+
+ "oogle.protobuf.TimestampB\003\340A\001\022\031\n\014display"
196+
+ "_name\030\002 \001(\tB\003\340A\001\022\023\n\006parent\030\003 \001(\tB\003\340A\001\022`\n"
197+
+ "\021compliance_regime\030\004 \001(\0162@.google.cloud."
198+
+ "assuredworkloads.v1beta1.Workload.Compli"
199+
+ "anceRegimeB\003\340A\0012\243\t\n\027AssuredWorkloadsServ"
200+
+ "ice\022\371\001\n\016CreateWorkload\022<.google.cloud.as"
201+
+ "suredworkloads.v1beta1.CreateWorkloadReq"
202+
+ "uest\032\035.google.longrunning.Operation\"\211\001\202\323"
203+
+ "\344\223\002C\"7/v1beta1/{parent=organizations/*/l"
204+
+ "ocations/*}/workloads:\010workload\332A\017parent"
205+
+ ",workload\312A+\n\010Workload\022\037CreateWorkloadOp"
206+
+ "erationMetadata\022\352\001\n\016UpdateWorkload\022<.goo"
207+
+ "gle.cloud.assuredworkloads.v1beta1.Updat"
208+
+ "eWorkloadRequest\032/.google.cloud.assuredw"
209+
+ "orkloads.v1beta1.Workload\"i\202\323\344\223\002L2@/v1be"
210+
+ "ta1/{workload.name=organizations/*/locat"
211+
+ "ions/*/workloads/*}:\010workload\332A\024workload"
212+
+ ",update_mask\022\256\001\n\016DeleteWorkload\022<.google"
213+
+ ".cloud.assuredworkloads.v1beta1.DeleteWo"
214+
+ "rkloadRequest\032\026.google.protobuf.Empty\"F\202"
215+
+ "\323\344\223\0029*7/v1beta1/{name=organizations/*/lo"
216+
+ "cations/*/workloads/*}\332A\004name\022\301\001\n\013GetWor"
217+
+ "kload\0229.google.cloud.assuredworkloads.v1"
218+
+ "beta1.GetWorkloadRequest\032/.google.cloud."
219+
+ "assuredworkloads.v1beta1.Workload\"F\202\323\344\223\002"
220+
+ "9\0227/v1beta1/{name=organizations/*/locati"
221+
+ "ons/*/workloads/*}\332A\004name\022\324\001\n\rListWorklo"
222+
+ "ads\022;.google.cloud.assuredworkloads.v1be"
223+
+ "ta1.ListWorkloadsRequest\032<.google.cloud."
224+
+ "assuredworkloads.v1beta1.ListWorkloadsRe"
225+
+ "sponse\"H\202\323\344\223\0029\0227/v1beta1/{parent=organiz"
226+
+ "ations/*/locations/*}/workloads\332A\006parent"
227+
+ "\032S\312A\037assuredworkloads.googleapis.com\322A.h"
228+
+ "ttps://www.googleapis.com/auth/cloud-pla"
229+
+ "tformB\366\002\n)com.google.cloud.assuredworklo"
230+
+ "ads.v1beta1B\025AssuredworkloadsProtoP\001ZUgo"
231+
+ "ogle.golang.org/genproto/googleapis/clou"
232+
+ "d/assuredworkloads/v1beta1;assuredworklo"
233+
+ "ads\252\002%Google.Cloud.AssuredWorkloads.V1Be"
234+
+ "ta1\312\002%Google\\Cloud\\AssuredWorkloads\\V1be"
235+
+ "ta1\352\002(Google::Cloud::AssuredWorkloads::V"
236+
+ "1beta1\352A]\n(assuredworkloads.googleapis.c"
237+
+ "om/Location\0221organizations/{organization"
238+
+ "}/locations/{location}b\006proto3"
229239
};
230240
descriptor =
231241
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -309,6 +319,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
309319
"Labels",
310320
"ProvisionedResourcesParent",
311321
"KmsSettings",
322+
"ResourceSettings",
312323
"ComplianceRegimeSettings",
313324
});
314325
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceInfo_descriptor =
@@ -371,10 +382,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
371382
new java.lang.String[] {
372383
"KmsSettings",
373384
});
374-
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_LabelsEntry_descriptor =
385+
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceSettings_descriptor =
375386
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_descriptor
376387
.getNestedTypes()
377388
.get(6);
389+
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceSettings_fieldAccessorTable =
390+
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
391+
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceSettings_descriptor,
392+
new java.lang.String[] {
393+
"ResourceId", "ResourceType",
394+
});
395+
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_LabelsEntry_descriptor =
396+
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_descriptor
397+
.getNestedTypes()
398+
.get(7);
378399
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_LabelsEntry_fieldAccessorTable =
379400
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
380401
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_LabelsEntry_descriptor,

0 commit comments

Comments
 (0)