Skip to content

Commit efebdd6

Browse files
alzahediharryli0108
authored andcommitted
[Hub Generated] Publish private branch 'dev/alzahedi/update_arc_sql_mi_spec' (Azure#24335)
* Updated spec for arc sql mi to include security and network settings * Fixed prettier issues * Resolved spell checks
1 parent 308c908 commit efebdd6

File tree

7 files changed

+288
-1
lines changed

7 files changed

+288
-1
lines changed

custom-words.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2839,4 +2839,8 @@ serde
28392839
onetoone
28402840
onetomany
28412841
manytoone
2842-
manytomany
2842+
manytomany
2843+
stransparent
2844+
forceencryption
2845+
tlsciphers
2846+
tlsprotocols

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/examples/CreateOrUpdateSqlManagedInstance.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,31 @@
5353
}
5454
}
5555
}
56+
},
57+
"security": {
58+
"adminLoginSecret": "test-sql-login-secret",
59+
"serviceCertificateSecret": "Service Certificate Secret",
60+
"activeDirectory": {
61+
"connector": {
62+
"name": "Name of connector",
63+
"namespace": "Namespace of connector"
64+
},
65+
"accountName": "Account name",
66+
"keytabSecret": "Key tab secret of account",
67+
"encryptionTypes": [
68+
"Encryption type item1, Encryption type item2,..."
69+
]
70+
},
71+
"transparentDataEncryption": {
72+
"mode": "SystemManaged"
73+
}
74+
},
75+
"settings": {
76+
"network": {
77+
"forceencryption": 0,
78+
"tlsciphers": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
79+
"tlsprotocols": "1.2"
80+
}
5681
}
5782
}
5883
}
@@ -94,6 +119,31 @@
94119
}
95120
}
96121
}
122+
},
123+
"security": {
124+
"adminLoginSecret": "test-sql-login-secret",
125+
"serviceCertificateSecret": "Service Certificate Secret",
126+
"activeDirectory": {
127+
"connector": {
128+
"name": "Name of connector",
129+
"namespace": "Namespace of connector"
130+
},
131+
"accountName": "Account name",
132+
"keytabSecret": "Key tab secret of account",
133+
"encryptionTypes": [
134+
"Encryption type item1, Encryption type item2,..."
135+
]
136+
},
137+
"transparentDataEncryption": {
138+
"mode": "SystemManaged"
139+
}
140+
},
141+
"settings": {
142+
"network": {
143+
"forceencryption": 0,
144+
"tlsciphers": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
145+
"tlsprotocols": "1.2"
146+
}
97147
}
98148
}
99149
}
@@ -158,6 +208,31 @@
158208
}
159209
}
160210
}
211+
},
212+
"security": {
213+
"adminLoginSecret": "test-sql-login-secret",
214+
"serviceCertificateSecret": "Service Certificate Secret",
215+
"activeDirectory": {
216+
"connector": {
217+
"name": "Name of connector",
218+
"namespace": "Namespace of connector"
219+
},
220+
"accountName": "Account name",
221+
"keytabSecret": "Key tab secret of account",
222+
"encryptionTypes": [
223+
"Encryption type item1, Encryption type item2,..."
224+
]
225+
},
226+
"transparentDataEncryption": {
227+
"mode": "SystemManaged"
228+
}
229+
},
230+
"settings": {
231+
"network": {
232+
"forceencryption": 0,
233+
"tlsciphers": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
234+
"tlsprotocols": "1.2"
235+
}
161236
}
162237
}
163238
}

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/examples/GetSqlManagedInstance.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,31 @@
4040
}
4141
}
4242
}
43+
},
44+
"security": {
45+
"adminLoginSecret": "test-sql-login-secret",
46+
"serviceCertificateSecret": "Service Certificate Secret",
47+
"activeDirectory": {
48+
"connector": {
49+
"name": "Name of connector",
50+
"namespace": "Namespace of connector"
51+
},
52+
"accountName": "Account name",
53+
"keytabSecret": "Key tab secret of account",
54+
"encryptionTypes": [
55+
"Encryption type item1, Encryption type item2,..."
56+
]
57+
},
58+
"transparentDataEncryption": {
59+
"mode": "SystemManaged"
60+
}
61+
},
62+
"settings": {
63+
"network": {
64+
"forceencryption": 0,
65+
"tlsciphers": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
66+
"tlsprotocols": "1.2"
67+
}
4368
}
4469
}
4570
}

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/examples/ListByResourceGroupSqlManagedInstance.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,31 @@
3939
}
4040
}
4141
}
42+
},
43+
"security": {
44+
"adminLoginSecret": "test-sql-login-secret",
45+
"serviceCertificateSecret": "Service Certificate Secret",
46+
"activeDirectory": {
47+
"connector": {
48+
"name": "Name of connector",
49+
"namespace": "Namespace of connector"
50+
},
51+
"accountName": "Account name",
52+
"keytabSecret": "Key tab secret of account",
53+
"encryptionTypes": [
54+
"Encryption type item1, Encryption type item2,..."
55+
]
56+
},
57+
"transparentDataEncryption": {
58+
"mode": "SystemManaged"
59+
}
60+
},
61+
"settings": {
62+
"network": {
63+
"forceencryption": 0,
64+
"tlsciphers": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
65+
"tlsprotocols": "1.2"
66+
}
4267
}
4368
}
4469
}

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/examples/ListSubscriptionSqlManagedInstance.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,31 @@
4040
}
4141
}
4242
}
43+
},
44+
"security": {
45+
"adminLoginSecret": "test-sql-login-secret",
46+
"serviceCertificateSecret": "Service Certificate Secret",
47+
"activeDirectory": {
48+
"connector": {
49+
"name": "Name of connector",
50+
"namespace": "Namespace of connector"
51+
},
52+
"accountName": "Account name",
53+
"keytabSecret": "Key tab secret of account",
54+
"encryptionTypes": [
55+
"Encryption type item1, Encryption type item2,..."
56+
]
57+
},
58+
"transparentDataEncryption": {
59+
"mode": "SystemManaged"
60+
}
61+
},
62+
"settings": {
63+
"network": {
64+
"forceencryption": 0,
65+
"tlsciphers": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
66+
"tlsprotocols": "1.2"
67+
}
4368
}
4469
}
4570
}

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/examples/UpdateSqlManagedInstance.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,31 @@
4545
}
4646
}
4747
}
48+
},
49+
"security": {
50+
"adminLoginSecret": "test-sql-login-secret",
51+
"serviceCertificateSecret": "Service Certificate Secret",
52+
"activeDirectory": {
53+
"connector": {
54+
"name": "Name of connector",
55+
"namespace": "Namespace of connector"
56+
},
57+
"accountName": "Account name",
58+
"keytabSecret": "Key tab secret of account",
59+
"encryptionTypes": [
60+
"Encryption type item1, Encryption type item2,..."
61+
]
62+
},
63+
"transparentDataEncryption": {
64+
"mode": "SystemManaged"
65+
}
66+
},
67+
"settings": {
68+
"network": {
69+
"forceencryption": 0,
70+
"tlsciphers": "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384",
71+
"tlsprotocols": "1.2"
72+
}
4873
}
4974
}
5075
}

