From 91b79cda1a5e1cce91ae0bc5cadf8a32384777af Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 10 Dec 2021 10:41:12 +0800 Subject: [PATCH 1/3] Add servicePrincipalCredentialType and servicePrincipalCredential into AzureBlobFSLinkedService --- .../2018-06-01/entityTypes/Dataset.json | 54 +++++++++++++++++++ .../2018-06-01/entityTypes/LinkedService.json | 8 +++ .../entityTypes/Dataset.json | 54 +++++++++++++++++++ .../entityTypes/LinkedService.json | 8 +++ .../2020-12-01/entityTypes/Dataset.json | 54 +++++++++++++++++++ .../2020-12-01/entityTypes/LinkedService.json | 8 +++ 6 files changed, 186 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 3d207499b2e7..44a2cf9c6bfa 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -465,6 +465,60 @@ "type" ] }, + "DatasetBZip2Compression": { + "description": "The BZip2 compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetGZipCompression": { + "description": "The GZip compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetDeflateCompression": { + "description": "The Deflate compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetZipDeflateCompression": { + "description": "The ZipDeflate compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetTarCompression": { + "description": "The Tar archive method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetTarGZipCompression": { + "description": "The TarGZip compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 83144bae15a5..fe86b4abafba 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -2538,6 +2538,14 @@ "credential": { "$ref": "../datafactory.json#/definitions/CredentialReference", "description": "The credential reference containing authentication information." + }, + "servicePrincipalCredentialType": { + "type": "object", + "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." + }, + "servicePrincipalCredential": { + "description": "The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference.", + "$ref": "../datafactory.json#/definitions/SecretBase" } }, "required": [ diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json index f0ae949b559d..4c2348210e84 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json @@ -416,6 +416,60 @@ "type" ] }, + "DatasetBZip2Compression": { + "description": "The BZip2 compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetGZipCompression": { + "description": "The GZip compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetDeflateCompression": { + "description": "The Deflate compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetZipDeflateCompression": { + "description": "The ZipDeflate compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetTarCompression": { + "description": "The Tar archive method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetTarGZipCompression": { + "description": "The TarGZip compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json index f85730971b13..6bf27739d6c3 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json @@ -2352,6 +2352,14 @@ "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)." }, + "servicePrincipalCredentialType": { + "type": "object", + "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." + }, + "servicePrincipalCredential": { + "description": "The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference.", + "$ref": "../datafactory.json#/definitions/SecretBase" + }, "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)." diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json index 823de9c85de9..4eeaba032475 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json @@ -416,6 +416,60 @@ "type" ] }, + "DatasetBZip2Compression": { + "description": "The BZip2 compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetGZipCompression": { + "description": "The GZip compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetDeflateCompression": { + "description": "The Deflate compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetZipDeflateCompression": { + "description": "The ZipDeflate compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetTarCompression": { + "description": "The Tar archive method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, + "DatasetTarGZipCompression": { + "description": "The TarGZip compression method used on a dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/DatasetCompression" + } + ] + }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json index c9d58336b25b..b15c2d34eca9 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json @@ -2352,6 +2352,14 @@ "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)." }, + "servicePrincipalCredentialType": { + "type": "object", + "description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)." + }, + "servicePrincipalCredential": { + "description": "The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference.", + "$ref": "../datafactory.json#/definitions/SecretBase" + }, "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)." From 0cd66b15d0356073580edf1525417518f77d7b01 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Fri, 10 Dec 2021 10:57:03 +0800 Subject: [PATCH 2/3] update --- .../preview/2021-06-01-preview/entityTypes/LinkedService.json | 2 +- .../stable/2020-12-01/entityTypes/LinkedService.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json index 6bf27739d6c3..33c1cac67b92 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json @@ -2358,7 +2358,7 @@ }, "servicePrincipalCredential": { "description": "The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "$ref": "../artifacts.json#/definitions/SecretBase" }, "encryptedCredential": { "type": "object", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json index b15c2d34eca9..248670bbf830 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json @@ -2358,7 +2358,7 @@ }, "servicePrincipalCredential": { "description": "The credential of the service principal object in Azure Active Directory. If servicePrincipalCredentialType is 'ServicePrincipalKey', servicePrincipalCredential can be SecureString or AzureKeyVaultSecretReference. If servicePrincipalCredentialType is 'ServicePrincipalCert', servicePrincipalCredential can only be AzureKeyVaultSecretReference.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "$ref": "../artifacts.json#/definitions/SecretBase" }, "encryptedCredential": { "type": "object", From 6ba772b03dc9673dfd31a92495cf8f8e6ae5dbae Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Tue, 28 Dec 2021 09:32:16 +0800 Subject: [PATCH 3/3] revert some change --- .../2018-06-01/entityTypes/Dataset.json | 54 ------------------- .../entityTypes/Dataset.json | 54 ------------------- .../2020-12-01/entityTypes/Dataset.json | 54 ------------------- 3 files changed, 162 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 44a2cf9c6bfa..3d207499b2e7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -465,60 +465,6 @@ "type" ] }, - "DatasetBZip2Compression": { - "description": "The BZip2 compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetGZipCompression": { - "description": "The GZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetDeflateCompression": { - "description": "The Deflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetZipDeflateCompression": { - "description": "The ZipDeflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetTarCompression": { - "description": "The Tar archive method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetTarGZipCompression": { - "description": "The TarGZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json index 4c2348210e84..f0ae949b559d 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json @@ -416,60 +416,6 @@ "type" ] }, - "DatasetBZip2Compression": { - "description": "The BZip2 compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetGZipCompression": { - "description": "The GZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetDeflateCompression": { - "description": "The Deflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetZipDeflateCompression": { - "description": "The ZipDeflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetTarCompression": { - "description": "The Tar archive method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetTarGZipCompression": { - "description": "The TarGZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json index 4eeaba032475..823de9c85de9 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json @@ -416,60 +416,6 @@ "type" ] }, - "DatasetBZip2Compression": { - "description": "The BZip2 compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetGZipCompression": { - "description": "The GZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetDeflateCompression": { - "description": "The Deflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetZipDeflateCompression": { - "description": "The ZipDeflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetTarCompression": { - "description": "The Tar archive method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, - "DatasetTarGZipCompression": { - "description": "The TarGZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ] - }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.",