Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\Git\azure-sdk-for-net\sdk
2019-10-11 21:16:15 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk
2019-11-12 11:18:11 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 6560b6724324bc795979e807bac151336b2b3153
Commit: 84f0b93b5875248897f38351db6171658e0ae7f0
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
Bootstrapper version: autorest@2.0.4407
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@ public CommonDataServiceForAppsLinkedService()
/// 'OnPremisesWithIfd'</param>
/// <param name="authenticationType">The authentication type to connect
/// to Common Data Service for Apps server. 'Office365' for online
/// scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or
/// Expression with resultType string). Possible values include:
/// 'Office365', 'Ifd'</param>
/// <param name="username">User name to access the Common Data Service
/// for Apps instance. Type: string (or Expression with resultType
/// string).</param>
/// scenario, 'Ifd' for on-premises with Ifd scenario.
/// 'AADServicePrincipal' for Server-To-Server authentication in online
/// scenario. Type: string (or Expression with resultType string).
/// Possible values include: 'Office365', 'Ifd',
/// 'AADServicePrincipal'</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="connectVia">The integration runtime reference.</param>
Expand All @@ -75,13 +74,31 @@ public CommonDataServiceForAppsLinkedService()
/// on-prem and required for online when there are more than one Common
/// Data Service for Apps instances associated with the user. Type:
/// string (or Expression with resultType string).</param>
/// <param name="username">User name to access the Common Data Service
/// for Apps instance. Type: string (or Expression with resultType
/// string).</param>
/// <param name="password">Password to access the Common Data Service
/// for Apps instance.</param>
/// <param name="servicePrincipalId">The client ID of the application
/// in Azure Active Directory used for Server-To-Server authentication.
/// Type: string (or Expression with resultType string).</param>
/// <param name="servicePrincipalCredentialType">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).</param>
/// <param name="servicePrincipalCredential">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.</param>
/// <param name="encryptedCredential">The encrypted credential used for
/// authentication. Credentials are encrypted using the integration
/// runtime credential manager. Type: string (or Expression with
/// resultType string).</param>
public CommonDataServiceForAppsLinkedService(string deploymentType, string authenticationType, object username, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<object>), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object))
public CommonDataServiceForAppsLinkedService(string deploymentType, string authenticationType, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<object>), object hostName = default(object), object port = default(object), object serviceUri = default(object), object organizationName = default(object), object username = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), object servicePrincipalCredentialType = default(object), SecretBase servicePrincipalCredential = default(SecretBase), object encryptedCredential = default(object))
: base(additionalProperties, connectVia, description, parameters, annotations)
{
DeploymentType = deploymentType;
Expand All @@ -92,6 +109,9 @@ public CommonDataServiceForAppsLinkedService()
AuthenticationType = authenticationType;
Username = username;
Password = password;
ServicePrincipalId = servicePrincipalId;
ServicePrincipalCredentialType = servicePrincipalCredentialType;
ServicePrincipalCredential = servicePrincipalCredential;
EncryptedCredential = encryptedCredential;
CustomInit();
}
Expand Down Expand Up @@ -150,8 +170,10 @@ public CommonDataServiceForAppsLinkedService()
/// <summary>
/// Gets or sets the authentication type to connect to Common Data
/// Service for Apps server. 'Office365' for online scenario, 'Ifd' for
/// on-premises with Ifd scenario. Type: string (or Expression with
/// resultType string). Possible values include: 'Office365', 'Ifd'
/// on-premises with Ifd scenario. 'AADServicePrincipal' for
/// Server-To-Server authentication in online scenario. Type: string
/// (or Expression with resultType string). Possible values include:
/// 'Office365', 'Ifd', 'AADServicePrincipal'
/// </summary>
[JsonProperty(PropertyName = "typeProperties.authenticationType")]
public string AuthenticationType { get; set; }
Expand All @@ -170,6 +192,35 @@ public CommonDataServiceForAppsLinkedService()
[JsonProperty(PropertyName = "typeProperties.password")]
public SecretBase Password { get; set; }

/// <summary>
/// Gets or sets the client ID of the application in Azure Active
/// Directory used for Server-To-Server authentication. Type: string
/// (or Expression with resultType string).
/// </summary>
[JsonProperty(PropertyName = "typeProperties.servicePrincipalId")]
public object ServicePrincipalId { get; set; }

/// <summary>
/// Gets or sets 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).
/// </summary>
[JsonProperty(PropertyName = "typeProperties.servicePrincipalCredentialType")]
public object ServicePrincipalCredentialType { get; set; }

/// <summary>
/// Gets or sets 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.
/// </summary>
[JsonProperty(PropertyName = "typeProperties.servicePrincipalCredential")]
public SecretBase ServicePrincipalCredential { get; set; }

