Skip to content

Commit 019f335

Browse files
deveshguhadeveshguha
committed
Fix validation failures. Adjust contracts
1 parent 72c780c commit 019f335

22 files changed

+528
-619
lines changed

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/deploymentmanager.json‎

Lines changed: 181 additions & 283 deletions
Large diffs are not rendered by default.

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/examples/artifactsource_createorupdate.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"properties": {
1212
"sourceType": "AzureStorage",
1313
"authentication": {
14-
"type": "sas",
14+
"type": "Sas",
1515
"properties": {
1616
"sasUri": "https://mystorageaccount.blob.core.windows.net/myartifactsource?st=2018-07-07T14%3A10%3A00Z&se=2019-12-31T15%3A10%3A00Z&sp=rl&sv=2017-04-17&sr=c&sig=Yh2SoJ1NhhLRwCLln7de%2Fkabcdefghijklmno5sWEIk%3D"
1717
}
@@ -29,7 +29,7 @@
2929
"properties": {
3030
"sourceType": "AzureStorage",
3131
"authentication": {
32-
"type": "sas",
32+
"type": "Sas",
3333
"properties": {
3434
"sasUri": "https://mystorageaccount.blob.core.windows.net/myartifactsource?st=2018-07-07T14%3A10%3A00Z&se=2019-12-31T15%3A10%3A00Z&sp=rl&sv=2017-04-17&sr=c&sig=Yh2SoJ1NhhLRwCLln7de%2Fkabcdefghijklmno5sWEIk%3D"
3535
}

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/examples/artifactsource_delete.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
"api-version": "2018-09-01-preview"
77
},
88
"responses": {
9-
"200": {
10-
"body": {}
11-
},
9+
"200": {},
1210
"204": {}
1311
}
1412
}

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/examples/artifactsource_get.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@
1515
"properties": {
1616
"sourceType": "AzureStorage",
1717
"authentication": {
18-
"type": "sas",
18+
"type": "Sas",
1919
"properties": {
2020
"sasUri": "https://mystorageaccount.blob.core.windows.net/myartifactsource?st=2018-07-07T14%3A10%3A00Z&se=2019-12-31T15%3A10%3A00Z&sp=rl&sv=2017-04-17&sr=c&sig=Yh2SoJ1NhhLRwCLln7de%2Fkabcdefghijklmno5sWEIk%3D"
2121
}
2222
}
2323
}
2424
}
25-
},
26-
"404": {
27-
"body": {}
2825
}
2926
}
3027
}

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/examples/operations_get.json‎

