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

Commit

Permalink
feat: Add Canada Regions And Support compliance regime (#308)
Browse files Browse the repository at this point in the history 
- [ ] Regenerate this pull request now.

fix: ResourceType CONSUMER_PROJECT is deprecated

feat: ResourceType CONSUMER_FOLDER and KEYRING are added

feat: display_name is added to ResourceSettings

fix: billing_account is now optional in Workload

feat: resource_settings is added to CreateWorkloadOperationMetadata

Committer: @ketanbshah
PiperOrigin-RevId: 393142547

Source-Link: googleapis/googleapis@4b6bb3d

Source-Link: googleapis/googleapis-gen@f70128a
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] authored Sep 13, 2021
1 parent e9eb1c5 commit d949e0e
Show file tree
Hide file tree
Showing 7 changed files with 1,147 additions and 192 deletions.
4 changes: 3 additions & 1 deletion ...sured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
*/

/**
* The interfaces provided are listed below, along with usage samples.
* A client to Assured Workloads API
*
* <p>The interfaces provided are listed below, along with usage samples.
*
* <p>======================= AssuredWorkloadsServiceClient =======================
*
Expand Down
208 changes: 106 additions & 102 deletions ...1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,115 +129,119 @@ 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\"\257\023\n\010Worklo"
+ "load\022\027\n\017next_page_token\030\002 \001(\t\"\205\024\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"
+ "ourceInfoB\003\340A\003\022c\n\021compliance_regime\030\004 \001("
+ "\0162@.google.cloud.assuredworkloads.v1beta"
+ "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"
+ "ud.assuredworkloads.v1beta1.Workload.IL4"
+ "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"
+ "tampB\006\340A\003\340A\005\022\034\n\017billing_account\030\006 \001(\tB\003\340"
+ "A\004\022`\n\014il4_settings\030\007 \001(\0132;.google.cloud."
+ "assuredworkloads.v1beta1.Workload.IL4Set"
+ "tingsB\013\030\001\340A\002\340A\004\340A\005H\000\022b\n\rcjis_settings\030\010 "
+ "\001(\0132<.google.cloud.assuredworkloads.v1be"
+ "ta1.Workload.CJISSettingsB\013\030\001\340A\002\340A\004\340A\005H\000"
+ "\022q\n\025fedramp_high_settings\030\013 \001(\0132C.google"
+ ".cloud.assuredworkloads.v1beta1.Workload"
+ ".FedrampHighSettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022y\n\031f"
+ "edramp_moderate_settings\030\014 \001(\0132G.google."
+ "cloud.assuredworkloads.v1beta1.Workload."
+ "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;.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\022`\n\021res"
+ "ource_settings\030\017 \003(\0132@.google.cloud.assu"
+ "ad.LabelsEntryB\003\340A\001\022)\n\034provisioned_resou"
+ "rces_parent\030\r \001(\tB\003\340A\004\022V\n\014kms_settings\030\016"
+ " \001(\0132;.google.cloud.assuredworkloads.v1b"
+ "eta1.Workload.KMSSettingsB\003\340A\004\022`\n\021resour"
+ "ce_settings\030\017 \003(\0132@.google.cloud.assured"
+ "workloads.v1beta1.Workload.ResourceSetti"
+ "ngsB\003\340A\004\032\216\002\n\014ResourceInfo\022\023\n\013resource_id"
+ "\030\001 \001(\003\022`\n\rresource_type\030\002 \001(\0162I.google.c"
+ "loud.assuredworkloads.v1beta1.Workload.R"
+ "esourceInfo.ResourceType\"\206\001\n\014ResourceTyp"
+ "e\022\035\n\031RESOURCE_TYPE_UNSPECIFIED\020\000\022\030\n\020CONS"
+ "UMER_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\217\001\n\013KMSSettings\022A\n\022next_rotation_time\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.p"
+ "rotobuf.DurationB\t\340A\002\340A\004\340A\005\032o\n\013IL4Settin"
+ "gs\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud."
+ "assuredworkloads.v1beta1.Workload.KMSSet"
+ "tingsB\t\340A\002\340A\004\340A\005:\002\030\001\032p\n\014CJISSettings\022\\\n\014"
+ "kms_settings\030\001 \001(\0132;.google.cloud.assure"
+ "dworkloads.v1beta1.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.assur"
+ "edworkloads.v1beta1.Workload.KMSSettings"
+ "B\t\340A\002\340A\004\340A\005:\002\030\001\032{\n\027FedrampModerateSettin"
+ "gs\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud."
+ "assuredworkloads.v1beta1.Workload.KMSSet"
+ "tingsB\t\340A\002\340A\004\340A\005:\002\030\001\032\237\001\n\020ResourceSetting"
+ "s\022\023\n\013resource_id\030\001 \001(\t\022`\n\rresource_type\030"
+ "\002 \001(\0162I.google.cloud.assuredworkloads.v1"
+ "beta1.Workload.ResourceInfo.ResourceType"
+ "\022\024\n\014display_name\030\003 \001(\t\032-\n\013LabelsEntry\022\013\n"
+ "\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\330\001\n\020Compli"
+ "anceRegime\022!\n\035COMPLIANCE_REGIME_UNSPECIF"
+ "IED\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_"
+ "ACCESS\020\005\022\t\n\005HIPAA\020\006\022\013\n\007HITRUST\020\007\022\032\n\026EU_R"
+ "EGIONS_AND_SUPPORT\020\010\022\032\n\026CA_REGIONS_AND_S"
+ "UPPORT\020\t:u\352Ar\n(assuredworkloads.googleap"
+ "is.com/Workload\022Forganizations/{organiza"
+ "tion}/locations/{location}/workloads/{wo"
+ "rkload}B\034\n\032compliance_regime_settings\"\313\002"
+ "\n\037CreateWorkloadOperationMetadata\0224\n\013cre"
+ "ate_time\030\001 \001(\0132\032.google.protobuf.Timesta"
+ "mpB\003\340A\001\022\031\n\014display_name\030\002 \001(\tB\003\340A\001\022\023\n\006pa"
+ "rent\030\003 \001(\tB\003\340A\001\022`\n\021compliance_regime\030\004 \001"
+ "(\0162@.google.cloud.assuredworkloads.v1bet"
+ "a1.Workload.ComplianceRegimeB\003\340A\001\022`\n\021res"
+ "ource_settings\030\005 \003(\0132@.google.cloud.assu"
+ "redworkloads.v1beta1.Workload.ResourceSe"
+ "ttingsB\003\340A\004\032\347\001\n\014ResourceInfo\022\023\n\013resource"
+ "_id\030\001 \001(\003\022`\n\rresource_type\030\002 \001(\0162I.googl"
+ "e.cloud.assuredworkloads.v1beta1.Workloa"
+ "d.ResourceInfo.ResourceType\"`\n\014ResourceT"
+ "ype\022\035\n\031RESOURCE_TYPE_UNSPECIFIED\020\000\022\024\n\020CO"
+ "NSUMER_PROJECT\020\001\022\033\n\027ENCRYPTION_KEYS_PROJ"
+ "ECT\020\002\032\217\001\n\013KMSSettings\022A\n\022next_rotation_t"
+ "ime\030\001 \001(\0132\032.google.protobuf.TimestampB\t\340"
+ "A\002\340A\004\340A\005\022=\n\017rotation_period\030\002 \001(\0132\031.goog"
+ "le.protobuf.DurationB\t\340A\002\340A\004\340A\005\032o\n\013IL4Se"
+ "ttings\022\\\n\014kms_settings\030\001 \001(\0132;.google.cl"
+ "oud.assuredworkloads.v1beta1.Workload.KM"
+ "SSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032p\n\014CJISSettings"
+ "\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud.as"
+ "suredworkloads.v1beta1.Workload.KMSSetti"
+ "ngsB\t\340A\002\340A\004\340A\005:\002\030\001\032w\n\023FedrampHighSetting"
+ "s\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud.a"
+ "ssuredworkloads.v1beta1.Workload.KMSSett"
+ "ingsB\t\340A\002\340A\004\340A\005:\002\030\001\032{\n\027FedrampModerateSe"
+ "ttings\022\\\n\014kms_settings\030\001 \001(\0132;.google.cl"
+ "oud.assuredworkloads.v1beta1.Workload.KM"
+ "SSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032\211\001\n\020ResourceSet"
+ "tings\022\023\n\013resource_id\030\001 \001(\t\022`\n\rresource_t"
+ "ype\030\002 \001(\0162I.google.cloud.assuredworkload"
+ "s.v1beta1.Workload.ResourceInfo.Resource"
+ "Type\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu"
+ "e\030\002 \001(\t:\0028\001\"\274\001\n\020ComplianceRegime\022!\n\035COMP"
+ "LIANCE_REGIME_UNSPECIFIED\020\000\022\007\n\003IL4\020\001\022\010\n\004"
+ "CJIS\020\002\022\020\n\014FEDRAMP_HIGH\020\003\022\024\n\020FEDRAMP_MODE"
+ "RATE\020\004\022\026\n\022US_REGIONAL_ACCESS\020\005\022\t\n\005HIPAA\020"
+ "\006\022\013\n\007HITRUST\020\007\022\032\n\026EU_REGIONS_AND_SUPPORT"
+ "\020\010:u\352Ar\n(assuredworkloads.googleapis.com"
+ "/Workload\022Forganizations/{organization}/"
+ "locations/{location}/workloads/{workload"
+ "}B\034\n\032compliance_regime_settings\"\351\001\n\037Crea"
+ "teWorkloadOperationMetadata\0224\n\013create_ti"
+ "me\030\001 \001(\0132\032.google.protobuf.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\021compliance_regime\030\004 \001(\0162@.g"
+ "oogle.cloud.assuredworkloads.v1beta1.Wor"
+ "kload.ComplianceRegimeB\003\340A\0012\243\t\n\027AssuredW"
+ "orkloadsService\022\371\001\n\016CreateWorkload\022<.goo"
+ "gle.cloud.assuredworkloads.v1beta1.Creat"
+ "eWorkloadRequest\032\035.google.longrunning.Op"
+ "eration\"\211\001\202\323\344\223\002C\"7/v1beta1/{parent=organ"
+ "izations/*/locations/*}/workloads:\010workl"
+ "oad\332A\017parent,workload\312A+\n\010Workload\022\037Crea"
+ "teWorkloadOperationMetadata\022\352\001\n\016UpdateWo"
+ "rkload\022<.google.cloud.assuredworkloads.v"
+ "1beta1.UpdateWorkloadRequest\032/.google.cl"
+ "oud.assuredworkloads.v1beta1.Workload\"i\202"
+ "\323\344\223\002L2@/v1beta1/{workload.name=organizat"
+ "ions/*/locations/*/workloads/*}:\010workloa"
+ "d\332A\024workload,update_mask\022\256\001\n\016DeleteWorkl"
+ "oad\022<.google.cloud.assuredworkloads.v1be"
+ "ta1.DeleteWorkloadRequest\032\026.google.proto"
+ "buf.Empty\"F\202\323\344\223\0029*7/v1beta1/{name=organi"
+ "zations/*/locations/*/workloads/*}\332A\004nam"
+ "e\022\301\001\n\013GetWorkload\0229.google.cloud.assured"
+ "workloads.v1beta1.GetWorkloadRequest\032/.g"
+ "oogle.cloud.assuredworkloads.v1beta1.Wor"
+ "kload\"F\202\323\344\223\0029\0227/v1beta1/{name=organizati"
+ "ons/*/locations/*/workloads/*}\332A\004name\022\324\001"
+ "\n\rListWorkloads\022;.google.cloud.assuredwo"
+ "rkloads.v1beta1.ListWorkloadsRequest\032<.g"
+ "oogle.cloud.assuredworkloads.v1beta1.Lis"
+ "tWorkloadsResponse\"H\202\323\344\223\0029\0227/v1beta1/{pa"
+ "rent=organizations/*/locations/*}/worklo"
+ "ads\332A\006parent\032S\312A\037assuredworkloads.google"
+ "apis.com\322A.https://www.googleapis.com/au"
+ "th/cloud-platformB\366\002\n)com.google.cloud.a"
+ "ssuredworkloads.v1beta1B\025Assuredworkload"
+ "sProtoP\001ZUgoogle.golang.org/genproto/goo"
+ "gleapis/cloud/assuredworkloads/v1beta1;a"
+ "ssuredworkloads\252\002%Google.Cloud.AssuredWo"
+ "rkloads.V1Beta1\312\002%Google\\Cloud\\AssuredWo"
+ "rkloads\\V1beta1\352\002(Google::Cloud::Assured"
+ "Workloads::V1beta1\352A]\n(assuredworkloads."
+ "googleapis.com/Location\0221organizations/{"
+ "organization}/locations/{location}b\006prot"
+ "o3"
+ "ttingsB\003\340A\0012\243\t\n\027AssuredWorkloadsService\022"
+ "\371\001\n\016CreateWorkload\022<.google.cloud.assure"
+ "dworkloads.v1beta1.CreateWorkloadRequest"
+ "\032\035.google.longrunning.Operation\"\211\001\202\323\344\223\002C"
+ "\"7/v1beta1/{parent=organizations/*/locat"
+ "ions/*}/workloads:\010workload\332A\017parent,wor"
+ "kload\312A+\n\010Workload\022\037CreateWorkloadOperat"
+ "ionMetadata\022\352\001\n\016UpdateWorkload\022<.google."
+ "cloud.assuredworkloads.v1beta1.UpdateWor"
+ "kloadRequest\032/.google.cloud.assuredworkl"
+ "oads.v1beta1.Workload\"i\202\323\344\223\002L2@/v1beta1/"
+ "{workload.name=organizations/*/locations"
+ "/*/workloads/*}:\010workload\332A\024workload,upd"
+ "ate_mask\022\256\001\n\016DeleteWorkload\022<.google.clo"
+ "ud.assuredworkloads.v1beta1.DeleteWorklo"
+ "adRequest\032\026.google.protobuf.Empty\"F\202\323\344\223\002"
+ "9*7/v1beta1/{name=organizations/*/locati"
+ "ons/*/workloads/*}\332A\004name\022\301\001\n\013GetWorkloa"
+ "d\0229.google.cloud.assuredworkloads.v1beta"
+ "1.GetWorkloadRequest\032/.google.cloud.assu"
+ "redworkloads.v1beta1.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."
+ "ListWorkloadsRequest\032<.google.cloud.assu"
+ "redworkloads.v1beta1.ListWorkloadsRespon"
+ "se\"H\202\323\344\223\0029\0227/v1beta1/{parent=organizatio"
+ "ns/*/locations/*}/workloads\332A\006parent\032S\312A"
+ "\037assuredworkloads.googleapis.com\322A.https"
+ "://www.googleapis.com/auth/cloud-platfor"
+ "mB\366\002\n)com.google.cloud.assuredworkloads."
+ "v1beta1B\025AssuredworkloadsProtoP\001ZUgoogle"
+ ".golang.org/genproto/googleapis/cloud/as"
+ "suredworkloads/v1beta1;assuredworkloads\252"
+ "\002%Google.Cloud.AssuredWorkloads.V1Beta1\312"
+ "\002%Google\\Cloud\\AssuredWorkloads\\V1beta1\352"
+ "\002(Google::Cloud::AssuredWorkloads::V1bet"
+ "a1\352A]\n(assuredworkloads.googleapis.com/L"
+ "ocation\0221organizations/{organization}/lo"
+ "cations/{location}b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
Expand Down Expand Up @@ -392,7 +396,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_ResourceSettings_descriptor,
new java.lang.String[] {
"ResourceId", "ResourceType",
"ResourceId", "ResourceType", "DisplayName",
});
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_LabelsEntry_descriptor =
internal_static_google_cloud_assuredworkloads_v1beta1_Workload_descriptor
Expand All @@ -410,7 +414,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_cloud_assuredworkloads_v1beta1_CreateWorkloadOperationMetadata_descriptor,
new java.lang.String[] {
"CreateTime", "DisplayName", "Parent", "ComplianceRegime",
"CreateTime", "DisplayName", "Parent", "ComplianceRegime", "ResourceSettings",
});
com.google.protobuf.ExtensionRegistry registry =
com.google.protobuf.ExtensionRegistry.newInstance();
Expand Down
Loading

0 comments on commit d949e0e

Please sign in to comment.