/// <summary>
/// Gets or sets the encrypted credential used for authentication.
/// Credentials are encrypted using the integration runtime credential
Expand All @@ -195,10 +246,6 @@ public override void Validate()
{
throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType");
}
if (Username == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "Username");
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ComponentSetup()
/// component.</param>
/// <param name="licenseKey">The license key to activate the
/// component.</param>
public ComponentSetup(string componentName, SecretBase licenseKey)
public ComponentSetup(string componentName, SecretBase licenseKey = default(SecretBase))
{
ComponentName = componentName;
LicenseKey = licenseKey;
Expand Down Expand Up @@ -72,10 +72,6 @@ public virtual void Validate()
{
throw new ValidationException(ValidationRules.CannotBeNull, "ComponentName");
}
if (LicenseKey == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "LicenseKey");
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// <auto-generated>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.
//
// Code generated by Microsoft (R) AutoRest Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.DataFactory.Models
{
using Newtonsoft.Json;
using System.Linq;

/// <summary>
/// Default value.
/// </summary>
public partial class DWCopyCommandDefaultValue
{
/// <summary>
/// Initializes a new instance of the DWCopyCommandDefaultValue class.
/// </summary>
public DWCopyCommandDefaultValue()
{
CustomInit();
}

/// <summary>
/// Initializes a new instance of the DWCopyCommandDefaultValue class.
/// </summary>
/// <param name="columnName">Column name. Type: object (or Expression
/// with resultType string).</param>
/// <param name="defaultValue">The default value of the column. Type:
/// object (or Expression with resultType string).</param>
public DWCopyCommandDefaultValue(object columnName = default(object), object defaultValue = default(object))
{
ColumnName = columnName;
DefaultValue = defaultValue;
CustomInit();
}

/// <summary>
/// An initialization method that performs custom operations like setting defaults
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets column name. Type: object (or Expression with
/// resultType string).
/// </summary>
[JsonProperty(PropertyName = "columnName")]
public object ColumnName { get; set; }

/// <summary>
/// Gets or sets the default value of the column. Type: object (or
/// Expression with resultType string).
/// </summary>
[JsonProperty(PropertyName = "defaultValue")]
public object DefaultValue { get; set; }

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// <auto-generated>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.
//
// Code generated by Microsoft (R) AutoRest Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.DataFactory.Models
{
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

/// <summary>
/// DW Copy Command settings.
/// </summary>
public partial class DWCopyCommandSettings
{
/// <summary>
/// Initializes a new instance of the DWCopyCommandSettings class.
/// </summary>
public DWCopyCommandSettings()
{
CustomInit();
}

/// <summary>
/// Initializes a new instance of the DWCopyCommandSettings class.
/// </summary>
/// <param name="defaultValues">Specifies the default values for each
/// target column in SQL DW. The default values in the property
/// overwrite the DEFAULT constraint set in the DB, and identity column
/// cannot have a default value. Type: array of objects (or Expression
/// with resultType array of objects).</param>
/// <param name="additionalOptions">Additional options directly passed
/// to SQL DW in Copy Command. Type: key value pairs (value should be
/// string type) (or Expression with resultType object). Example:
/// "additionalOptions": { "MAXERRORS": "1000", "DATEFORMAT": "'ymd'"
/// }</param>
public DWCopyCommandSettings(IList<DWCopyCommandDefaultValue> defaultValues = default(IList<DWCopyCommandDefaultValue>), IDictionary<string, string> additionalOptions = default(IDictionary<string, string>))
{
DefaultValues = defaultValues;
AdditionalOptions = additionalOptions;
CustomInit();
}

/// <summary>
/// An initialization method that performs custom operations like setting defaults
/// </summary>
partial void CustomInit();

/// <summary>
/// Gets or sets specifies the default values for each target column in
/// SQL DW. The default values in the property overwrite the DEFAULT
/// constraint set in the DB, and identity column cannot have a default
/// value. Type: array of objects (or Expression with resultType array
/// of objects).
/// </summary>
[JsonProperty(PropertyName = "defaultValues")]
public IList<DWCopyCommandDefaultValue> DefaultValues { get; set; }

/// <summary>
/// Gets or sets additional options directly passed to SQL DW in Copy
/// Command. Type: key value pairs (value should be string type) (or
/// Expression with resultType object). Example: "additionalOptions": {
/// "MAXERRORS": "1000", "DATEFORMAT": "'ymd'" }
/// </summary>
[JsonProperty(PropertyName = "additionalOptions")]
public IDictionary<string, string> AdditionalOptions { get; set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ public static class DynamicsAuthenticationType
{
public const string Office365 = "Office365";
public const string Ifd = "Ifd";
public const string AADServicePrincipal = "AADServicePrincipal";
}
}
Loading