diff --git a/lib/services/datafactoryManagement/lib/models/amazonS3Dataset.js b/lib/services/datafactoryManagement/lib/models/amazonS3Dataset.js index 296824b27b..c24e955602 100644 --- a/lib/services/datafactoryManagement/lib/models/amazonS3Dataset.js +++ b/lib/services/datafactoryManagement/lib/models/amazonS3Dataset.js @@ -26,8 +26,6 @@ class AmazonS3Dataset extends models['Dataset'] { * Expression with resultType string). * @member {object} [prefix] The prefix filter for the S3 object name. Type: * string (or Expression with resultType string). - * @member {object} [wildcardPath] The path of the S3 object with wildcard - * supported. Type: string (or Expression with resultType string). * @member {object} [version] The version for the S3 object. Type: string (or * Expression with resultType string). * @member {object} [format] The format of files. @@ -152,13 +150,6 @@ class AmazonS3Dataset extends models['Dataset'] { name: 'Object' } }, - wildcardPath: { - required: false, - serializedName: 'typeProperties.wildcardPath', - type: { - name: 'Object' - } - }, version: { required: false, serializedName: 'typeProperties.version', diff --git a/lib/services/datafactoryManagement/lib/models/azureBlobDataset.js b/lib/services/datafactoryManagement/lib/models/azureBlobDataset.js index 1091aeed87..577cc421b2 100644 --- a/lib/services/datafactoryManagement/lib/models/azureBlobDataset.js +++ b/lib/services/datafactoryManagement/lib/models/azureBlobDataset.js @@ -26,9 +26,6 @@ class AzureBlobDataset extends models['Dataset'] { * (or Expression with resultType string). * @member {object} [fileName] The name of the Azure Blob. Type: string (or * Expression with resultType string). - * @member {object} [wildcardPath] The whole path include file name of the - * Azure Blob storage with wildcard supported. Type: string (or Expression - * with resultType string). * @member {object} [format] The format of the Azure Blob storage. * @member {object} [format.serializer] Serializer. Type: string (or * Expression with resultType string). @@ -151,13 +148,6 @@ class AzureBlobDataset extends models['Dataset'] { name: 'Object' } }, - wildcardPath: { - required: false, - serializedName: 'typeProperties.wildcardPath', - type: { - name: 'Object' - } - }, format: { required: false, serializedName: 'typeProperties.format', diff --git a/lib/services/datafactoryManagement/lib/models/azureDataLakeStoreDataset.js b/lib/services/datafactoryManagement/lib/models/azureDataLakeStoreDataset.js index bd1c574011..f09801de16 100644 --- a/lib/services/datafactoryManagement/lib/models/azureDataLakeStoreDataset.js +++ b/lib/services/datafactoryManagement/lib/models/azureDataLakeStoreDataset.js @@ -20,7 +20,7 @@ const models = require('./index'); class AzureDataLakeStoreDataset extends models['Dataset'] { /** * Create a AzureDataLakeStoreDataset. - * @member {object} [folderPath] Path to the folder in the Azure Data Lake + * @member {object} folderPath Path to the folder in the Azure Data Lake * Store. Type: string (or Expression with resultType string). * @member {object} [fileName] The name of the file in the Azure Data Lake * Store. Type: string (or Expression with resultType string). @@ -30,9 +30,6 @@ class AzureDataLakeStoreDataset extends models['Dataset'] { * @member {object} [format.deserializer] Deserializer. Type: string (or * Expression with resultType string). * @member {string} [format.type] Polymorphic Discriminator - * @member {object} [wildcardPath] The whole path include file name in the - * Azure Data Lake Store with wildcard supported. Type: string (or Expression - * with resultType string). * @member {object} [compression] The data compression method used for the * item(s) in the Azure Data Lake Store. * @member {string} [compression.type] Polymorphic Discriminator @@ -129,7 +126,7 @@ class AzureDataLakeStoreDataset extends models['Dataset'] { } }, folderPath: { - required: false, + required: true, serializedName: 'typeProperties.folderPath', type: { name: 'Object' @@ -167,13 +164,6 @@ class AzureDataLakeStoreDataset extends models['Dataset'] { className: 'DatasetStorageFormat' } }, - wildcardPath: { - required: false, - serializedName: 'typeProperties.wildcardPath', - type: { - name: 'Object' - } - }, compression: { required: false, serializedName: 'typeProperties.compression', diff --git a/lib/services/datafactoryManagement/lib/models/fileShareDataset.js b/lib/services/datafactoryManagement/lib/models/fileShareDataset.js index 3848e82da8..032ebb6bf4 100644 --- a/lib/services/datafactoryManagement/lib/models/fileShareDataset.js +++ b/lib/services/datafactoryManagement/lib/models/fileShareDataset.js @@ -24,9 +24,6 @@ class FileShareDataset extends models['Dataset'] { * Type: string (or Expression with resultType string). * @member {object} [fileName] The name of the on-premises file system. Type: * string (or Expression with resultType string). - * @member {object} [wildcardPath] The whole path include file name of the - * on-premises file system with wildcard supported. Type: string (or - * Expression with resultType string). * @member {object} [format] The format of the files. * @member {object} [format.serializer] Serializer. Type: string (or * Expression with resultType string). @@ -145,13 +142,6 @@ class FileShareDataset extends models['Dataset'] { name: 'Object' } }, - wildcardPath: { - required: false, - serializedName: 'typeProperties.wildcardPath', - type: { - name: 'Object' - } - }, format: { required: false, serializedName: 'typeProperties.format', diff --git a/lib/services/datafactoryManagement/lib/models/index.d.ts b/lib/services/datafactoryManagement/lib/models/index.d.ts index b9d2adda73..bee2e2ab02 100644 --- a/lib/services/datafactoryManagement/lib/models/index.d.ts +++ b/lib/services/datafactoryManagement/lib/models/index.d.ts @@ -2726,60 +2726,6 @@ export interface GoogleBigQueryLinkedService extends LinkedService { encryptedCredential?: any; } -/** - * @class - * Initializes a new instance of the GoogleAdWordsLinkedService class. - * @constructor - * Google Awords service linked service. - * - * @member {object} clientCustomerID The Client customer ID of the AdWords - * account that you want to fetch report data for. - * @member {object} developerToken The developer token associated with the - * manager account that you use to grant access to the AdWords API. - * @member {string} [developerToken.type] Polymorphic Discriminator - * @member {string} authenticationType The OAuth 2.0 authentication mechanism - * used for authentication. ServiceAuthentication can only be used on - * self-hosted IR. Possible values include: 'ServiceAuthentication', - * 'UserAuthentication' - * @member {object} [refreshToken] The refresh token obtained from Google for - * authorizing access to AdWords for UserAuthentication. - * @member {string} [refreshToken.type] Polymorphic Discriminator - * @member {object} [clientId] The client id of the google application used to - * acquire the refresh token. - * @member {string} [clientId.type] Polymorphic Discriminator - * @member {object} [clientSecret] The client secret of the google application - * used to acquire the refresh token. - * @member {string} [clientSecret.type] Polymorphic Discriminator - * @member {object} [email] The service account email ID that is used for - * ServiceAuthentication and can only be used on self-hosted IR. - * @member {object} [keyFilePath] The full path to the .p12 key file that is - * used to authenticate the service account email address and can only be used - * on self-hosted IR. - * @member {object} [trustedCertPath] The full path of the .pem file containing - * trusted CA certificates for verifying the server when connecting over SSL. - * This property can only be set when using SSL on self-hosted IR. The default - * value is the cacerts.pem file installed with the IR. - * @member {object} [useSystemTrustStore] Specifies whether to use a CA - * certificate from the system trust store or from a specified PEM file. The - * default value is false. - * @member {object} [encryptedCredential] The encrypted credential used for - * authentication. Credentials are encrypted using the integration runtime - * credential manager. Type: string (or Expression with resultType string). - */ -export interface GoogleAdWordsLinkedService extends LinkedService { - clientCustomerID: any; - developerToken: SecretBase; - authenticationType: string; - refreshToken?: SecretBase; - clientId?: SecretBase; - clientSecret?: SecretBase; - email?: any; - keyFilePath?: any; - trustedCertPath?: any; - useSystemTrustStore?: any; - encryptedCredential?: any; -} - /** * @class * Initializes a new instance of the EloquaLinkedService class. @@ -3089,49 +3035,6 @@ export interface FtpServerLinkedService extends LinkedService { enableServerCertificateValidation?: any; } -/** - * @class - * Initializes a new instance of the RestServiceLinkedService class. - * @constructor - * Rest Service linked service. - * - * @member {object} url The base URL of the REST service. - * @member {object} [enableServerCertificateValidation] Whether to validate - * server side SSL certificate when connecting to the endpoint.The default - * value is true. Type: boolean (or Expression with resultType boolean). - * @member {string} authenticationType Type of authentication used to connect - * to the REST service. Possible values include: 'Anonymous', 'Basic', - * 'AadServicePrincial', 'ManagedServiceIdentity' - * @member {object} [userName] The user name used in Basic authentication type. - * @member {object} [password] The password used in Basic authentication type. - * @member {string} [password.type] Polymorphic Discriminator - * @member {object} [servicePrincipalId] The application’s client ID used in - * AadServicePrincipal authentication type. - * @member {object} [servicePrincipalKey] The application’s key used in - * AadServicePrincipal authentication type. - * @member {string} [servicePrincipalKey.type] Polymorphic Discriminator - * @member {object} [tenant] The tenant information (domain name or tenant ID) - * used in AadServicePrincipal authentication type under which your application - * resides. - * @member {object} [aadResourceId] The resource you are requesting - * authorization to use. - * @member {object} [encryptedCredential] The encrypted credential used for - * authentication. Credentials are encrypted using the integration runtime - * credential manager. Type: string (or Expression with resultType string). - */ -export interface RestServiceLinkedService extends LinkedService { - url: any; - enableServerCertificateValidation?: any; - authenticationType: string; - userName?: any; - password?: SecretBase; - servicePrincipalId?: any; - servicePrincipalKey?: SecretBase; - tenant?: any; - aadResourceId?: any; - encryptedCredential?: any; -} - /** * @class * Initializes a new instance of the HttpLinkedService class. @@ -3544,56 +3447,21 @@ export interface WebLinkedService extends LinkedService { * * @member {object} url The URL of the OData service endpoint. Type: string (or * Expression with resultType string). - * @member {string} authenticationType Type of authentication used to connect - * to the OData service. Possible values include: 'Anonymous', 'Basic', - * 'Windows', 'AadServicePrincipal', 'ManagedServiceIdentity' + * @member {string} [authenticationType] Type of authentication used to connect + * to the OData service. Possible values include: 'Basic', 'Anonymous' * @member {object} [userName] User name of the OData service. Type: string (or * Expression with resultType string). * @member {object} [password] Password of the OData service. * @member {string} [password.type] Polymorphic Discriminator - * @member {object} [tenant] Specify the tenant information (domain name or - * tenant ID) under which your application resides. Type: string (or Expression - * with resultType string). - * @member {object} [servicePrincipalId] Specify the application id of your - * application registered in Azure Active Directory. Type: string (or - * Expression with resultType string). - * @member {object} [aadResourceId] Specify the resource you are requesting - * authorization to use Directory. Type: string (or Expression with resultType - * string). - * @member {string} [aadServicePrincipalCredentialType] Specify the credential - * type (key or cert) is used for service principal. Possible values include: - * 'ServicePrincipalKey', 'ServicePrincipalCert' - * @member {object} [servicePrincipalKey] Specify the secret of your - * application registered in Azure Active Directory. Type: string (or - * Expression with resultType string). - * @member {string} [servicePrincipalKey.type] Polymorphic Discriminator - * @member {object} [servicePrincipalEmbeddedCert] Specify the base64 encoded - * certificate of your application registered in Azure Active Directory. Type: - * string (or Expression with resultType string). - * @member {string} [servicePrincipalEmbeddedCert.type] Polymorphic - * Discriminator - * @member {object} [servicePrincipalEmbeddedCertPassword] Specify the password - * of your certificate if your certificate has a password and you are using - * AadServicePrincipal authentication. Type: string (or Expression with - * resultType string). - * @member {string} [servicePrincipalEmbeddedCertPassword.type] Polymorphic - * Discriminator * @member {object} [encryptedCredential] The encrypted credential used for * authentication. Credentials are encrypted using the integration runtime * credential manager. Type: string (or Expression with resultType string). */ export interface ODataLinkedService extends LinkedService { url: any; - authenticationType: string; + authenticationType?: string; userName?: any; password?: SecretBase; - tenant?: any; - servicePrincipalId?: any; - aadResourceId?: any; - aadServicePrincipalCredentialType?: string; - servicePrincipalKey?: SecretBase; - servicePrincipalEmbeddedCert?: SecretBase; - servicePrincipalEmbeddedCertPassword?: SecretBase; encryptedCredential?: any; } @@ -3832,42 +3700,6 @@ export interface AzureMySqlLinkedService extends LinkedService { encryptedCredential?: any; } -/** - * @class - * Initializes a new instance of the OracleServiceCloudLinkedService class. - * @constructor - * Oracle Service Cloud linked service. - * - * @member {object} host The URL of the Oracle Service Cloud instance. - * @member {object} username The user name that you use to access Oracle - * Service Cloud server. - * @member {object} password The password corresponding to the user name that - * you provided in the username key. - * @member {string} [password.type] Polymorphic Discriminator - * @member {object} [useEncryptedEndpoints] Specifies whether the data source - * endpoints are encrypted using HTTPS. The default value is true. Type: - * boolean (or Expression with resultType boolean). - * @member {object} [useHostVerification] Specifies whether to require the host - * name in the server's certificate to match the host name of the server when - * connecting over SSL. The default value is true. Type: boolean (or Expression - * with resultType boolean). - * @member {object} [usePeerVerification] Specifies whether to verify the - * identity of the server when connecting over SSL. The default value is true. - * Type: boolean (or Expression with resultType boolean). - * @member {object} [encryptedCredential] The encrypted credential used for - * authentication. Credentials are encrypted using the integration runtime - * credential manager. Type: string (or Expression with resultType string). - */ -export interface OracleServiceCloudLinkedService extends LinkedService { - host: any; - username: any; - password: SecretBase; - useEncryptedEndpoints?: any; - useHostVerification?: any; - usePeerVerification?: any; - encryptedCredential?: any; -} - /** * @class * Initializes a new instance of the OracleLinkedService class. @@ -3944,41 +3776,6 @@ export interface HDInsightLinkedService extends LinkedService { encryptedCredential?: any; } -/** - * @class - * Initializes a new instance of the DynamicsAXLinkedService class. - * @constructor - * Dynamics AX linked service. - * - * @member {object} url The URL of Dynamics AX OData API. Type: string (or - * Expression with resultType string). - * @member {object} [tenant] Specify the tenant information (domain name or - * tenant ID) under which your application resides. Type: string (or Expression - * with resultType string). - * @member {object} [servicePrincipalId] Specify the application id of your - * application registered in Azure Active Directory. Type: string (or - * Expression with resultType string). - * @member {object} [aadResourceId] Specify the resource you are requesting - * authorization to use Directory. Type: string (or Expression with resultType - * string). - * @member {object} [servicePrincipalKey] Specify the secret of your - * application registered in Azure Active Directory. Type: string (or - * Expression with resultType string). - * @member {string} [servicePrincipalKey.type] Polymorphic Discriminator - * @member {object} [encryptedCredential] The encrypted credential used for - * authentication. Credentials are encrypted using the integration runtime - * credential manager. Either encryptedCredential or username/password must be - * provided. Type: string (or Expression with resultType string). - */ -export interface DynamicsAXLinkedService extends LinkedService { - url: any; - tenant?: any; - servicePrincipalId?: any; - aadResourceId?: any; - servicePrincipalKey?: SecretBase; - encryptedCredential?: any; -} - /** * @class * Initializes a new instance of the DynamicsLinkedService class. @@ -4488,16 +4285,6 @@ export interface GreenplumTableDataset extends Dataset { export interface GoogleBigQueryObjectDataset extends Dataset { } -/** - * @class - * Initializes a new instance of the GoogleAdWordsObjectDataset class. - * @constructor - * Google AdWords service dataset. - * - */ -export interface GoogleAdWordsObjectDataset extends Dataset { -} - /** * @class * Initializes a new instance of the EloquaObjectDataset class. @@ -4558,33 +4345,6 @@ export interface AzurePostgreSqlTableDataset extends Dataset { export interface AmazonMWSObjectDataset extends Dataset { } -/** - * @class - * Initializes a new instance of the RestServiceDataset class. - * @constructor - * A Rest service dataset. - * - * @member {object} [relativeUrl] The relative URL to the resource that the - * RESTful API provides. Type: string (or Expression with resultType string). - * @member {object} [requestMethod] The HTTP method used to call the RESTful - * API. The default is GET. Type: string (or Expression with resultType - * string). - * @member {object} [requestBody] The HTTP request body to the RESTful API if - * requestMethod is POST. Type: string (or Expression with resultType string). - * @member {object} [additionalHeaders] The additional HTTP headers in the - * request to the RESTful API. Type: string (or Expression with resultType - * string). - * @member {object} [paginationRules] The pagination rules to compose next page - * requests. - */ -export interface RestServiceDataset extends Dataset { - relativeUrl?: any; - requestMethod?: any; - requestBody?: any; - additionalHeaders?: any; - paginationRules?: any; -} - /** * @class * Initializes a new instance of the DatasetCompression class. @@ -4929,16 +4689,6 @@ export interface AzureMySqlTableDataset extends Dataset { tableName?: any; } -/** - * @class - * Initializes a new instance of the OracleServiceCloudObjectDataset class. - * @constructor - * Oracle Service Cloud dataset. - * - */ -export interface OracleServiceCloudObjectDataset extends Dataset { -} - /** * @class * Initializes a new instance of the OracleTableDataset class. @@ -4988,9 +4738,6 @@ export interface MongoDbCollectionDataset extends Dataset { * string (or Expression with resultType string). * @member {object} [fileName] The name of the on-premises file system. Type: * string (or Expression with resultType string). - * @member {object} [wildcardPath] The whole path include file name of the - * on-premises file system with wildcard supported. Type: string (or Expression - * with resultType string). * @member {object} [format] The format of the files. * @member {object} [format.serializer] Serializer. Type: string (or Expression * with resultType string). @@ -5007,7 +4754,6 @@ export interface MongoDbCollectionDataset extends Dataset { export interface FileShareDataset extends Dataset { folderPath?: any; fileName?: any; - wildcardPath?: any; format?: DatasetStorageFormat; fileFilter?: any; compression?: DatasetCompression; @@ -5019,8 +4765,8 @@ export interface FileShareDataset extends Dataset { * @constructor * Azure Data Lake Store dataset. * - * @member {object} [folderPath] Path to the folder in the Azure Data Lake - * Store. Type: string (or Expression with resultType string). + * @member {object} folderPath Path to the folder in the Azure Data Lake Store. + * Type: string (or Expression with resultType string). * @member {object} [fileName] The name of the file in the Azure Data Lake * Store. Type: string (or Expression with resultType string). * @member {object} [format] The format of the Data Lake Store. @@ -5029,34 +4775,17 @@ export interface FileShareDataset extends Dataset { * @member {object} [format.deserializer] Deserializer. Type: string (or * Expression with resultType string). * @member {string} [format.type] Polymorphic Discriminator - * @member {object} [wildcardPath] The whole path include file name in the - * Azure Data Lake Store with wildcard supported. Type: string (or Expression - * with resultType string). * @member {object} [compression] The data compression method used for the * item(s) in the Azure Data Lake Store. * @member {string} [compression.type] Polymorphic Discriminator */ export interface AzureDataLakeStoreDataset extends Dataset { - folderPath?: any; + folderPath: any; fileName?: any; format?: DatasetStorageFormat; - wildcardPath?: any; compression?: DatasetCompression; } -/** - * @class - * Initializes a new instance of the DynamicsAXResourceDataset class. - * @constructor - * The path of the Dynamics AX OData entity. - * - * @member {string} path The path of the Dynamics AX OData entity. Type: string - * (or Expression with resultType string). - */ -export interface DynamicsAXResourceDataset extends Dataset { - path: string; -} - /** * @class * Initializes a new instance of the DynamicsEntityDataset class. @@ -5162,9 +4891,6 @@ export interface AzureTableDataset extends Dataset { * Expression with resultType string). * @member {object} [fileName] The name of the Azure Blob. Type: string (or * Expression with resultType string). - * @member {object} [wildcardPath] The whole path include file name of the - * Azure Blob storage with wildcard supported. Type: string (or Expression with - * resultType string). * @member {object} [format] The format of the Azure Blob storage. * @member {object} [format.serializer] Serializer. Type: string (or Expression * with resultType string). @@ -5179,7 +4905,6 @@ export interface AzureBlobDataset extends Dataset { folderPath?: any; tableRootLocation?: any; fileName?: any; - wildcardPath?: any; format?: DatasetStorageFormat; compression?: DatasetCompression; } @@ -5196,8 +4921,6 @@ export interface AzureBlobDataset extends Dataset { * Expression with resultType string). * @member {object} [prefix] The prefix filter for the S3 object name. Type: * string (or Expression with resultType string). - * @member {object} [wildcardPath] The path of the S3 object with wildcard - * supported. Type: string (or Expression with resultType string). * @member {object} [version] The version for the S3 object. Type: string (or * Expression with resultType string). * @member {object} [format] The format of files. @@ -5214,7 +4937,6 @@ export interface AmazonS3Dataset extends Dataset { bucketName: any; key?: any; prefix?: any; - wildcardPath?: any; version?: any; format?: DatasetStorageFormat; compression?: DatasetCompression; @@ -5927,19 +5649,6 @@ export interface GoogleBigQuerySource extends CopySource { query?: any; } -/** - * @class - * Initializes a new instance of the GoogleAdWordsSource class. - * @constructor - * A copy activity Google AdWords service source. - * - * @member {object} [query] A query to retrieve data from source. Type: string - * (or Expression with resultType string). - */ -export interface GoogleAdWordsSource extends CopySource { - query?: any; -} - /** * @class * Initializes a new instance of the EloquaSource class. @@ -6018,27 +5727,6 @@ export interface AmazonMWSSource extends CopySource { query?: any; } -/** - * @class - * Initializes a new instance of the RestServiceSource class. - * @constructor - * A copy activity Rest service source. - * - * @member {object} [httpRequestTimeout] The timeout (TimeSpan) to get an HTTP - * response. It is the timeout to get a response, not the timeout to read - * response data. Default value: 00:01:40. Type: string (or Expression with - * resultType string), pattern: - * ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - * @member {object} [requestInterval] The time to await before sending next - * page request. Default value: 00:00:01. Type: string (or Expression with - * resultType string), pattern: - * ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). - */ -export interface RestServiceSource extends CopySource { - httpRequestTimeout?: any; - requestInterval?: any; -} - /** * @class * Initializes a new instance of the HttpSource class. @@ -6114,19 +5802,6 @@ export interface CassandraSource extends CopySource { export interface WebSource extends CopySource { } -/** - * @class - * Initializes a new instance of the OracleServiceCloudSource class. - * @constructor - * A copy activity Oracle Service Cloud source. - * - * @member {object} [query] A query to retrieve data from source. Type: string - * (or Expression with resultType string). - */ -export interface OracleServiceCloudSource extends CopySource { - query?: any; -} - /** * @class * Initializes a new instance of the OracleSource class. @@ -6245,13 +5920,13 @@ export interface SqlDWSource extends CopySource { * @constructor * SQL stored procedure parameter. * - * @member {object} [value] Stored procedure parameter value. Type: string (or + * @member {object} value Stored procedure parameter value. Type: string (or * Expression with resultType string). * @member {string} [type] Stored procedure parameter type. Possible values * include: 'String', 'Int', 'Decimal', 'Guid', 'Boolean', 'Date' */ export interface StoredProcedureParameter { - value?: any; + value: any; type?: string; } @@ -6331,19 +6006,6 @@ export interface RelationalSource extends CopySource { query?: any; } -/** - * @class - * Initializes a new instance of the DynamicsAXSource class. - * @constructor - * A copy activity Dynamics AX source. - * - * @member {object} [query] A query to retrieve data from source. Type: string - * (or Expression with resultType string). - */ -export interface DynamicsAXSource extends CopySource { - query?: any; -} - /** * @class * Initializes a new instance of the DynamicsSource class. diff --git a/lib/services/datafactoryManagement/lib/models/index.js b/lib/services/datafactoryManagement/lib/models/index.js index 03f87d9eec..8ddb258f22 100644 --- a/lib/services/datafactoryManagement/lib/models/index.js +++ b/lib/services/datafactoryManagement/lib/models/index.js @@ -124,7 +124,6 @@ exports.HiveLinkedService = require('./hiveLinkedService'); exports.HBaseLinkedService = require('./hBaseLinkedService'); exports.GreenplumLinkedService = require('./greenplumLinkedService'); exports.GoogleBigQueryLinkedService = require('./googleBigQueryLinkedService'); -exports.GoogleAdWordsLinkedService = require('./googleAdWordsLinkedService'); exports.EloquaLinkedService = require('./eloquaLinkedService'); exports.DrillLinkedService = require('./drillLinkedService'); exports.CouchbaseLinkedService = require('./couchbaseLinkedService'); @@ -135,7 +134,6 @@ exports.SapHanaLinkedService = require('./sapHanaLinkedService'); exports.SapBWLinkedService = require('./sapBWLinkedService'); exports.SftpServerLinkedService = require('./sftpServerLinkedService'); exports.FtpServerLinkedService = require('./ftpServerLinkedService'); -exports.RestServiceLinkedService = require('./restServiceLinkedService'); exports.HttpLinkedService = require('./httpLinkedService'); exports.AzureSearchLinkedService = require('./azureSearchLinkedService'); exports.CustomDataSourceLinkedService = require('./customDataSourceLinkedService'); @@ -162,11 +160,9 @@ exports.SybaseLinkedService = require('./sybaseLinkedService'); exports.PostgreSqlLinkedService = require('./postgreSqlLinkedService'); exports.MySqlLinkedService = require('./mySqlLinkedService'); exports.AzureMySqlLinkedService = require('./azureMySqlLinkedService'); -exports.OracleServiceCloudLinkedService = require('./oracleServiceCloudLinkedService'); exports.OracleLinkedService = require('./oracleLinkedService'); exports.FileServerLinkedService = require('./fileServerLinkedService'); exports.HDInsightLinkedService = require('./hDInsightLinkedService'); -exports.DynamicsAXLinkedService = require('./dynamicsAXLinkedService'); exports.DynamicsLinkedService = require('./dynamicsLinkedService'); exports.CosmosDbLinkedService = require('./cosmosDbLinkedService'); exports.AzureKeyVaultLinkedService = require('./azureKeyVaultLinkedService'); @@ -201,14 +197,12 @@ exports.HiveObjectDataset = require('./hiveObjectDataset'); exports.HBaseObjectDataset = require('./hBaseObjectDataset'); exports.GreenplumTableDataset = require('./greenplumTableDataset'); exports.GoogleBigQueryObjectDataset = require('./googleBigQueryObjectDataset'); -exports.GoogleAdWordsObjectDataset = require('./googleAdWordsObjectDataset'); exports.EloquaObjectDataset = require('./eloquaObjectDataset'); exports.DrillTableDataset = require('./drillTableDataset'); exports.CouchbaseTableDataset = require('./couchbaseTableDataset'); exports.ConcurObjectDataset = require('./concurObjectDataset'); exports.AzurePostgreSqlTableDataset = require('./azurePostgreSqlTableDataset'); exports.AmazonMWSObjectDataset = require('./amazonMWSObjectDataset'); -exports.RestServiceDataset = require('./restServiceDataset'); exports.DatasetCompression = require('./datasetCompression'); exports.DatasetZipDeflateCompression = require('./datasetZipDeflateCompression'); exports.DatasetDeflateCompression = require('./datasetDeflateCompression'); @@ -229,13 +223,11 @@ exports.SapCloudForCustomerResourceDataset = require('./sapCloudForCustomerResou exports.SalesforceObjectDataset = require('./salesforceObjectDataset'); exports.RelationalTableDataset = require('./relationalTableDataset'); exports.AzureMySqlTableDataset = require('./azureMySqlTableDataset'); -exports.OracleServiceCloudObjectDataset = require('./oracleServiceCloudObjectDataset'); exports.OracleTableDataset = require('./oracleTableDataset'); exports.ODataResourceDataset = require('./oDataResourceDataset'); exports.MongoDbCollectionDataset = require('./mongoDbCollectionDataset'); exports.FileShareDataset = require('./fileShareDataset'); exports.AzureDataLakeStoreDataset = require('./azureDataLakeStoreDataset'); -exports.DynamicsAXResourceDataset = require('./dynamicsAXResourceDataset'); exports.DynamicsEntityDataset = require('./dynamicsEntityDataset'); exports.DocumentDbCollectionDataset = require('./documentDbCollectionDataset'); exports.CustomDataset = require('./customDataset'); @@ -284,20 +276,17 @@ exports.HiveSource = require('./hiveSource'); exports.HBaseSource = require('./hBaseSource'); exports.GreenplumSource = require('./greenplumSource'); exports.GoogleBigQuerySource = require('./googleBigQuerySource'); -exports.GoogleAdWordsSource = require('./googleAdWordsSource'); exports.EloquaSource = require('./eloquaSource'); exports.DrillSource = require('./drillSource'); exports.CouchbaseSource = require('./couchbaseSource'); exports.ConcurSource = require('./concurSource'); exports.AzurePostgreSqlSource = require('./azurePostgreSqlSource'); exports.AmazonMWSSource = require('./amazonMWSSource'); -exports.RestServiceSource = require('./restServiceSource'); exports.HttpSource = require('./httpSource'); exports.AzureDataLakeStoreSource = require('./azureDataLakeStoreSource'); exports.MongoDbSource = require('./mongoDbSource'); exports.CassandraSource = require('./cassandraSource'); exports.WebSource = require('./webSource'); -exports.OracleServiceCloudSource = require('./oracleServiceCloudSource'); exports.OracleSource = require('./oracleSource'); exports.AzureMySqlSource = require('./azureMySqlSource'); exports.DistcpSettings = require('./distcpSettings'); @@ -310,7 +299,6 @@ exports.SapEccSource = require('./sapEccSource'); exports.SapCloudForCustomerSource = require('./sapCloudForCustomerSource'); exports.SalesforceSource = require('./salesforceSource'); exports.RelationalSource = require('./relationalSource'); -exports.DynamicsAXSource = require('./dynamicsAXSource'); exports.DynamicsSource = require('./dynamicsSource'); exports.DocumentDbCollectionSource = require('./documentDbCollectionSource'); exports.BlobSource = require('./blobSource'); @@ -439,7 +427,6 @@ exports.discriminators = { 'LinkedService.HBase' : exports.HBaseLinkedService, 'LinkedService.Greenplum' : exports.GreenplumLinkedService, 'LinkedService.GoogleBigQuery' : exports.GoogleBigQueryLinkedService, - 'LinkedService.GoogleAdWords' : exports.GoogleAdWordsLinkedService, 'LinkedService.Eloqua' : exports.EloquaLinkedService, 'LinkedService.Drill' : exports.DrillLinkedService, 'LinkedService.Couchbase' : exports.CouchbaseLinkedService, @@ -450,7 +437,6 @@ exports.discriminators = { 'LinkedService.SapBW' : exports.SapBWLinkedService, 'LinkedService.Sftp' : exports.SftpServerLinkedService, 'LinkedService.FtpServer' : exports.FtpServerLinkedService, - 'LinkedService.RestService' : exports.RestServiceLinkedService, 'LinkedService.HttpServer' : exports.HttpLinkedService, 'LinkedService.AzureSearch' : exports.AzureSearchLinkedService, 'LinkedService.CustomDataSource' : exports.CustomDataSourceLinkedService, @@ -477,11 +463,9 @@ exports.discriminators = { 'LinkedService.PostgreSql' : exports.PostgreSqlLinkedService, 'LinkedService.MySql' : exports.MySqlLinkedService, 'LinkedService.AzureMySql' : exports.AzureMySqlLinkedService, - 'LinkedService.OracleServiceCloud' : exports.OracleServiceCloudLinkedService, 'LinkedService.Oracle' : exports.OracleLinkedService, 'LinkedService.FileServer' : exports.FileServerLinkedService, 'LinkedService.HDInsight' : exports.HDInsightLinkedService, - 'LinkedService.DynamicsAX' : exports.DynamicsAXLinkedService, 'LinkedService.Dynamics' : exports.DynamicsLinkedService, 'LinkedService.CosmosDb' : exports.CosmosDbLinkedService, 'LinkedService.AzureKeyVault' : exports.AzureKeyVaultLinkedService, @@ -516,14 +500,12 @@ exports.discriminators = { 'Dataset.HBaseObject' : exports.HBaseObjectDataset, 'Dataset.GreenplumTable' : exports.GreenplumTableDataset, 'Dataset.GoogleBigQueryObject' : exports.GoogleBigQueryObjectDataset, - 'Dataset.GoogleAdWordsObject' : exports.GoogleAdWordsObjectDataset, 'Dataset.EloquaObject' : exports.EloquaObjectDataset, 'Dataset.DrillTable' : exports.DrillTableDataset, 'Dataset.CouchbaseTable' : exports.CouchbaseTableDataset, 'Dataset.ConcurObject' : exports.ConcurObjectDataset, 'Dataset.AzurePostgreSqlTable' : exports.AzurePostgreSqlTableDataset, 'Dataset.AmazonMWSObject' : exports.AmazonMWSObjectDataset, - 'Dataset.RestResource' : exports.RestServiceDataset, 'DatasetCompression.ZipDeflate' : exports.DatasetZipDeflateCompression, 'DatasetCompression.Deflate' : exports.DatasetDeflateCompression, 'DatasetCompression.GZip' : exports.DatasetGZipCompression, @@ -544,13 +526,11 @@ exports.discriminators = { 'Dataset.SalesforceObject' : exports.SalesforceObjectDataset, 'Dataset.RelationalTable' : exports.RelationalTableDataset, 'Dataset.AzureMySqlTable' : exports.AzureMySqlTableDataset, - 'Dataset.OracleServiceCloudObject' : exports.OracleServiceCloudObjectDataset, 'Dataset.OracleTable' : exports.OracleTableDataset, 'Dataset.ODataResource' : exports.ODataResourceDataset, 'Dataset.MongoDbCollection' : exports.MongoDbCollectionDataset, 'Dataset.FileShare' : exports.FileShareDataset, 'Dataset.AzureDataLakeStoreFile' : exports.AzureDataLakeStoreDataset, - 'Dataset.DynamicsAXResource' : exports.DynamicsAXResourceDataset, 'Dataset.DynamicsEntity' : exports.DynamicsEntityDataset, 'Dataset.DocumentDbCollection' : exports.DocumentDbCollectionDataset, 'Dataset.CustomDataset' : exports.CustomDataset, @@ -593,20 +573,17 @@ exports.discriminators = { 'CopySource.HBaseSource' : exports.HBaseSource, 'CopySource.GreenplumSource' : exports.GreenplumSource, 'CopySource.GoogleBigQuerySource' : exports.GoogleBigQuerySource, - 'CopySource.GoogleAdWordsSource' : exports.GoogleAdWordsSource, 'CopySource.EloquaSource' : exports.EloquaSource, 'CopySource.DrillSource' : exports.DrillSource, 'CopySource.CouchbaseSource' : exports.CouchbaseSource, 'CopySource.ConcurSource' : exports.ConcurSource, 'CopySource.AzurePostgreSqlSource' : exports.AzurePostgreSqlSource, 'CopySource.AmazonMWSSource' : exports.AmazonMWSSource, - 'CopySource.RestServiceSource' : exports.RestServiceSource, 'CopySource.HttpSource' : exports.HttpSource, 'CopySource.AzureDataLakeStoreSource' : exports.AzureDataLakeStoreSource, 'CopySource.MongoDbSource' : exports.MongoDbSource, 'CopySource.CassandraSource' : exports.CassandraSource, 'CopySource.WebSource' : exports.WebSource, - 'CopySource.OracleServiceCloudSource' : exports.OracleServiceCloudSource, 'CopySource.OracleSource' : exports.OracleSource, 'CopySource.AzureMySqlSource' : exports.AzureMySqlSource, 'CopySource.HdfsSource' : exports.HdfsSource, @@ -617,7 +594,6 @@ exports.discriminators = { 'CopySource.SapCloudForCustomerSource' : exports.SapCloudForCustomerSource, 'CopySource.SalesforceSource' : exports.SalesforceSource, 'CopySource.RelationalSource' : exports.RelationalSource, - 'CopySource.DynamicsAXSource' : exports.DynamicsAXSource, 'CopySource.DynamicsSource' : exports.DynamicsSource, 'CopySource.DocumentDbCollectionSource' : exports.DocumentDbCollectionSource, 'CopySource.BlobSource' : exports.BlobSource, diff --git a/lib/services/datafactoryManagement/lib/models/oDataLinkedService.js b/lib/services/datafactoryManagement/lib/models/oDataLinkedService.js index 13a33fab06..325ad7a867 100644 --- a/lib/services/datafactoryManagement/lib/models/oDataLinkedService.js +++ b/lib/services/datafactoryManagement/lib/models/oDataLinkedService.js @@ -22,40 +22,13 @@ class ODataLinkedService extends models['LinkedService'] { * Create a ODataLinkedService. * @member {object} url The URL of the OData service endpoint. Type: string * (or Expression with resultType string). - * @member {string} authenticationType Type of authentication used to connect - * to the OData service. Possible values include: 'Anonymous', 'Basic', - * 'Windows', 'AadServicePrincipal', 'ManagedServiceIdentity' + * @member {string} [authenticationType] Type of authentication used to + * connect to the OData service. Possible values include: 'Basic', + * 'Anonymous' * @member {object} [userName] User name of the OData service. Type: string * (or Expression with resultType string). * @member {object} [password] Password of the OData service. * @member {string} [password.type] Polymorphic Discriminator - * @member {object} [tenant] Specify the tenant information (domain name or - * tenant ID) under which your application resides. Type: string (or - * Expression with resultType string). - * @member {object} [servicePrincipalId] Specify the application id of your - * application registered in Azure Active Directory. Type: string (or - * Expression with resultType string). - * @member {object} [aadResourceId] Specify the resource you are requesting - * authorization to use Directory. Type: string (or Expression with - * resultType string). - * @member {string} [aadServicePrincipalCredentialType] Specify the - * credential type (key or cert) is used for service principal. Possible - * values include: 'ServicePrincipalKey', 'ServicePrincipalCert' - * @member {object} [servicePrincipalKey] Specify the secret of your - * application registered in Azure Active Directory. Type: string (or - * Expression with resultType string). - * @member {string} [servicePrincipalKey.type] Polymorphic Discriminator - * @member {object} [servicePrincipalEmbeddedCert] Specify the base64 encoded - * certificate of your application registered in Azure Active Directory. - * Type: string (or Expression with resultType string). - * @member {string} [servicePrincipalEmbeddedCert.type] Polymorphic - * Discriminator - * @member {object} [servicePrincipalEmbeddedCertPassword] Specify the - * password of your certificate if your certificate has a password and you - * are using AadServicePrincipal authentication. Type: string (or Expression - * with resultType string). - * @member {string} [servicePrincipalEmbeddedCertPassword.type] Polymorphic - * Discriminator * @member {object} [encryptedCredential] The encrypted credential used for * authentication. Credentials are encrypted using the integration runtime * credential manager. Type: string (or Expression with resultType string). @@ -143,7 +116,7 @@ class ODataLinkedService extends models['LinkedService'] { } }, authenticationType: { - required: true, + required: false, serializedName: 'typeProperties.authenticationType', type: { name: 'String' @@ -169,73 +142,6 @@ class ODataLinkedService extends models['LinkedService'] { className: 'SecretBase' } }, - tenant: { - required: false, - serializedName: 'typeProperties.tenant', - type: { - name: 'Object' - } - }, - servicePrincipalId: { - required: false, - serializedName: 'typeProperties.servicePrincipalId', - type: { - name: 'Object' - } - }, - aadResourceId: { - required: false, - serializedName: 'typeProperties.aadResourceId', - type: { - name: 'Object' - } - }, - aadServicePrincipalCredentialType: { - required: false, - serializedName: 'typeProperties.aadServicePrincipalCredentialType', - type: { - name: 'String' - } - }, - servicePrincipalKey: { - required: false, - serializedName: 'typeProperties.servicePrincipalKey', - type: { - name: 'Composite', - polymorphicDiscriminator: { - serializedName: 'type', - clientName: 'type' - }, - uberParent: 'SecretBase', - className: 'SecretBase' - } - }, - servicePrincipalEmbeddedCert: { - required: false, - serializedName: 'typeProperties.servicePrincipalEmbeddedCert', - type: { - name: 'Composite', - polymorphicDiscriminator: { - serializedName: 'type', - clientName: 'type' - }, - uberParent: 'SecretBase', - className: 'SecretBase' - } - }, - servicePrincipalEmbeddedCertPassword: { - required: false, - serializedName: 'typeProperties.servicePrincipalEmbeddedCertPassword', - type: { - name: 'Composite', - polymorphicDiscriminator: { - serializedName: 'type', - clientName: 'type' - }, - uberParent: 'SecretBase', - className: 'SecretBase' - } - }, encryptedCredential: { required: false, serializedName: 'typeProperties.encryptedCredential', diff --git a/lib/services/datafactoryManagement/lib/models/storedProcedureParameter.js b/lib/services/datafactoryManagement/lib/models/storedProcedureParameter.js index 8ed255fe26..513e31d092 100644 --- a/lib/services/datafactoryManagement/lib/models/storedProcedureParameter.js +++ b/lib/services/datafactoryManagement/lib/models/storedProcedureParameter.js @@ -17,8 +17,8 @@ class StoredProcedureParameter { /** * Create a StoredProcedureParameter. - * @member {object} [value] Stored procedure parameter value. Type: string - * (or Expression with resultType string). + * @member {object} value Stored procedure parameter value. Type: string (or + * Expression with resultType string). * @member {string} [type] Stored procedure parameter type. Possible values * include: 'String', 'Int', 'Decimal', 'Guid', 'Boolean', 'Date' */ @@ -40,7 +40,7 @@ class StoredProcedureParameter { className: 'StoredProcedureParameter', modelProperties: { value: { - required: false, + required: true, serializedName: 'value', type: { name: 'Object'