Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Data Factory]Add cloudType and snapshot to ADF public swagger #10235

Merged
merged 8 commits into from
Jul 28, 2020
Merged

[Data Factory]Add cloudType and snapshot to ADF public swagger #10235

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cb1293
Merge pull request #1 from Azure/master
rickysun93 Apr 3, 2020
f3abc16
Merge pull request #2 from Azure/master
rickysun93 May 15, 2020
209674a
Merge pull request #3 from Azure/master
rickysun93 Jun 23, 2020
e62f54c
add azureCloutType for aad auth
Jun 23, 2020
39206e8
add snapshot to azure file
Jul 7, 2020
53d78be
Merge pull request #4 from Azure/master
rickysun93 Jul 23, 2020
ceea243
Merge branch 'master' into haorsun/azurecloudtype
Jul 23, 2020
f79fca6
fix typo
Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@
"type": "object",
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
},
"azureCloudType": {
"type": "object",
"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)."
},
"encryptedCredential": {
"type": "string",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -211,6 +215,10 @@
"type": "object",
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
},
"azureCloudType": {
"type": "object",
"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)."
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -307,6 +315,10 @@
"type": "object",
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
},
"azureCloudType": {
"type": "object",
"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)."
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -359,6 +371,10 @@
"type": "object",
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
},
"azureCloudType": {
"type": "object",
"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)."
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -965,6 +981,10 @@
"description": "The azure file share name. It is required when auth with accountKey/sasToken. Type: string (or Expression with resultType string).",
"type": "object"
},
"snapshot": {
"description": "The azure file share snapshot version. Type: string (or Expression with resultType string).",
"type": "object"
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -1739,6 +1759,10 @@
"type": "object",
"description": "Specify the application id of your application registered in Azure Active Directory. Type: string (or Expression with resultType string)."
},
"azureCloudType": {
"type": "object",
"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)."
},
"aadResourceId": {
"type": "object",
"description": "Specify the resource you are requesting authorization to use Directory. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -2120,6 +2144,10 @@
"type": "object",
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
},
"azureCloudType": {
"type": "object",
"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)."
},
"accountName": {
"type": "object",
"description": "Data Lake Store account name. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -2184,6 +2212,10 @@
"type": "object",
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
},
"azureCloudType": {
"type": "object",
"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)."
},
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -2568,6 +2600,10 @@
"description": "The tenant information (domain name or tenant ID) used in AadServicePrincipal authentication type under which your application resides.",
"type": "object"
},
"azureCloudType": {
"type": "object",
"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)."
},
"aadResourceId": {
"description": "The resource you are requesting authorization to use.",
"type": "object"
Expand Down