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

Swagger changes for adding SPN, UAMI and SAMI credentials #28122

Merged
merged 4 commits into from
Mar 19, 2024
Merged

Swagger changes for adding SPN, UAMI and SAMI credentials #28122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9907c72
Swagger changes for adding SPN, UAMI and SAMI credentials
Mar 5, 2024
d3ef35c
Merge branch 'main' into dev/saurabhchugh/AddingCredentialSourcesForD…
ruowan Mar 14, 2024
de2ee48
Merge branch 'main' into dev/saurabhchugh/AddingCredentialSourcesForD…
ms-henglu Mar 19, 2024
eaa57b0
Merge branch 'main' into dev/saurabhchugh/AddingCredentialSourcesForD…
ms-henglu Mar 19, 2024
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
28 changes: 23 additions & 5 deletions ...ion/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/datafactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4048,15 +4048,15 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/ManagedIdentityCredentialResource"
"$ref": "#/definitions/CredentialResource"
}
}
],
"responses": {
"200": {
"description": "OK.",
"schema": {
"$ref": "#/definitions/ManagedIdentityCredentialResource"
"$ref": "#/definitions/CredentialResource"
}
},
"default": {
Expand Down Expand Up @@ -4106,7 +4106,7 @@
"200": {
"description": "OK.",
"schema": {
"$ref": "#/definitions/ManagedIdentityCredentialResource"
"$ref": "#/definitions/CredentialResource"
}
},
"304": {
Expand Down Expand Up @@ -7645,7 +7645,7 @@
"type": "array",
"description": "List of credentials.",
"items": {
"$ref": "#/definitions/ManagedIdentityCredentialResource"
"$ref": "#/definitions/CredentialResource"
}
},
"nextLink": {
Expand Down Expand Up @@ -7676,7 +7676,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/SubResource"
"$ref": "#/definitions/CredentialResource"
}
],
"properties": {
Expand All @@ -7689,6 +7689,24 @@
"properties"
]
},
"ServicePrincipalCredentialResource": {
"description": "Credential resource type.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CredentialResource"
}
],
"properties": {
"properties": {
"$ref": "./entityTypes/Credential.json#/definitions/ServicePrincipalCredential",
"description": "Service Principal Credential properties."
}
},
"required": [
"properties"
]
},
"ManagedVirtualNetworkListResponse": {
"description": "A list of managed Virtual Network resources.",
"type": "object",
Expand Down
55 changes: 47 additions & 8 deletions ...tory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Credential.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,7 @@
{
"$ref": "#/definitions/Credential"
}
],
"properties": {
"typeProperties": {
"description": "Managed identity credential properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/ManagedIdentityTypeProperties"
}
}
]
},
"ManagedIdentityTypeProperties": {
"description": "Managed identity type properties.",
Expand All @@ -101,6 +94,52 @@
"description": "The resource id of user assigned managed identity"
}
}
},
"UserAssignedManagedIdentityCredential": {
"description": "User Assigned Managed identity credential.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ManagedIdentityCredential"
}
],
"properties": {
"typeProperties": {
"description": "User Assigned Managed identity credential properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/UserAssignedManagedIdentityTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"UserAssignedManagedIdentityTypeProperties": {
"description": "User Assigned Managed identity type properties.",
"$ref": "#/definitions/ManagedIdentityTypeProperties",
"required": [
"resourceId"
]
},
"SystemAssignedManagedIdentityCredential": {
"description": "System Assigned Managed identity credential.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ManagedIdentityCredential"
}
],
"properties": {
"typeProperties": {
"description": "System Assigned Managed identity credential properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/SystemAssignedManagedIdentityTypeProperties"
}
}
},
"SystemAssignedManagedIdentityTypeProperties": {
"description": "System Assigned Managed identity type properties.",
"$ref": "#/definitions/ManagedIdentityTypeProperties"
}
}
}