Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR datafactory/resource-manager] [DataFactory]Add Dynamics Server-toServer authentication type. #6070

Merged
merged 1 commit into from
Oct 17, 2019
Merged

[AutoPR datafactory/resource-manager] [DataFactory]Add Dynamics Server-toServer authentication type. #6070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions profiles/latest/datafactory/mgmt/datafactory/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ const (
type DynamicsAuthenticationType = original.DynamicsAuthenticationType

const (
Ifd DynamicsAuthenticationType = original.Ifd
Office365 DynamicsAuthenticationType = original.Office365
AADServicePrincipal DynamicsAuthenticationType = original.AADServicePrincipal
Ifd DynamicsAuthenticationType = original.Ifd
Office365 DynamicsAuthenticationType = original.Office365
)

type DynamicsDeploymentType = original.DynamicsDeploymentType
Expand Down
5 changes: 3 additions & 2 deletions profiles/preview/datafactory/mgmt/datafactory/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ const (
type DynamicsAuthenticationType = original.DynamicsAuthenticationType

const (
Ifd DynamicsAuthenticationType = original.Ifd
Office365 DynamicsAuthenticationType = original.Office365
AADServicePrincipal DynamicsAuthenticationType = original.AADServicePrincipal
Ifd DynamicsAuthenticationType = original.Ifd
Office365 DynamicsAuthenticationType = original.Office365
)

type DynamicsDeploymentType = original.DynamicsDeploymentType
Expand Down
106 changes: 102 additions & 4 deletions services/datafactory/mgmt/2018-06-01/datafactory/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ func PossibleDependencyConditionValues() []DependencyCondition {
type DynamicsAuthenticationType string

const (
// AADServicePrincipal ...
AADServicePrincipal DynamicsAuthenticationType = "AADServicePrincipal"
// Ifd ...
Ifd DynamicsAuthenticationType = "Ifd"
// Office365 ...
Expand All @@ -303,7 +305,7 @@ const (

// PossibleDynamicsAuthenticationTypeValues returns an array of possible values for the DynamicsAuthenticationType const type.
func PossibleDynamicsAuthenticationTypeValues() []DynamicsAuthenticationType {
return []DynamicsAuthenticationType{Ifd, Office365}
return []DynamicsAuthenticationType{AADServicePrincipal, Ifd, Office365}
}

// DynamicsDeploymentType enumerates the values for dynamics deployment type.
Expand Down Expand Up @@ -50074,12 +50076,18 @@ type CommonDataServiceForAppsLinkedServiceTypeProperties struct {
ServiceURI interface{} `json:"serviceUri,omitempty"`
// OrganizationName - The organization name of the Common Data Service for Apps instance. The property is required for 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).
OrganizationName interface{} `json:"organizationName,omitempty"`
// 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'
// AuthenticationType - The authentication type to connect to Common Data Service for Apps server. 'Office365' for online 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'
AuthenticationType DynamicsAuthenticationType `json:"authenticationType,omitempty"`
// Username - User name to access the Common Data Service for Apps instance. Type: string (or Expression with resultType string).
Username interface{} `json:"username,omitempty"`
// Password - Password to access the Common Data Service for Apps instance.
Password BasicSecretBase `json:"password,omitempty"`
// ServicePrincipalID - The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string).
ServicePrincipalID interface{} `json:"servicePrincipalId,omitempty"`
// 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).
ServicePrincipalCredentialType interface{} `json:"servicePrincipalCredentialType,omitempty"`
// 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.
ServicePrincipalCredential BasicSecretBase `json:"servicePrincipalCredential,omitempty"`
// EncryptedCredential - The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).
EncryptedCredential interface{} `json:"encryptedCredential,omitempty"`
}
Expand Down Expand Up @@ -50164,6 +50172,32 @@ func (cdsfalstp *CommonDataServiceForAppsLinkedServiceTypeProperties) UnmarshalJ
}
cdsfalstp.Password = password
}
case "servicePrincipalId":
if v != nil {
var servicePrincipalID interface{}
err = json.Unmarshal(*v, &servicePrincipalID)
if err != nil {
return err
}
cdsfalstp.ServicePrincipalID = servicePrincipalID
}
case "servicePrincipalCredentialType":
if v != nil {
var servicePrincipalCredentialType interface{}
err = json.Unmarshal(*v, &servicePrincipalCredentialType)
if err != nil {
return err
}
cdsfalstp.ServicePrincipalCredentialType = servicePrincipalCredentialType
}
case "servicePrincipalCredential":
if v != nil {
servicePrincipalCredential, err := unmarshalBasicSecretBase(*v)
if err != nil {
return err
}
cdsfalstp.ServicePrincipalCredential = servicePrincipalCredential
}
case "encryptedCredential":
if v != nil {
var encryptedCredential interface{}
Expand Down Expand Up @@ -78587,12 +78621,18 @@ type DynamicsCrmLinkedServiceTypeProperties struct {
ServiceURI interface{} `json:"serviceUri,omitempty"`
// OrganizationName - The organization name of the Dynamics CRM instance. The property is required for on-prem and required for online when there are more than one Dynamics CRM instances associated with the user. Type: string (or Expression with resultType string).
OrganizationName interface{} `json:"organizationName,omitempty"`
// 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'
// AuthenticationType - The authentication type to connect to Dynamics CRM server. 'Office365' for online 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'
AuthenticationType DynamicsAuthenticationType `json:"authenticationType,omitempty"`
// Username - User name to access the Dynamics CRM instance. Type: string (or Expression with resultType string).
Username interface{} `json:"username,omitempty"`
// Password - Password to access the Dynamics CRM instance.
Password BasicSecretBase `json:"password,omitempty"`
// ServicePrincipalID - The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string).
ServicePrincipalID interface{} `json:"servicePrincipalId,omitempty"`
// 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).
ServicePrincipalCredentialType interface{} `json:"servicePrincipalCredentialType,omitempty"`
// 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.
ServicePrincipalCredential BasicSecretBase `json:"servicePrincipalCredential,omitempty"`
// EncryptedCredential - The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).
EncryptedCredential interface{} `json:"encryptedCredential,omitempty"`
}
Expand Down Expand Up @@ -78677,6 +78717,32 @@ func (dclstp *DynamicsCrmLinkedServiceTypeProperties) UnmarshalJSON(body []byte)
}
dclstp.Password = password
}
case "servicePrincipalId":
if v != nil {
var servicePrincipalID interface{}
err = json.Unmarshal(*v, &servicePrincipalID)
if err != nil {
return err
}
dclstp.ServicePrincipalID = servicePrincipalID
}
case "servicePrincipalCredentialType":
if v != nil {
var servicePrincipalCredentialType interface{}
err = json.Unmarshal(*v, &servicePrincipalCredentialType)
if err != nil {
return err
}
dclstp.ServicePrincipalCredentialType = servicePrincipalCredentialType
}
case "servicePrincipalCredential":
if v != nil {
servicePrincipalCredential, err := unmarshalBasicSecretBase(*v)
if err != nil {
return err
}
dclstp.ServicePrincipalCredential = servicePrincipalCredential
}
case "encryptedCredential":
if v != nil {
var encryptedCredential interface{}
Expand Down Expand Up @@ -80843,12 +80909,18 @@ type DynamicsLinkedServiceTypeProperties struct {
ServiceURI interface{} `json:"serviceUri,omitempty"`
// OrganizationName - The organization name of the Dynamics instance. The property is required for on-prem and required for online when there are more than one Dynamics instances associated with the user. Type: string (or Expression with resultType string).
OrganizationName interface{} `json:"organizationName,omitempty"`
// AuthenticationType - The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or Expression with resultType string).
// AuthenticationType - The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string).
AuthenticationType interface{} `json:"authenticationType,omitempty"`
// Username - User name to access the Dynamics instance. Type: string (or Expression with resultType string).
Username interface{} `json:"username,omitempty"`
// Password - Password to access the Dynamics instance.
Password BasicSecretBase `json:"password,omitempty"`
// ServicePrincipalID - The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string).
ServicePrincipalID interface{} `json:"servicePrincipalId,omitempty"`
// 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).
ServicePrincipalCredentialType interface{} `json:"servicePrincipalCredentialType,omitempty"`
// 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.
ServicePrincipalCredential BasicSecretBase `json:"servicePrincipalCredential,omitempty"`
// EncryptedCredential - The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).
EncryptedCredential interface{} `json:"encryptedCredential,omitempty"`
}
Expand Down Expand Up @@ -80933,6 +81005,32 @@ func (dlstp *DynamicsLinkedServiceTypeProperties) UnmarshalJSON(body []byte) err
}
dlstp.Password = password
}
case "servicePrincipalId":
if v != nil {
var servicePrincipalID interface{}
err = json.Unmarshal(*v, &servicePrincipalID)
if err != nil {
return err
}
dlstp.ServicePrincipalID = servicePrincipalID
}
case "servicePrincipalCredentialType":
if v != nil {
var servicePrincipalCredentialType interface{}
err = json.Unmarshal(*v, &servicePrincipalCredentialType)
if err != nil {
return err
}
dlstp.ServicePrincipalCredentialType = servicePrincipalCredentialType
}
case "servicePrincipalCredential":
if v != nil {
servicePrincipalCredential, err := unmarshalBasicSecretBase(*v)
if err != nil {
return err
}
dlstp.ServicePrincipalCredential = servicePrincipalCredential
}
case "encryptedCredential":
if v != nil {
var encryptedCredential interface{}
Expand Down