Skip to content

Commit 237753f

Browse files
emmeliaAraGoradeAartitadelesh
authored
[Hub Generated] Publish private branch 'feature/CloudHsm_updates' (#24115)
* adding new resource type 'CloudHsm' with new API version * added systemData in responses and fixed few warnings * renamings * added stateMessage * removed PrivateEndpointConnectionProxy APIs and examples * API version folder renamed * updated ReadMe.md * renamings, fixing validation errors * fixed avocado errors * fixed prettier errors * fixed prettier errors * fixed validation errors * fixed prettier errors * fixed prettier errors * fixed linfdiff errors * fixed LintDiff errors * fixed linfdiff errors * fixed staging LintDiff errors * fixed LintDiff errors * fixed lintdiff errors * removed pageable extention from CloudHsmPrivateLinkResource_ListByCloudHsm * renamings * used referecing for private endpoint connection and private link resource under common types * fixed review comments * fixed resourceType in exmaple * renamed CloudHsm to CloudHsmCluster * renamed hsmId to fqdn * fixed description * modified default tag in Readme.md * changed tag value to package-2022-08-preview * Update specification/hardwaresecuritymodules/resource-manager/readme.md Co-authored-by: Chenjie Shi <[email protected]> * Update readme.md * Update readme.md * fixing lintdiff errors, also fixing old DHSM errors * fixing syntax errors * removed operations examples from cloudhsm * added ResourceNameRestriction for peConnectionName * added ResourceNameRestriction for peConnectionName * added pattern for peConnectionName * fixing prettier check * Using Common-types definitions for TrackedResource * created separate folders for different sub services * reverting to common folder structure * To resolve duplicate definition errors * fixing Swagger Staging lintDiff error * Update Cloud Hsm swagger specifications * update api-versions to resolve Model Validation issues * update api version in example file * added chsmOperation to custom-words.txt * Removed chsmOperation, replaced CHsmTrackedResource with TrackedResource and AzureResource with ProxyResource. Removed unused definitions/ * Set final-state-via to CreateOperationAsyncResponseValidation and added x-ms-pageable to resolve LintDiff validation issue * fix lintdiff issue * update final-state-via for put operation to Original-Uri * Replaced ProxyResource with TrackedResource in PrivateEndPointConnection because location and tags are also needed. * Reverted previouse commit to resolve LintDiff issue and included location and etags to PrivateEndpointConnetion. * removed white space to resolve Prettier check issue * updated etag description * Updated skiptoken type from integer to string based on code update. * Fix required value for skiptoken * make update for LintDiff issue - PutResponseSchemaDescription * make update for LintDiff issue - PutResponseSchemaDescription * Removed location and added groupIds from PrivateEndpointConnection definition in line with NRP Documentation * update swagger to reflect ARM feedback * Added Canceled state to PrivateEndpointConnectionProvisioningState enum as per ARM review request * Renamed "Resource" Definition in Dedicated hsm swagger file to resolve azure-sdk-for-go error caused by duplicate schema. "CloudHsmClusterResource" indirectly references the common-type"Resource" and this conflicts with "Resource" definition in dedicatedhsm swagger. * Remove duplicate type tag from DedicatedHsmResource * updated readme file to fix ~[Staging] Service API Readiness Test failed error * updated readme file to fix ~[Staging] Service API Readiness Test fail * update readme file to resolve ~[Staging] Service API Readiness Test failure --------- Co-authored-by: GoradeAarti <[email protected]> Co-authored-by: GoradeAarti <[email protected]> Co-authored-by: Chenjie Shi <[email protected]>
1 parent 526e604 commit 237753f

15 files changed

+1544
-27
lines changed

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/cloudhsm.json

Lines changed: 918 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmClusterPrivateEndpointConnection_Create_MaximumSet_Gen.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview",
7+
"peConnectionName": "sample-pec",
8+
"properties": {
9+
"properties": {
10+
"privateLinkServiceConnectionState": {
11+
"status": "Approved",
12+
"description": "My name is Joe and I'm approving this."
13+
}
14+
}
15+
}
16+
},
17+
"responses": {
18+
"200": {
19+
"body": {
20+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1/privateEndpointConnections/sample-pec",
21+
"name": "sample-pec",
22+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters/privateEndpointConnections",
23+
"systemData": {
24+
"createdBy": "User1",
25+
"createdByType": "User",
26+
"createdAt": "2020-01-01T12:00:00.0000000Z",
27+
"lastModifiedBy": "User2",
28+
"lastModifiedByType": "User",
29+
"lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
30+
},
31+
"properties": {
32+
"provisioningState": "Succeeded",
33+
"privateEndpoint": {
34+
"id": "/subscriptions/00000000-0000-0000-1234-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.Network/privateEndpoints/sample-pec"
35+
},
36+
"privateLinkServiceConnectionState": {
37+
"status": "Approved",
38+
"description": "My name is Joe and I'm approving this.",
39+
"actionsRequired": "None"
40+
}
41+
}
42+
}
43+
}
44+
}
45+
}

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmClusterPrivateEndpointConnection_Delete_MaximumSet_Gen.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview",
7+
"peConnectionName": "sample-pec"
8+
},
9+
"responses": {
10+
"200": {},
11+
"202": {
12+
"headers": {
13+
"location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1/privateEndpointConnections/sample-pec?operationid=25334578"
14+
}
15+
},
16+
"204": {}
17+
}
18+
}

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmClusterPrivateEndpointConnection_Get_MaximumSet_Gen.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview",
7+
"peConnectionName": "sample-pec"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1/privateEndpointConnections/sample-pec",
13+
"name": "sample-pec",
14+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters/privateEndpointConnections",
15+
"systemData": {
16+
"createdBy": "User1",
17+
"createdByType": "User",
18+
"createdAt": "2020-01-01T12:00:00.0000000Z",
19+
"lastModifiedBy": "User2",
20+
"lastModifiedByType": "User",
21+
"lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
22+
},
23+
"properties": {
24+
"provisioningState": "Succeeded",
25+
"privateEndpoint": {
26+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.Network/privateEndpoints/sample-pec"
27+
},
28+
"privateLinkServiceConnectionState": {
29+
"status": "Approved",
30+
"description": "This was automatically approved by [email protected]",
31+
"actionsRequired": "None"
32+
}
33+
}
34+
}
35+
}
36+
}
37+
}

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmClusterPrivateEndpointConnection_ListByCloudHsmCluster_MaximumSet_Gen.json

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"value": [
12+
{
13+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1/privateEndpointConnections/sample-pec1",
14+
"name": "chsm1",
15+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters/privateEndpointConnections",
16+
"systemData": {
17+
"createdBy": "User1",
18+
"createdByType": "User",
19+
"createdAt": "2020-01-01T12:00:00.0000000Z",
20+
"lastModifiedBy": "User2",
21+
"lastModifiedByType": "User",
22+
"lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
23+
},
24+
"properties": {
25+
"provisioningState": "Succeeded",
26+
"privateEndpoint": {
27+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.Network/privateEndpoints/sample-pec1"
28+
},
29+
"privateLinkServiceConnectionState": {
30+
"status": "Approved",
31+
"description": "This was automatically approved by [email protected]",
32+
"actionsRequired": "None"
33+
}
34+
}
35+
},
36+
{
37+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm2/privateEndpointConnections/sample-pec2",
38+
"name": "chsm2",
39+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters/privateEndpointConnections",
40+
"systemData": {
41+
"createdBy": "User1",
42+
"createdByType": "User",
43+
"createdAt": "2020-01-01T12:00:00.0000000Z",
44+
"lastModifiedBy": "User2",
45+
"lastModifiedByType": "User",
46+
"lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
47+
},
48+
"properties": {
49+
"provisioningState": "Succeeded",
50+
"privateEndpoint": {
51+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.Network/privateEndpoints/sample-pec2"
52+
},
53+
"privateLinkServiceConnectionState": {
54+
"status": "Approved",
55+
"description": "This was automatically approved by [email protected]",
56+
"actionsRequired": "None"
57+
}
58+
}
59+
}
60+
]
61+
}
62+
}
63+
}
64+
}

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmClusterPrivateLinkResource_ListByCloudHsmCluster_MaximumSet_Gen.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"value": [
12+
{
13+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1/privateLinkResources/sample-pls",
14+
"name": "sample-pls",
15+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters/privateLinkResources",
16+
"properties": {
17+
"groupId": "cloudHsm",
18+
"requiredMembers": [
19+
"hsm1",
20+
"hsm2",
21+
"hsm3"
22+
],
23+
"requiredZoneNames": [
24+
"privatelink.cloudhsm.azure-int.net"
25+
]
26+
}
27+
}
28+
]
29+
}
30+
}
31+
}
32+
}

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmCluster_CreateOrUpdate_MaximumSet_Gen.json

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview",
7+
"body": {
8+
"location": "eastus2",
9+
"sku": {
10+
"family": "B",
11+
"name": "Standard_B1"
12+
},
13+
"tags": {
14+
"Dept": "hsm",
15+
"Environment": "dogfood"
16+
},
17+
"properties": {
18+
"securityDomain": {
19+
"fipsState": 2
20+
}
21+
}
22+
}
23+
},
24+
"responses": {
25+
"200": {
26+
"body": {
27+
"name": "chsm1",
28+
"location": "eastus2",
29+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1",
30+
"sku": {
31+
"family": "B",
32+
"name": "Standard_B1"
33+
},
34+
"tags": {
35+
"Dept": "hsm",
36+
"Environment": "dogfood"
37+
},
38+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters",
39+
"systemData": {
40+
"createdBy": "CHsmUser1",
41+
"createdByType": "User",
42+
"createdAt": "2022-09-12T12:00:00.0000000Z",
43+
"lastModifiedBy": "CHsmUser2",
44+
"lastModifiedByType": "User",
45+
"lastModifiedAt": "2022-09-12T12:00:00.0000000Z"
46+
},
47+
"properties": {
48+
"provisioningState": "Succeeded",
49+
"autoGeneratedDomainNameLabelScope": "TenantReuse",
50+
"securityDomain": {
51+
"fipsState": 2,
52+
"activationStatus": "null"
53+
},
54+
"hsms": null,
55+
"publicNetworkAccess": "Disabled",
56+
"privateEndpointConnections": null
57+
}
58+
}
59+
},
60+
"201": {
61+
"body": {
62+
"name": "chsm1",
63+
"location": "eastus2",
64+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1",
65+
"sku": {
66+
"family": "B",
67+
"name": "Standard_B1"
68+
},
69+
"tags": {
70+
"Dept": "hsm",
71+
"Environment": "dogfood"
72+
},
73+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters",
74+
"systemData": {
75+
"createdBy": "CHsmUser1",
76+
"createdByType": "User",
77+
"createdAt": "2022-09-12T12:00:00.0000000Z",
78+
"lastModifiedBy": "CHsmUser2",
79+
"lastModifiedByType": "User",
80+
"lastModifiedAt": "2022-09-12T12:00:00.0000000Z"
81+
},
82+
"properties": {
83+
"provisioningState": "Succeeded",
84+
"autoGeneratedDomainNameLabelScope": "TenantReuse",
85+
"securityDomain": {
86+
"fipsState": 2,
87+
"activationStatus": "null"
88+
},
89+
"hsms": null,
90+
"publicNetworkAccess": "Disabled",
91+
"privateEndpointConnections": null
92+
}
93+
}
94+
}
95+
}
96+
}

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmCluster_Delete_MaximumSet_Gen.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview"
7+
},
8+
"responses": {
9+
"200": {},
10+
"202": {
11+
"headers": {
12+
"location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1?api-version=2022-03-31&operation=abJjb2RkIjoiAGVsZXRlTWFuYWdlZEhzbUFzeW5jYm9"
13+
}
14+
},
15+
"204": {}
16+
}
17+
}

