Skip to content

Commit 09ceeaf

Browse files
yoshi-automationsofisl
yoshi-automation
authored and
sofisl
committed
feat(workloadmanager): update the API
#### workloadmanager:v1 The following keys were added: - schemas.AssetLocation.properties.ccfeRmsPath.description - schemas.AssetLocation.properties.ccfeRmsPath.type - schemas.IsolationExpectations.properties.requirementOverride.$ref - schemas.IsolationExpectations.properties.requirementOverride.description - schemas.RequirementOverride.id - schemas.RequirementOverride.properties.ziOverride.enum - schemas.RequirementOverride.properties.ziOverride.enumDescriptions - schemas.RequirementOverride.properties.ziOverride.type - schemas.RequirementOverride.properties.zsOverride.enum - schemas.RequirementOverride.properties.zsOverride.enumDescriptions - schemas.RequirementOverride.properties.zsOverride.type - schemas.RequirementOverride.type - schemas.SpannerLocation.properties.backupName.description - schemas.SpannerLocation.properties.backupName.items.type - schemas.SpannerLocation.properties.backupName.type - schemas.SpannerLocation.properties.dbName.description The following keys were changed: - schemas.ExternalDataSources.properties.assetType.description - schemas.SapDiscoveryResourceInstanceProperties.properties.instanceRole.enum - schemas.SapDiscoveryResourceInstanceProperties.properties.instanceRole.enumDescriptions
1 parent 447c5f3 commit 09ceeaf

File tree

2 files changed

+100
-5
lines changed

2 files changed

+100
-5
lines changed