Lines changed: 156 additions & 157 deletions
Large diffs are not rendered by default.

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/examples/rollout_createorupdate.json‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@
88
"type": "Microsoft.DeploymentManager/rollouts",
99
"location": "centralus",
1010
"tags": {},
11+
"identity": {
12+
"type": "userAssigned",
13+
"identityIds": [
14+
"/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userassignedidentities/myuseridentity"
15+
]
16+
},
1117
"properties": {
1218
"buildVersion": "1.0.0.1",
13-
"artifactSourceId": "Microsoft.DeploymentManager/artifactSources/myArtifactSource",
14-
"targetServiceTopologyId": "Microsoft.DeploymentManager/serviceTopologies/myTopology",
19+
"artifactSourceId": "/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/Microsoft.DeploymentManager/artifactSources/myArtifactSource",
20+
"targetServiceTopologyId": "/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/Microsoft.DeploymentManager/serviceTopologies/myTopology",
1521
"stepGroups": [
1622
{
1723
"name": "FirstRegion",
@@ -23,7 +29,7 @@
2329
"stepId": "Microsoft.DeploymentManager/steps/preDeployStep2"
2430
}
2531
],
26-
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myTopologyUnit1'",
32+
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myServiceUnit1'",
2733
"postDeploymentSteps": [
2834
{
2935
"stepId": "Microsoft.DeploymentManager/steps/postDeployStep1"
@@ -40,7 +46,7 @@
4046
"stepId": "Microsoft.DeploymentManager/steps/preDeployStep4"
4147
}
4248
],
43-
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myTopologyUnit2'",
49+
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myServiceUnit2'",
4450
"postDeploymentSteps": [
4551
{
4652
"stepId": "Microsoft.DeploymentManager/steps/postDeployStep5"
@@ -61,10 +67,16 @@
6167
"type": "Microsoft.DeploymentManager/rollouts",
6268
"location": "centralus",
6369
"tags": {},
70+
"identity": {
71+
"type": "userAssigned",
72+
"identityIds": [
73+
"/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userassignedidentities/myuseridentity"
74+
]
75+
},
6476
"properties": {
6577
"buildVersion": "1.0.0.1",
66-
"artifactSourceId": "Microsoft.DeploymentManager/artifactSources/myArtifactSource",
67-
"targetServiceTopologyId": "Microsoft.DeploymentManager/serviceTopologies/myTopology",
78+
"artifactSourceId": "/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/Microsoft.DeploymentManager/artifactSources/myArtifactSource",
79+
"targetServiceTopologyId": "/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/Microsoft.DeploymentManager/serviceTopologies/myTopology",
6880
"stepGroups": [
6981
{
7082
"name": "FirstRegion",
@@ -76,7 +88,7 @@
7688
"stepId": "Microsoft.DeploymentManager/steps/preDeployStep2"
7789
}
7890
],
79-
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myTopologyUnit1'",
91+
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myServiceUnit1'",
8092
"postDeploymentSteps": [
8193
{
8294
"stepId": "Microsoft.DeploymentManager/steps/postDeployStep1"
@@ -93,7 +105,7 @@
93105
"stepId": "Microsoft.DeploymentManager/steps/preDeployStep4"
94106
}
95107
],
96-
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myTopologyUnit2'",
108+
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myServiceUnit2'",
97109
"postDeploymentSteps": [
98110
{
99111
"stepId": "Microsoft.DeploymentManager/steps/postDeployStep5"

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/examples/rollout_delete.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
"api-version": "2018-09-01-preview"
77
},
88
"responses": {
9-
"200": {
10-
"body": {}
11-
},
12-
"204": {},
13-
"404": {}
9+
"200": {},
10+
"204": {}
1411
}
1512
}

‎specification/deploymentmanager/resource-manager/Microsoft.DeploymentManager/preview/2018-09-01-preview/examples/rollout_get.json‎

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@
66
"api-version": "2018-09-01-preview"
77
},
88
"responses": {
9-
"404": {},
109
"200": {
1110
"body": {
1211
"name": "myRollout",
1312
"type": "Microsoft.DeploymentManager/rollouts",
1413
"location": "centralus",
1514
"tags": {},
15+
"identity": {
16+
"type": "userAssigned",
17+
"identityIds": [
18+
"/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userassignedidentities/myuseridentity"
19+
]
20+
},
1621
"properties": {
1722
"status": "Running",
1823
"operationInfo": {
1924
"startTime": "2018-08-28T03:33:56.386Z",
20-
"lastUpdatedTime": "2018-08-28T03:39:28.556Z",
2125
"retryAttempt": 0
2226
},
2327
"totalRetryAttempts": 0,
2428
"buildVersion": "1.0.0.1",
25-
"artifactSourceId": "Microsoft.DeploymentManager/artifactSources/myArtifactSource",
26-
"targetServiceTopologyId": "Microsoft.DeploymentManager/serviceTopologies/myTopology",
29+
"artifactSourceId": "/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/Microsoft.DeploymentManager/artifactSources/myArtifactSource",
30+
"targetServiceTopologyId": "/subscriptions/caac1590-e859-444f-a9e0-62091c0f5929/resourceGroups/myResourceGroup/Microsoft.DeploymentManager/serviceTopologies/myTopology",
2731
"stepGroups": [
2832
{
2933
"name": "FirstRegion",
@@ -35,7 +39,7 @@
3539
"stepId": "Microsoft.DeploymentManager/steps/preDeployStep2"
3640
}
3741
],
38-
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myTopologyUnit1'",
42+
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myServiceUnit1'",
3943
"postDeploymentSteps": [
4044
{
4145
"stepId": "Microsoft.DeploymentManager/steps/postDeployStep1"
@@ -52,7 +56,7 @@
5256
"stepId": "Microsoft.DeploymentManager/steps/preDeployStep4"
5357
}
5458
],
55-
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myTopologyUnit2'",
59+
"deploymentTargetId": "Microsoft.DeploymentManager/serviceTopologies/myTopology/services/myService/serviceUnits/myServiceUnit2'",
5660
"postDeploymentSteps": [
5761
{
5862
"stepId": "Microsoft.DeploymentManager/steps/postDeployStep5"
@@ -62,58 +66,58 @@
6266
"FirstRegion"
6367
]
6468
}
65-
]
66-
},
67-
"services": [
68-
{
69-
"name": "myService1",
70-
"targetSubscriptionId": "600c95c5-3ee5-44fe-b190-ca38a19adcd7",
71-
"targetLocation": "centralus",
72-
"serviceUnits": [
73-
{
74-
"name": "myTopologyUni1",
75-
"targetResourceGroup": "myDeploymentResourceGroup",
76-
"deploymentMode": "Incremental",
77-
"steps": [
78-
{
79-
"name": "preDeploymentStep1",
80-
"status": "succeeded",
81-
"operationInfo": {
82-
"startTime": "2018-08-28T03:33:56.386Z",
83-
"endTime": "2018-08-28T03:35:28.556Z"
84-
}
85-
},
86-
{
87-
"name": "preDeploymentStep2",
88-
"status": "succeeded",
89-
"actionOperationInfo": {
90-
"startTime": "2018-08-28T03:36:56.386Z",
91-
"endTime": "2018-08-28T03:37:28.556Z"
92-
}
93-
},
94-
{
95-
"name": "deploy",
96-
"status": "running",
97-
"operationInfo": {
98-
"startTime": "2018-08-28T03:38:56.386Z",
99-
"lastUpdatedTime": "2018-08-28T03:39:28.556Z"
69+
],
70+
"services": [
71+
{
72+
"name": "myService1",
73+
"targetSubscriptionId": "600c95c5-3ee5-44fe-b190-ca38a19adcd7",
74+
"targetLocation": "centralus",
75+
"serviceUnits": [
76+
{
77+
"name": "myTopologyUni1",
78+
"targetResourceGroup": "myDeploymentResourceGroup",
79+
"deploymentMode": "Incremental",
80+
"steps": [
81+
{
82+
"name": "preDeploymentStep1",
83+
"status": "succeeded",
84+
"operationInfo": {
85+
"startTime": "2018-08-28T03:33:56.386Z",
86+
"endTime": "2018-08-28T03:35:28.556Z"
87+
}
10088
},
101-
"resourceOperations": [
102-
{
103-
"resourceName": "keyVaultcentralus",
104-
"operationId": "20FC5A21382DA306",
105-
"resourceType": "Microsoft.KeyVault/vaults",
106-
"provisioningState": "Succeeded",
107-
"statusMessage": "",
108-
"statusCode": "OK"
89+
{
90+
"name": "preDeploymentStep2",
91+
"status": "succeeded",
92+
"operationInfo": {
93+
"startTime": "2018-08-28T03:36:56.386Z",
94+
"endTime": "2018-08-28T03:37:28.556Z"
10995
}
110-
]
111-
}
112-
]
113-
}
114-
]
115-
}
116-
]
96+
},
97+
{
98+
"name": "deploy",
99+
"status": "running",
100+
"operationInfo": {
101+
"startTime": "2018-08-28T03:38:56.386Z",
102+
"lastUpdatedTime": "2018-08-28T03:39:28.556Z"
103+
},
104+
"resourceOperations": [
105+
{
106+
"resourceName": "keyVaultcentralus",
107+
"operationId": "20FC5A21382DA306",
108+
"resourceType": "Microsoft.KeyVault/vaults",
109+
"provisioningState": "Succeeded",
110+
"statusMessage": "",
111+
"statusCode": "OK"
112+
}
113+
]
114+
}
115+
]
116+
}
117+
]
118+
}
119+
]
120+
}
117121
}
118122
}
119123
}

0 commit comments

Comments
 (0)