From 8d14cb2e930e39b2b900c95ff7280a7ce949d094 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Thu, 17 Oct 2019 03:48:50 +0000 Subject: [PATCH] Generated from 7face07707cee94abd393c81397c13c71a64c161 Fix mistakes. --- .../datafactory/mgmt/datafactory/models.go | 5 +- .../datafactory/mgmt/datafactory/models.go | 5 +- .../mgmt/2018-06-01/datafactory/models.go | 106 +++++++++++++++++- 3 files changed, 108 insertions(+), 8 deletions(-) diff --git a/profiles/latest/datafactory/mgmt/datafactory/models.go b/profiles/latest/datafactory/mgmt/datafactory/models.go index 4f4a626ad275..7d563468dc89 100644 --- a/profiles/latest/datafactory/mgmt/datafactory/models.go +++ b/profiles/latest/datafactory/mgmt/datafactory/models.go @@ -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 diff --git a/profiles/preview/datafactory/mgmt/datafactory/models.go b/profiles/preview/datafactory/mgmt/datafactory/models.go index fe18b9666ea5..49ed031c0d23 100644 --- a/profiles/preview/datafactory/mgmt/datafactory/models.go +++ b/profiles/preview/datafactory/mgmt/datafactory/models.go @@ -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 diff --git a/services/datafactory/mgmt/2018-06-01/datafactory/models.go b/services/datafactory/mgmt/2018-06-01/datafactory/models.go index cf2a49dadfa8..ea7977a65b9f 100644 --- a/services/datafactory/mgmt/2018-06-01/datafactory/models.go +++ b/services/datafactory/mgmt/2018-06-01/datafactory/models.go @@ -295,6 +295,8 @@ func PossibleDependencyConditionValues() []DependencyCondition { type DynamicsAuthenticationType string const ( + // AADServicePrincipal ... + AADServicePrincipal DynamicsAuthenticationType = "AADServicePrincipal" // Ifd ... Ifd DynamicsAuthenticationType = "Ifd" // Office365 ... @@ -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. @@ -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"` } @@ -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{} @@ -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"` } @@ -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{} @@ -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"` } @@ -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{}