‎discovery/workloadmanager-v1.json

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
}
773773
}
774774
},
775-
"revision": "20240619",
775+
"revision": "20240717",
776776
"rootUrl": "https://workloadmanager.googleapis.com/",
777777
"schemas": {
778778
"AgentCommand": {
@@ -797,6 +797,10 @@
797797
"description": "Provides the mapping of a cloud asset to a direct physical location or to a proxy that defines the location on its behalf.",
798798
"id": "AssetLocation",
799799
"properties": {
800+
"ccfeRmsPath": {
801+
"description": "Spanner path of the CCFE RMS database. It is only applicable for CCFE tenants that use CCFE RMS for storing resource metadata.",
802+
"type": "string"
803+
},
800804
"expected": {
801805
"$ref": "IsolationExpectations",
802806
"description": "Defines the customer expectation around ZI/ZS for this asset and ZI/ZS state of the region at the time of asset creation."
@@ -1108,7 +1112,7 @@
11081112
"id": "ExternalDataSources",
11091113
"properties": {
11101114
"assetType": {
1111-
"description": "Required. The asset type of the external data source must be one of go/cai-asset-types",
1115+
"description": "Required. The asset type of the external data source this can be one of go/cai-asset-types to override the default asset type or it can be a custom type defined by the user custom type must match the asset type in the rule",
11121116
"type": "string"
11131117
},
11141118
"name": {
@@ -1191,6 +1195,10 @@
11911195
"IsolationExpectations": {
11921196
"id": "IsolationExpectations",
11931197
"properties": {
1198+
"requirementOverride": {
1199+
"$ref": "RequirementOverride",
1200+
"description": "Explicit overrides for ZI and ZS requirements to be used for resources that should be excluded from ZI/ZS verification logic."
1201+
},
11941202
"ziOrgPolicy": {
11951203
"enum": [
11961204
"ZI_UNSPECIFIED",
@@ -1650,6 +1658,44 @@
16501658
},
16511659
"type": "object"
16521660
},
1661+
"RequirementOverride": {
1662+
"id": "RequirementOverride",
1663+
"properties": {
1664+
"ziOverride": {
1665+
"enum": [
1666+
"ZI_UNSPECIFIED",
1667+
"ZI_UNKNOWN",
1668+
"ZI_NOT_REQUIRED",
1669+
"ZI_PREFERRED",
1670+
"ZI_REQUIRED"
1671+
],
1672+
"enumDescriptions": [
1673+
"",
1674+
"To be used if tracking is not available",
1675+
"",
1676+
"",
1677+
""
1678+
],
1679+
"type": "string"
1680+
},
1681+
"zsOverride": {
1682+
"enum": [
1683+
"ZS_UNSPECIFIED",
1684+
"ZS_UNKNOWN",
1685+
"ZS_NOT_REQUIRED",
1686+
"ZS_REQUIRED"
1687+
],
1688+
"enumDescriptions": [
1689+
"",
1690+
"To be used if tracking is not available",
1691+
"",
1692+
""
1693+
],
1694+
"type": "string"
1695+
}
1696+
},
1697+
"type": "object"
1698+
},
16531699
"Resource": {
16541700
"description": "Message represent resource in execution result",
16551701
"id": "Resource",
@@ -2124,14 +2170,36 @@
21242170
"INSTANCE_ROLE_ASCS",
21252171
"INSTANCE_ROLE_ERS",
21262172
"INSTANCE_ROLE_APP_SERVER",
2127-
"INSTANCE_ROLE_DATABASE"
2173+
"INSTANCE_ROLE_DATABASE",
2174+
"INSTANCE_ROLE_ASCS_ERS",
2175+
"INSTANCE_ROLE_ASCS_APP_SERVER",
2176+
"INSTANCE_ROLE_ASCS_DATABASE",
2177+
"INSTANCE_ROLE_ERS_APP_SERVER",
2178+
"INSTANCE_ROLE_ERS_DATABASE",
2179+
"INSTANCE_ROLE_APP_SERVER_DATABASE",
2180+
"INSTANCE_ROLE_ASCS_ERS_APP_SERVER",
2181+
"INSTANCE_ROLE_ASCS_ERS_DATABASE",
2182+
"INSTANCE_ROLE_ASCS_APP_SERVER_DATABASE",
2183+
"INSTANCE_ROLE_ERS_APP_SERVER_DATABASE",
2184+
"INSTANCE_ROLE_ASCS_ERS_APP_SERVER_DATABASE"
21282185
],
21292186
"enumDescriptions": [
21302187
"Unspecified instance role.",
21312188
"Application central services.",
21322189
"Enqueue replication server.",
21332190
"Application server.",
2134-
"Database node."
2191+
"Database node.",
2192+
"Combinations of roles. Application central services and enqueue replication server.",
2193+
"Application central services and application server.",
2194+
"Application central services and database.",
2195+
"Enqueue replication server and application server.",
2196+
"Enqueue replication server and database.",
2197+
"Application server and database.",
2198+
"Application central services, enqueue replication server and application server.",
2199+
"Application central services, enqueue replication server and database.",
2200+
"Application central services, application server and database.",
2201+
"Enqueue replication server, application server and database.",
2202+
"Application central services, enqueue replication server, application server and database."
21352203
],
21362204
"type": "string"
21372205
},
@@ -2318,7 +2386,15 @@
23182386
"SpannerLocation": {
23192387
"id": "SpannerLocation",
23202388
"properties": {
2389+
"backupName": {
2390+
"description": "Set of backups used by the resource with name in the same format as what is available at http://table/spanner_automon.backup_metadata",
2391+
"items": {
2392+
"type": "string"
2393+
},
2394+
"type": "array"
2395+
},
23212396
"dbName": {
2397+
"description": "Set of databases used by the resource in format /span//",
23222398
"items": {
23232399
"type": "string"
23242400
},

‎src/apis/workloadmanager/v1.ts

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ export namespace workloadmanager_v1 {
141141
* Provides the mapping of a cloud asset to a direct physical location or to a proxy that defines the location on its behalf.
142142
*/
143143
export interface Schema$AssetLocation {
144+
/**
145+
* Spanner path of the CCFE RMS database. It is only applicable for CCFE tenants that use CCFE RMS for storing resource metadata.
146+
*/
147+
ccfeRmsPath?: string | null;
144148
/**
145149
* Defines the customer expectation around ZI/ZS for this asset and ZI/ZS state of the region at the time of asset creation.
146150
*/
@@ -340,7 +344,7 @@ export namespace workloadmanager_v1 {
340344
*/
341345
export interface Schema$ExternalDataSources {
342346
/**
343-
* Required. The asset type of the external data source must be one of go/cai-asset-types
347+
* Required. The asset type of the external data source this can be one of go/cai-asset-types to override the default asset type or it can be a custom type defined by the user custom type must match the asset type in the rule
344348
*/
345349
assetType?: string | null;
346350
/**
@@ -400,6 +404,10 @@ export namespace workloadmanager_v1 {
400404
sqlserverValidation?: Schema$SqlserverValidation;
401405
}
402406
export interface Schema$IsolationExpectations {
407+
/**
408+
* Explicit overrides for ZI and ZS requirements to be used for resources that should be excluded from ZI/ZS verification logic.
409+
*/
410+
requirementOverride?: Schema$RequirementOverride;
403411
ziOrgPolicy?: string | null;
404412
ziRegionPolicy?: string | null;
405413
ziRegionState?: string | null;
@@ -630,6 +638,10 @@ export namespace workloadmanager_v1 {
630638
*/
631639
zones?: Schema$ZoneConfiguration[];
632640
}
641+
export interface Schema$RequirementOverride {
642+
ziOverride?: string | null;
643+
zsOverride?: string | null;
644+
}
633645
/**
634646
* Message represent resource in execution result
635647
*/
@@ -1083,6 +1095,13 @@ export namespace workloadmanager_v1 {
10831095
timeoutSeconds?: number | null;
10841096
}
10851097
export interface Schema$SpannerLocation {
1098+
/**
1099+
* Set of backups used by the resource with name in the same format as what is available at http://table/spanner_automon.backup_metadata
1100+
*/
1101+
backupName?: string[] | null;
1102+
/**
1103+
* Set of databases used by the resource in format /span//
1104+
*/
10861105
dbName?: string[] | null;
10871106
}
10881107
/**

0 commit comments

Comments
 (0)