specification/azurearcdata/resource-manager/Microsoft.AzureArcData/preview/2023-01-15-preview/sqlManagedInstances.json

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,12 @@
185185
"type": "integer",
186186
"format": "int32",
187187
"description": "This option specifies the number of SQL Managed Instance replicas that will be deployed in your Kubernetes cluster for high availability purposes. If sku.tier is BusinessCritical, allowed values are '2' or '3' with default of '3'. If sku.tier is GeneralPurpose, replicas must be '1'."
188+
},
189+
"security": {
190+
"$ref": "#/definitions/K8sSecurity"
191+
},
192+
"settings": {
193+
"$ref": "#/definitions/K8sSettings"
188194
}
189195
},
190196
"additionalProperties": {
@@ -238,6 +244,108 @@
238244
"type": "object"
239245
}
240246
},
247+
"K8sSecurity": {
248+
"type": "object",
249+
"description": "The kubernetes security information.",
250+
"properties": {
251+
"adminLoginSecret": {
252+
"type": "string",
253+
"description": "Admin login secret key"
254+
},
255+
"serviceCertificateSecret": {
256+
"type": "string",
257+
"description": "Service certificate secret used"
258+
},
259+
"activeDirectory": {
260+
"$ref": "#/definitions/K8sActiveDirectory"
261+
},
262+
"transparentDataEncryption": {
263+
"$ref": "#/definitions/k8stransparentDataEncryption"
264+
}
265+
},
266+
"additionalProperties": {
267+
"type": "object"
268+
}
269+
},
270+
"K8sActiveDirectory": {
271+
"type": "object",
272+
"description": "The kubernetes active directory information.",
273+
"properties": {
274+
"connector": {
275+
"type": "object",
276+
"properties": {
277+
"name": {
278+
"type": "string",
279+
"description": "Name of the connector"
280+
},
281+
"namespace": {
282+
"type": "string",
283+
"description": "Name space of the connector"
284+
}
285+
}
286+
},
287+
"accountName": {
288+
"type": "string",
289+
"description": "Account name for AAD"
290+
},
291+
"keytabSecret": {
292+
"type": "string",
293+
"description": "Keytab secret used to authenticate with Active Directory."
294+
},
295+
"encryptionTypes": {
296+
"type": "array",
297+
"description": "An array of encryption types",
298+
"items": {
299+
"type": "string"
300+
}
301+
}
302+
}
303+
},
304+
"k8stransparentDataEncryption": {
305+
"type": "object",
306+
"description": "Transparent data encryption information.",
307+
"properties": {
308+
"mode": {
309+
"type": "string",
310+
"description": "Transparent data encryption mode. Can be Service Managed, Customer managed or disabled"
311+
},
312+
"protectorSecret": {
313+
"type": "string",
314+
"description": "Protector secret for customer managed Transparent data encryption mode"
315+
}
316+
}
317+
},
318+
"K8sSettings": {
319+
"type": "object",
320+
"description": "The kubernetes settings information.",
321+
"properties": {
322+
"network": {
323+
"$ref": "#/definitions/K8sNetworkSettings"
324+
}
325+
},
326+
"additionalProperties": {
327+
"type": "object"
328+
}
329+
},
330+
"K8sNetworkSettings": {
331+
"type": "object",
332+
"description": "The kubernetes network settings information.",
333+
"properties": {
334+
"forceencryption": {
335+
"type": "integer",
336+
"format": "int32",
337+
"description": "If 1, then SQL Server forces all connections to be encrypted. By default, this option is 0"
338+
},
339+
"tlsciphers": {
340+
"type": "string",
341+
"description": "Specifies which ciphers are allowed by SQL Server for TLS"
342+
},
343+
"tlsprotocols": {
344+
"type": "string",
345+
"description": "A comma-separated list of which TLS protocols are allowed by SQL Server"
346+
}
347+
}
348+
},
241349
"KeytabInformation": {
242350
"type": "object",
243351
"description": "Keytab used for authenticate with Active Directory.",

0 commit comments

Comments
 (0)