Skip to content

Commit ae9d07f

Browse files
Jingshu923Jingshu923
authored
[Synapse]Sync Changes From DataFactory To Synapse (#24040)
* Sync Changes From DataFactory To Synapse * fix * fix * fix * fix
1 parent dfd94f5 commit ae9d07f

File tree

5 files changed

+289
-0
lines changed

5 files changed

+289
-0
lines changed

‎specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/artifacts.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,34 @@
788788
"maxLength": 260
789789
}
790790
}
791+
},
792+
"CredentialReference": {
793+
"description": "Credential reference type.",
794+
"type": "object",
795+
"properties": {
796+
"type": {
797+
"type": "string",
798+
"description": "Credential reference type.",
799+
"enum": [
800+
"CredentialReference"
801+
],
802+
"x-ms-enum": {
803+
"name": "CredentialReferenceType",
804+
"modelAsString": true
805+
}
806+
},
807+
"referenceName": {
808+
"type": "string",
809+
"description": "Reference credential name."
810+
}
811+
},
812+
"additionalProperties": {
813+
"type": "object"
814+
},
815+
"required": [
816+
"type",
817+
"referenceName"
818+
]
791819
}
792820
},
793821
"parameters": {

‎specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Credential.json‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"swagger": "2.0",
3+
"info": {
4+
"title": "ArtifactsClient",
5+
"version": "2020-12-01"
6+
},
7+
"paths": {},
8+
"definitions": {
9+
"Credential": {
10+
"description": "Azure Synapse nested object which contains the information and credential which can be used to connect with related store or compute resource.",
11+
"type": "object",
12+
"discriminator": "type",
13+
"properties": {
14+
"type": {
15+
"type": "string",
16+
"description": "Type of credential."
17+
},
18+
"description": {
19+
"description": "Credential description.",
20+
"type": "string"
21+
},
22+
"annotations": {
23+
"description": "List of tags that can be used for describing the Credential.",
24+
"type": "array",
25+
"items": {
26+
"type": "object"
27+
},
28+
"x-ms-identifiers": []
29+
}
30+
},
31+
"additionalProperties": {
32+
"type": "object"
33+
},
34+
"required": [
35+
"type"
36+
]
37+
},
38+
"ServicePrincipalCredential": {
39+
"x-ms-discriminator-value": "ServicePrincipal",
40+
"description": "Service principal credential.",
41+
"type": "object",
42+
"allOf": [
43+
{
44+
"$ref": "#/definitions/Credential"
45+
}
46+
],
47+
"properties": {
48+
"typeProperties": {
49+
"description": "Service Principal credential properties.",
50+
"x-ms-client-flatten": true,
51+
"$ref": "#/definitions/ServicePrincipalCredentialTypeProperties"
52+
}
53+
},
54+
"required": [
55+
"typeProperties"
56+
]
57+
},
58+
"ServicePrincipalCredentialTypeProperties": {
59+
"description": "Service Principal credential type properties.",
60+
"type": "object",
61+
"properties": {
62+
"servicePrincipalId": {
63+
"type": "object",
64+
"description": "The app ID of the service principal used to authenticate"
65+
},
66+
"servicePrincipalKey": {
67+
"$ref": "../artifacts.json#/definitions/SecretBase",
68+
"description": "The key of the service principal used to authenticate."
69+
},
70+
"tenant": {
71+
"type": "object",
72+
"description": "The ID of the tenant to which the service principal belongs"
73+
}
74+
}
75+
},
76+
"ManagedIdentityCredential": {
77+
"x-ms-discriminator-value": "ManagedIdentity",
78+
"description": "Managed identity credential.",
79+
"type": "object",
80+
"allOf": [
81+
{
82+
"$ref": "#/definitions/Credential"
83+
}
84+
],
85+
"properties": {
86+
"typeProperties": {
87+
"description": "Managed identity credential properties.",
88+
"x-ms-client-flatten": true,
89+
"$ref": "#/definitions/ManagedIdentityTypeProperties"
90+
}
91+
}
92+
},
93+
"ManagedIdentityTypeProperties": {
94+
"description": "Managed identity type properties.",
95+
"type": "object",
96+
"properties": {
97+
"resourceId": {
98+
"type": "string",
99+
"description": "The resource id of user assigned managed identity"
100+
}
101+
}
102+
}
103+
}
104+
}

