Skip to content
Merged
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
6 changes: 3 additions & 3 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=C:\Users\zhenqxu\Source\Repos\azure-sdk-for-net\sdk
2019-10-21 10:53:53 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 6560b6724324bc795979e807bac151336b2b3153
Commit: 3e8d1784d5a765406505f22cb51935376062da3f
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
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 @@ -18,5 +18,6 @@ public static class DynamicsAuthenticationType
{
public const string Office365 = "Office365";
public const string Ifd = "Ifd";
public const string AADServicePrincipal = "AADServicePrincipal";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@ public DynamicsCrmLinkedService()
/// include: 'Online', 'OnPremisesWithIfd'</param>
/// <param name="authenticationType">The authentication type to connect
/// to Dynamics CRM 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 Dynamics CRM
/// instance. Type: string (or Expression with resultType
/// string).</param>
/// 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 @@ -72,13 +70,31 @@ public DynamicsCrmLinkedService()
/// required for online when there are more than one Dynamics CRM
/// instances associated with the user. Type: string (or Expression
/// with resultType string).</param>
/// <param name="username">User name to access the Dynamics CRM
/// instance. Type: string (or Expression with resultType
/// string).</param>
/// <param name="password">Password to access the Dynamics CRM
/// 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 DynamicsCrmLinkedService(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 DynamicsCrmLinkedService(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 @@ -89,6 +105,9 @@ public DynamicsCrmLinkedService()
AuthenticationType = authenticationType;
Username = username;
Password = password;
ServicePrincipalId = servicePrincipalId;
ServicePrincipalCredentialType = servicePrincipalCredentialType;
ServicePrincipalCredential = servicePrincipalCredential;
EncryptedCredential = encryptedCredential;
CustomInit();
}
Expand Down Expand Up @@ -145,8 +164,10 @@ public DynamicsCrmLinkedService()
/// <summary>
/// Gets or sets the authentication type to connect to Dynamics CRM
/// server. 'Office365' for online scenario, 'Ifd' for on-premises with
/// Ifd scenario. Type: string (or Expression with resultType string).
/// Possible values include: 'Office365', 'Ifd'
/// 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 @@ -164,6 +185,35 @@ public DynamicsCrmLinkedService()
[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 @@ -189,10 +239,6 @@ public override void Validate()
{
throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType");
}
if (Username == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "Username");
}
}
}
}
Loading