Skip to content

Commit 3c560b1

Browse files
DhruvSehgalDhruvSehgal
authored
changes to support secure communication for all providers (#21470)
1 parent 894645e commit 3c560b1

28 files changed

+647
-48
lines changed

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/Db2ProviderInstances_Create.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
"dbName": "dbName",
1616
"dbPassword": "password",
1717
"dbPasswordUri": "",
18-
"dbPort": "dbPort"
18+
"dbPort": "dbPort",
19+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
20+
"sslPreference": "ServerCertificate"
1921
}
2022
}
2123
}
@@ -43,7 +45,9 @@
4345
"dbUsername": "Db2OPA",
4446
"dbName": "OPA",
4547
"dbPort": "5912",
46-
"dbPasswordUri": ""
48+
"dbPasswordUri": "",
49+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
50+
"sslPreference": "ServerCertificate"
4751
}
4852
}
4953
}
@@ -54,15 +58,17 @@
5458
"name": "myProviderInstance",
5559
"type": "Microsoft.Workloads/workloads/providerInstances",
5660
"properties": {
57-
"provisioningState": "Succeeded",
61+
"provisioningState": "Accepted",
5862
"providerSettings": {
5963
"providerType": "Db2",
6064
"sapSid": "SID",
6165
"hostname": "vmname.azure.com",
6266
"dbUsername": "Db2OPA",
6367
"dbName": "OPA",
6468
"dbPort": "5912",
65-
"dbPasswordUri": ""
69+
"dbPasswordUri": "",
70+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
71+
"sslPreference": "ServerCertificate"
6672
}
6773
}
6874
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/Db2ProviderInstances_Create_Root_Certificate.json‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-12-01-preview",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"monitorName": "mySapMonitor",
7+
"providerInstanceName": "myProviderInstance",
8+
"providerInstanceParameter": {
9+
"properties": {
10+
"providerSettings": {
11+
"providerType": "Db2",
12+
"sapSid": "SID",
13+
"hostname": "hostname",
14+
"dbUsername": "username",
15+
"dbName": "dbName",
16+
"dbPassword": "password",
17+
"dbPasswordUri": "",
18+
"dbPort": "dbPort",
19+
"sslPreference": "RootCertificate"
20+
}
21+
}
22+
}
23+
},
24+
"responses": {
25+
"200": {
26+
"body": {
27+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Workloads/workloads/mySapMonitor/providerInstances/myProviderInstance",
28+
"name": "myProviderInstance",
29+
"type": "Microsoft.Workloads/workloads/providerInstances",
30+
"systemData": {
31+
"createdBy": "user@xyz.com",
32+
"createdByType": "User",
33+
"createdAt": "2021-08-19T15:10:46.196Z",
34+
"lastModifiedBy": "user@xyz.com",
35+
"lastModifiedByType": "User",
36+
"lastModifiedAt": "2021-08-19T15:10:46.196Z"
37+
},
38+
"properties": {
39+
"provisioningState": "Succeeded",
40+
"providerSettings": {
41+
"providerType": "Db2",
42+
"sapSid": "SID",
43+
"hostname": "vmname.azure.com",
44+
"dbUsername": "Db2OPA",
45+
"dbName": "OPA",
46+
"dbPort": "5912",
47+
"dbPasswordUri": "",
48+
"sslPreference": "RootCertificate"
49+
}
50+
}
51+
}
52+
},
53+
"201": {
54+
"body": {
55+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Workloads/workloads/mySapMonitor/providerInstances/myProviderInstance",
56+
"name": "myProviderInstance",
57+
"type": "Microsoft.Workloads/workloads/providerInstances",
58+
"properties": {
59+
"provisioningState": "Accepted",
60+
"providerSettings": {
61+
"providerType": "Db2",
62+
"sapSid": "SID",
63+
"hostname": "vmname.azure.com",
64+
"dbUsername": "Db2OPA",
65+
"dbName": "OPA",
66+
"dbPort": "5912",
67+
"dbPasswordUri": "",
68+
"sslPreference": "RootCertificate"
69+
}
70+
}
71+
}
72+
}
73+
}
74+
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/Db2ProviderInstances_Get.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
"dbUsername": "Db2OPA",
3030
"dbName": "OPA",
3131
"dbPort": "5912",
32-
"dbPasswordUri": ""
32+
"dbPasswordUri": "",
33+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
34+
"sslPreference": "ServerCertificate"
3335
}
3436
}
3537
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/MsSqlServerProviderInstance_Create.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
"dbPasswordUri": "",
1515
"dbPort": "5912",
1616
"hostname": "hostname",
17-
"sapSid": "sid"
17+
"sapSid": "sid",
18+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
19+
"sslPreference": "ServerCertificate"
1820
}
1921
}
2022
}
@@ -40,7 +42,9 @@
4042
"dbUsername": "user",
4143
"dbPort": "5912",
4244
"hostname": "hostname",
43-
"sapSid": "sid"
45+
"sapSid": "sid",
46+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
47+
"sslPreference": "ServerCertificate"
4448
}
4549
}
4650
}
@@ -51,13 +55,15 @@
5155
"name": "myProviderInstance",
5256
"type": "Microsoft.Workloads/workloads/providerInstances",
5357
"properties": {
54-
"provisioningState": "Succeeded",
58+
"provisioningState": "Accepted",
5559
"providerSettings": {
5660
"providerType": "MsSqlServer",
5761
"dbUsername": "user",
5862
"dbPort": "5912",
5963
"hostname": "hostname",
60-
"sapSid": "sid"
64+
"sapSid": "sid",
65+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
66+
"sslPreference": "ServerCertificate"
6167
}
6268
}
6369
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/MsSqlServerProviderInstance_Create_Root_Certificate.json‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-12-01-preview",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"monitorName": "mySapMonitor",
7+
"providerInstanceName": "myProviderInstance",
8+
"providerInstanceParameter": {
9+
"properties": {
10+
"providerSettings": {
11+
"providerType": "MsSqlServer",
12+
"dbUsername": "user",
13+
"dbPassword": "****",
14+
"dbPasswordUri": "",
15+
"dbPort": "5912",
16+
"hostname": "hostname",
17+
"sapSid": "sid",
18+
"sslPreference": "RootCertificate"
19+
}
20+
}
21+
}
22+
},
23+
"responses": {
24+
"200": {
25+
"body": {
26+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Workloads/workloads/mySapMonitor/providerInstances/myProviderInstance",
27+
"name": "myProviderInstance",
28+
"type": "Microsoft.Workloads/workloads/providerInstances",
29+
"systemData": {
30+
"createdBy": "user@xyz.com",
31+
"createdByType": "User",
32+
"createdAt": "2021-08-19T15:10:46.196Z",
33+
"lastModifiedBy": "user@xyz.com",
34+
"lastModifiedByType": "User",
35+
"lastModifiedAt": "2021-08-19T15:10:46.196Z"
36+
},
37+
"properties": {
38+
"provisioningState": "Succeeded",
39+
"providerSettings": {
40+
"providerType": "MsSqlServer",
41+
"dbUsername": "user",
42+
"dbPort": "5912",
43+
"hostname": "hostname",
44+
"sapSid": "sid",
45+
"sslPreference": "RootCertificate"
46+
}
47+
}
48+
}
49+
},
50+
"201": {
51+
"body": {
52+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Workloads/workloads/mySapMonitor/providerInstances/myProviderInstance",
53+
"name": "myProviderInstance",
54+
"type": "Microsoft.Workloads/workloads/providerInstances",
55+
"properties": {
56+
"provisioningState": "Accepted",
57+
"providerSettings": {
58+
"providerType": "MsSqlServer",
59+
"dbUsername": "user",
60+
"dbPort": "5912",
61+
"hostname": "hostname",
62+
"sapSid": "sid",
63+
"sslPreference": "RootCertificate"
64+
}
65+
}
66+
}
67+
}
68+
}
69+
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/MsSqlServerProviderInstance_Get.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
"dbPort": "5912",
2929
"hostname": "hostname",
3030
"dbPasswordUri": "",
31-
"sapSid": "sid"
31+
"sapSid": "sid",
32+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename",
33+
"sslPreference": "ServerCertificate"
3234
}
3335
}
3436
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/NetWeaverProviderInstances_Create.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"sapPasswordUri": "",
2121
"sapPortNumber": "1234",
2222
"sapClientId": "111",
23-
"sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
23+
"sslPreference": "ServerCertificate",
24+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
2425
}
2526
}
2627
}
@@ -53,7 +54,8 @@
5354
"sapPasswordUri": "",
5455
"sapPortNumber": "1234",
5556
"sapClientId": "111",
56-
"sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
57+
"sslPreference": "ServerCertificate",
58+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
5759
}
5860
}
5961
}
@@ -64,7 +66,7 @@
6466
"name": "myProviderInstance",
6567
"type": "Microsoft.Workloads/workloads/providerInstances",
6668
"properties": {
67-
"provisioningState": "Succeeded",
69+
"provisioningState": "Accepted",
6870
"providerSettings": {
6971
"providerType": "SapNetWeaver",
7072
"sapSid": "SID",
@@ -77,7 +79,8 @@
7779
"sapPasswordUri": "",
7880
"sapPortNumber": "1234",
7981
"sapClientId": "111",
80-
"sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
82+
"sslPreference": "ServerCertificate",
83+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
8184
}
8285
}
8386
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/NetWeaverProviderInstances_Create_Root_Certificate.json‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"parameters": {
3+
"api-version": "2021-12-01-preview",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"resourceGroupName": "myResourceGroup",
6+
"monitorName": "mySapMonitor",
7+
"providerInstanceName": "myProviderInstance",
8+
"providerInstanceParameter": {
9+
"properties": {
10+
"providerSettings": {
11+
"providerType": "SapNetWeaver",
12+
"sapSid": "SID",
13+
"sapHostname": "name",
14+
"sapInstanceNr": "00",
15+
"sapHostFileEntries": [
16+
"127.0.0.1 name fqdn"
17+
],
18+
"sapUsername": "username",
19+
"sapPassword": "****",
20+
"sapPasswordUri": "",
21+
"sapPortNumber": "1234",
22+
"sapClientId": "111",
23+
"sslPreference": "RootCertificate"
24+
}
25+
}
26+
}
27+
},
28+
"responses": {
29+
"200": {
30+
"body": {
31+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Workloads/workloads/mySapMonitor/providerInstances/myProviderInstance",
32+
"name": "myProviderInstance",
33+
"type": "Microsoft.Workloads/workloads/providerInstances",
34+
"systemData": {
35+
"createdBy": "user@xyz.com",
36+
"createdByType": "User",
37+
"createdAt": "2021-08-19T15:10:46.196Z",
38+
"lastModifiedBy": "user@xyz.com",
39+
"lastModifiedByType": "User",
40+
"lastModifiedAt": "2021-08-19T15:10:46.196Z"
41+
},
42+
"properties": {
43+
"provisioningState": "Succeeded",
44+
"providerSettings": {
45+
"providerType": "SapNetWeaver",
46+
"sapSid": "SID",
47+
"sapHostname": "name",
48+
"sapInstanceNr": "00",
49+
"sapHostFileEntries": [
50+
"127.0.0.1 name fqdn"
51+
],
52+
"sapUsername": "username",
53+
"sapPasswordUri": "",
54+
"sapPortNumber": "1234",
55+
"sapClientId": "111",
56+
"sslPreference": "RootCertificate"
57+
}
58+
}
59+
}
60+
},
61+
"201": {
62+
"body": {
63+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Workloads/workloads/mySapMonitor/providerInstances/myProviderInstance",
64+
"name": "myProviderInstance",
65+
"type": "Microsoft.Workloads/workloads/providerInstances",
66+
"properties": {
67+
"provisioningState": "Accepted",
68+
"providerSettings": {
69+
"providerType": "SapNetWeaver",
70+
"sapSid": "SID",
71+
"sapHostname": "name",
72+
"sapInstanceNr": "00",
73+
"sapHostFileEntries": [
74+
"127.0.0.1 name fqdn"
75+
],
76+
"sapUsername": "username",
77+
"sapPasswordUri": "",
78+
"sapPortNumber": "1234",
79+
"sapClientId": "111",
80+
"sslPreference": "RootCertificate"
81+
}
82+
}
83+
}
84+
}
85+
}
86+
}

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/NetWeaverProviderInstances_Get.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
"sapPasswordUri": "",
3535
"sapPortNumber": "1234",
3636
"sapClientId": "111",
37-
"sapSslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
37+
"sslPreference": "ServerCertificate",
38+
"sslCertificateUri": "https://storageaccount.blob.core.windows.net/containername/filename"
3839
}
3940
}
4041
}

0 commit comments

Comments
 (0)