‎specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@
176176
"type": "string",
177177
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
178178
},
179+
"credential": {
180+
"$ref": "../artifacts.json#/definitions/CredentialReference",
181+
"description": "The credential reference containing authentication information."
182+
},
179183
"authenticationType": {
180184
"x-ms-enum": {
181185
"name": "AzureStorageAuthenticationType",
@@ -248,6 +252,10 @@
248252
"encryptedCredential": {
249253
"type": "object",
250254
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
255+
},
256+
"credential": {
257+
"$ref": "../artifacts.json#/definitions/CredentialReference",
258+
"description": "The credential reference containing authentication information."
251259
}
252260
},
253261
"required": [
@@ -293,6 +301,10 @@
293301
"encryptedCredential": {
294302
"type": "object",
295303
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
304+
},
305+
"alwaysEncryptedSettings": {
306+
"$ref": "#/definitions/SqlAlwaysEncryptedProperties",
307+
"description": "Sql always encrypted properties."
296308
}
297309
},
298310
"required": [
@@ -338,6 +350,10 @@
338350
"encryptedCredential": {
339351
"type": "object",
340352
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
353+
},
354+
"alwaysEncryptedSettings": {
355+
"$ref": "#/definitions/SqlAlwaysEncryptedProperties",
356+
"description": "Sql always encrypted properties."
341357
}
342358
},
343359
"required": [
@@ -392,9 +408,17 @@
392408
"type": "object",
393409
"description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)."
394410
},
411+
"alwaysEncryptedSettings": {
412+
"$ref": "#/definitions/SqlAlwaysEncryptedProperties",
413+
"description": "Sql always encrypted properties."
414+
},
395415
"encryptedCredential": {
396416
"type": "object",
397417
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
418+
},
419+
"credential": {
420+
"$ref": "../artifacts.json#/definitions/CredentialReference",
421+
"description": "The credential reference containing authentication information."
398422
}
399423
},
400424
"required": [
@@ -449,15 +473,57 @@
449473
"type": "object",
450474
"description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)."
451475
},
476+
"alwaysEncryptedSettings": {
477+
"$ref": "#/definitions/SqlAlwaysEncryptedProperties",
478+
"description": "Sql always encrypted properties."
479+
},
452480
"encryptedCredential": {
453481
"type": "object",
454482
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
483+
},
484+
"credential": {
485+
"$ref": "../artifacts.json#/definitions/CredentialReference",
486+
"description": "The credential reference containing authentication information."
455487
}
456488
},
457489
"required": [
458490
"connectionString"
459491
]
460492
},
493+
"SqlAlwaysEncryptedProperties": {
494+
"description": "Sql always encrypted properties.",
495+
"type": "object",
496+
"properties": {
497+
"alwaysEncryptedAkvAuthType": {
498+
"x-ms-enum": {
499+
"name": "SqlAlwaysEncryptedAkvAuthType",
500+
"modelAsString": true
501+
},
502+
"enum": [
503+
"ServicePrincipal",
504+
"ManagedIdentity",
505+
"UserAssignedManagedIdentity"
506+
],
507+
"type": "string",
508+
"description": "Sql always encrypted AKV authentication type. Type: string."
509+
},
510+
"servicePrincipalId": {
511+
"type": "object",
512+
"description": "The client ID of the application in Azure Active Directory used for Azure Key Vault authentication. Type: string (or Expression with resultType string)."
513+
},
514+
"servicePrincipalKey": {
515+
"$ref": "../artifacts.json#/definitions/SecretBase",
516+
"description": "The key of the service principal used to authenticate against Azure Key Vault."
517+
},
518+
"credential": {
519+
"$ref": "../artifacts.json#/definitions/CredentialReference",
520+
"description": "The credential reference containing authentication information."
521+
}
522+
},
523+
"required": [
524+
"alwaysEncryptedAkvAuthType"
525+
]
526+
},
461527
"AzureBatchLinkedService": {
462528
"x-ms-discriminator-value": "AzureBatch",
463529
"description": "Azure Batch linked service.",
@@ -505,6 +571,10 @@
505571
"encryptedCredential": {
506572
"type": "object",
507573
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
574+
},
575+
"credential": {
576+
"$ref": "../artifacts.json#/definitions/CredentialReference",
577+
"description": "The credential reference containing authentication information."
508578
}
509579
},
510580
"required": [
@@ -541,6 +611,10 @@
541611
"baseUrl": {
542612
"type": "object",
543613
"description": "The base URL of the Azure Key Vault. e.g. https://myakv.vault.azure.net Type: string (or Expression with resultType string)."
614+
},
615+
"credential": {
616+
"$ref": "../artifacts.json#/definitions/CredentialReference",
617+
"description": "The credential reference containing authentication information."
544618
}
545619
},
546620
"required": [
@@ -590,6 +664,10 @@
590664
"encryptedCredential": {
591665
"type": "object",
592666
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
667+
},
668+
"credential": {
669+
"$ref": "../artifacts.json#/definitions/CredentialReference",
670+
"description": "The credential reference containing authentication information."
593671
}
594672
}
595673
},
@@ -664,6 +742,10 @@
664742
"encryptedCredential": {
665743
"type": "object",
666744
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
745+
},
746+
"credential": {
747+
"$ref": "../artifacts.json#/definitions/CredentialReference",
748+
"description": "The credential reference containing authentication information."
667749
}
668750
},
669751
"required": [
@@ -2321,6 +2403,10 @@
23212403
"encryptedCredential": {
23222404
"type": "object",
23232405
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
2406+
},
2407+
"credential": {
2408+
"$ref": "../artifacts.json#/definitions/CredentialReference",
2409+
"description": "The credential reference containing authentication information."
23242410
}
23252411
},
23262412
"required": [
@@ -2394,6 +2480,10 @@
23942480
"sasToken": {
23952481
"$ref": "../artifacts.json#/definitions/SecretBase",
23962482
"description": "The Azure key vault secret reference of sasToken in sas uri."
2483+
},
2484+
"credential": {
2485+
"$ref": "../artifacts.json#/definitions/CredentialReference",
2486+
"description": "The credential reference containing authentication information."
23972487
}
23982488
}
23992489
},
@@ -2899,6 +2989,10 @@
28992989
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
29002990
"type": "object"
29012991
},
2992+
"credential": {
2993+
"$ref": "../artifacts.json#/definitions/CredentialReference",
2994+
"description": "The credential reference containing authentication information."
2995+
},
29022996
"clientId": {
29032997
"type": "object",
29042998
"description": "The client ID associated with your application. Type: string (or Expression with resultType string)."
@@ -5890,6 +5984,10 @@
58905984
"subnetName": {
58915985
"type": "object",
58925986
"description": "The ARM resource ID for the subnet in the vNet. If virtualNetworkId was specified, then this property is required. Type: string (or Expression with resultType string)."
5987+
},
5988+
"credential": {
5989+
"$ref": "../artifacts.json#/definitions/CredentialReference",
5990+
"description": "The credential reference containing authentication information."
58935991
}
58945992
},
58955993
"required": [
@@ -6111,6 +6209,10 @@
61116209
"policyId": {
61126210
"type": "object",
61136211
"description": "The policy id for limiting the ability to configure clusters based on a user defined set of rules. Type: string (or Expression with resultType string)."
6212+
},
6213+
"credential": {
6214+
"$ref": "../artifacts.json#/definitions/CredentialReference",
6215+
"description": "The credential reference containing authentication information."
61146216
}
61156217
},
61166218
"required": [
@@ -6156,6 +6258,10 @@
61566258
"encryptedCredential": {
61576259
"type": "object",
61586260
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
6261+
},
6262+
"credential": {
6263+
"$ref": "../artifacts.json#/definitions/CredentialReference",
6264+
"description": "The credential reference containing authentication information."
61596265
}
61606266
},
61616267
"required": [
@@ -6552,6 +6658,10 @@
65526658
"tenant": {
65536659
"type": "object",
65546660
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
6661+
},
6662+
"credential": {
6663+
"$ref": "../artifacts.json#/definitions/CredentialReference",
6664+
"description": "The credential reference containing authentication information."
65556665
}
65566666
},
65576667
"required": [
@@ -6594,6 +6704,18 @@
65946704
"encryptedCredential": {
65956705
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).",
65966706
"type": "object"
6707+
},
6708+
"credential": {
6709+
"$ref": "../artifacts.json#/definitions/CredentialReference",
6710+
"description": "The credential reference containing authentication information."
6711+
},
6712+
"resourceId": {
6713+
"description": "Allowed token audiences for azure function.",
6714+
"type": "object"
6715+
},
6716+
"authentication": {
6717+
"type": "object",
6718+
"description": "Type of authentication (Required to specify MSI) used to connect to AzureFunction. Type: string (or Expression with resultType string)."
65976719
}
65986720
},
65996721
"required": [

0 commit comments

Comments
 (0)