‎specification/hardwaresecuritymodules/resource-manager/Microsoft.HardwareSecurityModules/preview/2022-08-31-preview/examples/CloudHsmCluster_Get_MaximumSet_Gen.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"resourceGroupName": "rgcloudhsm",
5+
"cloudHsmClusterName": "chsm1",
6+
"api-version": "2022-08-31-preview"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"name": "chsm1",
12+
"location": "eastus2",
13+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rgcloudhsm/providers/Microsoft.HardwareSecurityModules/cloudHsmClusters/chsm1",
14+
"sku": {
15+
"family": "B",
16+
"name": "Standard_B1"
17+
},
18+
"tags": {
19+
"Dept": "hsm",
20+
"Environment": "dogfood"
21+
},
22+
"type": "Microsoft.HardwareSecurityModules/cloudHsmClusters",
23+
"systemData": {
24+
"createdBy": "CHsmUser1",
25+
"createdByType": "User",
26+
"createdAt": "2022-09-12T12:00:00.0000000Z",
27+
"lastModifiedBy": "CHsmUser2",
28+
"lastModifiedByType": "User",
29+
"lastModifiedAt": "2022-09-12T12:00:00.0000000Z"
30+
},
31+
"properties": {
32+
"provisioningState": "Succeeded",
33+
"autoGeneratedDomainNameLabelScope": "TenantReuse",
34+
"securityDomain": {
35+
"fipsState": 2,
36+
"activationStatus": "null"
37+
},
38+
"hsms": null,
39+
"publicNetworkAccess": "Disabled",
40+
"privateEndpointConnections": null
41+
}
42+
}
43+
}
44+
}
45+
}

0 commit comments

Comments
 (0)