Skip to content

Commit ca151f7

Browse files
DCL Teamcopybara-github
DCL Team
authored and
copybara-github
committed
Automated DCL import.
 - 6e050a71b5c25e55d791c40976e9226edc4a1ea4 Automatic import from cloud_mmv2_dcl_20240826_0931_RC00 by DCL Team <[email protected]> GitOrigin-RevId: 6e050a71b5c25e55d791c40976e9226edc4a1ea4
1 parent 8f44670 commit ca151f7

31 files changed

+395
-73
lines changed

‎python/proto/assuredworkloads/alpha/workload.proto

+20-15
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ enum AssuredworkloadsAlphaWorkloadComplianceRegimeEnum {
5151
AssuredworkloadsAlphaWorkloadComplianceRegimeEnumIL5 = 17;
5252
AssuredworkloadsAlphaWorkloadComplianceRegimeEnumIL2 = 18;
5353
AssuredworkloadsAlphaWorkloadComplianceRegimeEnumJP_REGIONS_AND_SUPPORT = 19;
54+
AssuredworkloadsAlphaWorkloadComplianceRegimeEnumKSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS = 20;
55+
AssuredworkloadsAlphaWorkloadComplianceRegimeEnumREGIONAL_CONTROLS = 21;
5456
}
5557

5658
enum AssuredworkloadsAlphaWorkloadResourceSettingsResourceTypeEnum {
@@ -92,6 +94,8 @@ enum AssuredworkloadsAlphaWorkloadPartnerEnum {
9294
AssuredworkloadsAlphaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_T_SYSTEMS = 3;
9395
AssuredworkloadsAlphaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_SIA_MINSAIT = 4;
9496
AssuredworkloadsAlphaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_PSN = 5;
97+
AssuredworkloadsAlphaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_CNTXT = 6;
98+
AssuredworkloadsAlphaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_CNTXT_NO_EKM = 7;
9599
}
96100

97101
enum AssuredworkloadsAlphaWorkloadEkmProvisioningResponseEkmProvisioningStateEnum {
@@ -127,21 +131,22 @@ message AssuredworkloadsAlphaWorkload {
127131
AssuredworkloadsAlphaWorkloadComplianceRegimeEnum compliance_regime = 4;
128132
string create_time = 5;
129133
string billing_account = 6;
130-
map<string, string> labels = 7;
131-
string provisioned_resources_parent = 8;
132-
AssuredworkloadsAlphaWorkloadKmsSettings kms_settings = 9;
133-
repeated AssuredworkloadsAlphaWorkloadResourceSettings resource_settings = 10;
134-
AssuredworkloadsAlphaWorkloadKajEnrollmentStateEnum kaj_enrollment_state = 11;
135-
bool enable_sovereign_controls = 12;
136-
AssuredworkloadsAlphaWorkloadSaaEnrollmentResponse saa_enrollment_response = 13;
137-
AssuredworkloadsAlphaWorkloadComplianceStatus compliance_status = 14;
138-
repeated string compliant_but_disallowed_services = 15;
139-
AssuredworkloadsAlphaWorkloadPartnerEnum partner = 16;
140-
AssuredworkloadsAlphaWorkloadPartnerPermissions partner_permissions = 17;
141-
AssuredworkloadsAlphaWorkloadEkmProvisioningResponse ekm_provisioning_response = 18;
142-
bool violation_notifications_enabled = 19;
143-
string organization = 20;
144-
string location = 21;
134+
string partner_services_billing_account = 7;
135+
map<string, string> labels = 8;
136+
string provisioned_resources_parent = 9;
137+
AssuredworkloadsAlphaWorkloadKmsSettings kms_settings = 10;
138+
repeated AssuredworkloadsAlphaWorkloadResourceSettings resource_settings = 11;
139+
AssuredworkloadsAlphaWorkloadKajEnrollmentStateEnum kaj_enrollment_state = 12;
140+
bool enable_sovereign_controls = 13;
141+
AssuredworkloadsAlphaWorkloadSaaEnrollmentResponse saa_enrollment_response = 14;
142+
AssuredworkloadsAlphaWorkloadComplianceStatus compliance_status = 15;
143+
repeated string compliant_but_disallowed_services = 16;
144+
AssuredworkloadsAlphaWorkloadPartnerEnum partner = 17;
145+
AssuredworkloadsAlphaWorkloadPartnerPermissions partner_permissions = 18;
146+
AssuredworkloadsAlphaWorkloadEkmProvisioningResponse ekm_provisioning_response = 19;
147+
bool violation_notifications_enabled = 20;
148+
string organization = 21;
149+
string location = 22;
145150
}
146151

147152
message AssuredworkloadsAlphaWorkloadResources {

‎python/proto/assuredworkloads/beta/workload.proto

+20-15
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ enum AssuredworkloadsBetaWorkloadComplianceRegimeEnum {
5151
AssuredworkloadsBetaWorkloadComplianceRegimeEnumIL5 = 17;
5252
AssuredworkloadsBetaWorkloadComplianceRegimeEnumIL2 = 18;
5353
AssuredworkloadsBetaWorkloadComplianceRegimeEnumJP_REGIONS_AND_SUPPORT = 19;
54+
AssuredworkloadsBetaWorkloadComplianceRegimeEnumKSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS = 20;
55+
AssuredworkloadsBetaWorkloadComplianceRegimeEnumREGIONAL_CONTROLS = 21;
5456
}
5557

5658
enum AssuredworkloadsBetaWorkloadResourceSettingsResourceTypeEnum {
@@ -92,6 +94,8 @@ enum AssuredworkloadsBetaWorkloadPartnerEnum {
9294
AssuredworkloadsBetaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_T_SYSTEMS = 3;
9395
AssuredworkloadsBetaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_SIA_MINSAIT = 4;
9496
AssuredworkloadsBetaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_PSN = 5;
97+
AssuredworkloadsBetaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_CNTXT = 6;
98+
AssuredworkloadsBetaWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_CNTXT_NO_EKM = 7;
9599
}
96100

97101
enum AssuredworkloadsBetaWorkloadEkmProvisioningResponseEkmProvisioningStateEnum {
@@ -127,21 +131,22 @@ message AssuredworkloadsBetaWorkload {
127131
AssuredworkloadsBetaWorkloadComplianceRegimeEnum compliance_regime = 4;
128132
string create_time = 5;
129133
string billing_account = 6;
130-
map<string, string> labels = 7;
131-
string provisioned_resources_parent = 8;
132-
AssuredworkloadsBetaWorkloadKmsSettings kms_settings = 9;
133-
repeated AssuredworkloadsBetaWorkloadResourceSettings resource_settings = 10;
134-
AssuredworkloadsBetaWorkloadKajEnrollmentStateEnum kaj_enrollment_state = 11;
135-
bool enable_sovereign_controls = 12;
136-
AssuredworkloadsBetaWorkloadSaaEnrollmentResponse saa_enrollment_response = 13;
137-
AssuredworkloadsBetaWorkloadComplianceStatus compliance_status = 14;
138-
repeated string compliant_but_disallowed_services = 15;
139-
AssuredworkloadsBetaWorkloadPartnerEnum partner = 16;
140-
AssuredworkloadsBetaWorkloadPartnerPermissions partner_permissions = 17;
141-
AssuredworkloadsBetaWorkloadEkmProvisioningResponse ekm_provisioning_response = 18;
142-
bool violation_notifications_enabled = 19;
143-
string organization = 20;
144-
string location = 21;
134+
string partner_services_billing_account = 7;
135+
map<string, string> labels = 8;
136+
string provisioned_resources_parent = 9;
137+
AssuredworkloadsBetaWorkloadKmsSettings kms_settings = 10;
138+
repeated AssuredworkloadsBetaWorkloadResourceSettings resource_settings = 11;
139+
AssuredworkloadsBetaWorkloadKajEnrollmentStateEnum kaj_enrollment_state = 12;
140+
bool enable_sovereign_controls = 13;
141+
AssuredworkloadsBetaWorkloadSaaEnrollmentResponse saa_enrollment_response = 14;
142+
AssuredworkloadsBetaWorkloadComplianceStatus compliance_status = 15;
143+
repeated string compliant_but_disallowed_services = 16;
144+
AssuredworkloadsBetaWorkloadPartnerEnum partner = 17;
145+
AssuredworkloadsBetaWorkloadPartnerPermissions partner_permissions = 18;
146+
AssuredworkloadsBetaWorkloadEkmProvisioningResponse ekm_provisioning_response = 19;
147+
bool violation_notifications_enabled = 20;
148+
string organization = 21;
149+
string location = 22;
145150
}
146151

147152
message AssuredworkloadsBetaWorkloadResources {

‎python/proto/assuredworkloads/workload.proto

+20-15
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ enum AssuredworkloadsWorkloadComplianceRegimeEnum {
5151
AssuredworkloadsWorkloadComplianceRegimeEnumIL5 = 17;
5252
AssuredworkloadsWorkloadComplianceRegimeEnumIL2 = 18;
5353
AssuredworkloadsWorkloadComplianceRegimeEnumJP_REGIONS_AND_SUPPORT = 19;
54+
AssuredworkloadsWorkloadComplianceRegimeEnumKSA_REGIONS_AND_SUPPORT_WITH_SOVEREIGNTY_CONTROLS = 20;
55+
AssuredworkloadsWorkloadComplianceRegimeEnumREGIONAL_CONTROLS = 21;
5456
}
5557

5658
enum AssuredworkloadsWorkloadResourceSettingsResourceTypeEnum {
@@ -92,6 +94,8 @@ enum AssuredworkloadsWorkloadPartnerEnum {
9294
AssuredworkloadsWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_T_SYSTEMS = 3;
9395
AssuredworkloadsWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_SIA_MINSAIT = 4;
9496
AssuredworkloadsWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_PSN = 5;
97+
AssuredworkloadsWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_CNTXT = 6;
98+
AssuredworkloadsWorkloadPartnerEnumSOVEREIGN_CONTROLS_BY_CNTXT_NO_EKM = 7;
9599
}
96100

97101
enum AssuredworkloadsWorkloadEkmProvisioningResponseEkmProvisioningStateEnum {
@@ -127,21 +131,22 @@ message AssuredworkloadsWorkload {
127131
AssuredworkloadsWorkloadComplianceRegimeEnum compliance_regime = 4;
128132
string create_time = 5;
129133
string billing_account = 6;
130-
map<string, string> labels = 7;
131-
string provisioned_resources_parent = 8;
132-
AssuredworkloadsWorkloadKmsSettings kms_settings = 9;
133-
repeated AssuredworkloadsWorkloadResourceSettings resource_settings = 10;
134-
AssuredworkloadsWorkloadKajEnrollmentStateEnum kaj_enrollment_state = 11;
135-
bool enable_sovereign_controls = 12;
136-
AssuredworkloadsWorkloadSaaEnrollmentResponse saa_enrollment_response = 13;
137-
AssuredworkloadsWorkloadComplianceStatus compliance_status = 14;
138-
repeated string compliant_but_disallowed_services = 15;
139-
AssuredworkloadsWorkloadPartnerEnum partner = 16;
140-
AssuredworkloadsWorkloadPartnerPermissions partner_permissions = 17;
141-
AssuredworkloadsWorkloadEkmProvisioningResponse ekm_provisioning_response = 18;
142-
bool violation_notifications_enabled = 19;
143-
string organization = 20;
144-
string location = 21;
134+
string partner_services_billing_account = 7;
135+
map<string, string> labels = 8;
136+
string provisioned_resources_parent = 9;
137+
AssuredworkloadsWorkloadKmsSettings kms_settings = 10;
138+
repeated AssuredworkloadsWorkloadResourceSettings resource_settings = 11;
139+
AssuredworkloadsWorkloadKajEnrollmentStateEnum kaj_enrollment_state = 12;
140+
bool enable_sovereign_controls = 13;
141+
AssuredworkloadsWorkloadSaaEnrollmentResponse saa_enrollment_response = 14;
142+
AssuredworkloadsWorkloadComplianceStatus compliance_status = 15;
143+
repeated string compliant_but_disallowed_services = 16;
144+
AssuredworkloadsWorkloadPartnerEnum partner = 17;
145+
AssuredworkloadsWorkloadPartnerPermissions partner_permissions = 18;
146+
AssuredworkloadsWorkloadEkmProvisioningResponse ekm_provisioning_response = 19;
147+
bool violation_notifications_enabled = 20;
148+
string organization = 21;
149+
string location = 22;
145150
}
146151

147152
message AssuredworkloadsWorkloadResources {

‎python/services/assuredworkloads/alpha/workload.py

+19
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def __init__(
2929
compliance_regime: str = None,
3030
create_time: str = None,
3131
billing_account: str = None,
32+
partner_services_billing_account: str = None,
3233
labels: dict = None,
3334
provisioned_resources_parent: str = None,
3435
kms_settings: dict = None,
@@ -52,6 +53,7 @@ def __init__(
5253
self.display_name = display_name
5354
self.compliance_regime = compliance_regime
5455
self.billing_account = billing_account
56+
self.partner_services_billing_account = partner_services_billing_account
5557
self.labels = labels
5658
self.provisioned_resources_parent = provisioned_resources_parent
5759
self.kms_settings = kms_settings
@@ -83,6 +85,11 @@ def apply(self):
8385
if Primitive.to_proto(self.billing_account):
8486
request.resource.billing_account = Primitive.to_proto(self.billing_account)
8587

88+
if Primitive.to_proto(self.partner_services_billing_account):
89+
request.resource.partner_services_billing_account = Primitive.to_proto(
90+
self.partner_services_billing_account
91+
)
92+
8693
if Primitive.to_proto(self.labels):
8794
request.resource.labels = Primitive.to_proto(self.labels)
8895

@@ -137,6 +144,9 @@ def apply(self):
137144
)
138145
self.create_time = Primitive.from_proto(response.create_time)
139146
self.billing_account = Primitive.from_proto(response.billing_account)
147+
self.partner_services_billing_account = Primitive.from_proto(
148+
response.partner_services_billing_account
149+
)
140150
self.labels = Primitive.from_proto(response.labels)
141151
self.provisioned_resources_parent = Primitive.from_proto(
142152
response.provisioned_resources_parent
@@ -193,6 +203,11 @@ def delete(self):
193203
if Primitive.to_proto(self.billing_account):
194204
request.resource.billing_account = Primitive.to_proto(self.billing_account)
195205

206+
if Primitive.to_proto(self.partner_services_billing_account):
207+
request.resource.partner_services_billing_account = Primitive.to_proto(
208+
self.partner_services_billing_account
209+
)
210+
196211
if Primitive.to_proto(self.labels):
197212
request.resource.labels = Primitive.to_proto(self.labels)
198213

@@ -263,6 +278,10 @@ def to_proto(self):
263278
)
264279
if Primitive.to_proto(self.billing_account):
265280
resource.billing_account = Primitive.to_proto(self.billing_account)
281+
if Primitive.to_proto(self.partner_services_billing_account):
282+
resource.partner_services_billing_account = Primitive.to_proto(
283+
self.partner_services_billing_account
284+
)
266285
if Primitive.to_proto(self.labels):
267286
resource.labels = Primitive.to_proto(self.labels)
268287
if Primitive.to_proto(self.provisioned_resources_parent):

‎python/services/assuredworkloads/alpha/workload_server.go

+2
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ func ProtoToWorkload(p *alphapb.AssuredworkloadsAlphaWorkload) *alpha.Workload {
244244
ComplianceRegime: ProtoToAssuredworkloadsAlphaWorkloadComplianceRegimeEnum(p.GetComplianceRegime()),
245245
CreateTime: dcl.StringOrNil(p.GetCreateTime()),
246246
BillingAccount: dcl.StringOrNil(p.GetBillingAccount()),
247+
PartnerServicesBillingAccount: dcl.StringOrNil(p.GetPartnerServicesBillingAccount()),
247248
ProvisionedResourcesParent: dcl.StringOrNil(p.GetProvisionedResourcesParent()),
248249
KmsSettings: ProtoToAssuredworkloadsAlphaWorkloadKmsSettings(p.GetKmsSettings()),
249250
KajEnrollmentState: ProtoToAssuredworkloadsAlphaWorkloadKajEnrollmentStateEnum(p.GetKajEnrollmentState()),
@@ -479,6 +480,7 @@ func WorkloadToProto(resource *alpha.Workload) *alphapb.AssuredworkloadsAlphaWor
479480
p.SetComplianceRegime(AssuredworkloadsAlphaWorkloadComplianceRegimeEnumToProto(resource.ComplianceRegime))
480481
p.SetCreateTime(dcl.ValueOrEmptyString(resource.CreateTime))
481482
p.SetBillingAccount(dcl.ValueOrEmptyString(resource.BillingAccount))
483+
p.SetPartnerServicesBillingAccount(dcl.ValueOrEmptyString(resource.PartnerServicesBillingAccount))
482484
p.SetProvisionedResourcesParent(dcl.ValueOrEmptyString(resource.ProvisionedResourcesParent))
483485
p.SetKmsSettings(AssuredworkloadsAlphaWorkloadKmsSettingsToProto(resource.KmsSettings))
484486
p.SetKajEnrollmentState(AssuredworkloadsAlphaWorkloadKajEnrollmentStateEnumToProto(resource.KajEnrollmentState))

‎python/services/assuredworkloads/beta/workload.py

+19
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def __init__(
2929
compliance_regime: str = None,
3030
create_time: str = None,
3131
billing_account: str = None,
32+
partner_services_billing_account: str = None,
3233
labels: dict = None,
3334
provisioned_resources_parent: str = None,
3435
kms_settings: dict = None,
@@ -52,6 +53,7 @@ def __init__(
5253
self.display_name = display_name
5354
self.compliance_regime = compliance_regime
5455
self.billing_account = billing_account
56+
self.partner_services_billing_account = partner_services_billing_account
5557
self.labels = labels
5658
self.provisioned_resources_parent = provisioned_resources_parent
5759
self.kms_settings = kms_settings
@@ -83,6 +85,11 @@ def apply(self):
8385
if Primitive.to_proto(self.billing_account):
8486
request.resource.billing_account = Primitive.to_proto(self.billing_account)
8587

88+
if Primitive.to_proto(self.partner_services_billing_account):
89+
request.resource.partner_services_billing_account = Primitive.to_proto(
90+
self.partner_services_billing_account
91+
)
92+
8693
if Primitive.to_proto(self.labels):
8794
request.resource.labels = Primitive.to_proto(self.labels)
8895

@@ -137,6 +144,9 @@ def apply(self):
137144
)
138145
self.create_time = Primitive.from_proto(response.create_time)
139146
self.billing_account = Primitive.from_proto(response.billing_account)
147+
self.partner_services_billing_account = Primitive.from_proto(
148+
response.partner_services_billing_account
149+
)
140150
self.labels = Primitive.from_proto(response.labels)
141151
self.provisioned_resources_parent = Primitive.from_proto(
142152
response.provisioned_resources_parent
@@ -193,6 +203,11 @@ def delete(self):
193203
if Primitive.to_proto(self.billing_account):
194204
request.resource.billing_account = Primitive.to_proto(self.billing_account)
195205

206+
if Primitive.to_proto(self.partner_services_billing_account):
207+
request.resource.partner_services_billing_account = Primitive.to_proto(
208+
self.partner_services_billing_account
209+
)
210+
196211
if Primitive.to_proto(self.labels):
197212
request.resource.labels = Primitive.to_proto(self.labels)
198213

@@ -263,6 +278,10 @@ def to_proto(self):
263278
)
264279
if Primitive.to_proto(self.billing_account):
265280
resource.billing_account = Primitive.to_proto(self.billing_account)
281+
if Primitive.to_proto(self.partner_services_billing_account):
282+
resource.partner_services_billing_account = Primitive.to_proto(
283+
self.partner_services_billing_account
284+
)
266285
if Primitive.to_proto(self.labels):
267286
resource.labels = Primitive.to_proto(self.labels)
268287
if Primitive.to_proto(self.provisioned_resources_parent):

‎python/services/assuredworkloads/beta/workload_server.go

+2
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ func ProtoToWorkload(p *betapb.AssuredworkloadsBetaWorkload) *beta.Workload {
244244
ComplianceRegime: ProtoToAssuredworkloadsBetaWorkloadComplianceRegimeEnum(p.GetComplianceRegime()),
245245
CreateTime: dcl.StringOrNil(p.GetCreateTime()),
246246
BillingAccount: dcl.StringOrNil(p.GetBillingAccount()),
247+
PartnerServicesBillingAccount: dcl.StringOrNil(p.GetPartnerServicesBillingAccount()),
247248
ProvisionedResourcesParent: dcl.StringOrNil(p.GetProvisionedResourcesParent()),
248249
KmsSettings: ProtoToAssuredworkloadsBetaWorkloadKmsSettings(p.GetKmsSettings()),
249250
KajEnrollmentState: ProtoToAssuredworkloadsBetaWorkloadKajEnrollmentStateEnum(p.GetKajEnrollmentState()),
@@ -479,6 +480,7 @@ func WorkloadToProto(resource *beta.Workload) *betapb.AssuredworkloadsBetaWorklo
479480
p.SetComplianceRegime(AssuredworkloadsBetaWorkloadComplianceRegimeEnumToProto(resource.ComplianceRegime))
480481
p.SetCreateTime(dcl.ValueOrEmptyString(resource.CreateTime))
481482
p.SetBillingAccount(dcl.ValueOrEmptyString(resource.BillingAccount))
483+
p.SetPartnerServicesBillingAccount(dcl.ValueOrEmptyString(resource.PartnerServicesBillingAccount))
482484
p.SetProvisionedResourcesParent(dcl.ValueOrEmptyString(resource.ProvisionedResourcesParent))
483485
p.SetKmsSettings(AssuredworkloadsBetaWorkloadKmsSettingsToProto(resource.KmsSettings))
484486
p.SetKajEnrollmentState(AssuredworkloadsBetaWorkloadKajEnrollmentStateEnumToProto(resource.KajEnrollmentState))

0 commit comments

Comments
 (0)