From 4c93a56efd0ef88f71b3eccbe8d2f07a319c2df7 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 5 Dec 2018 06:42:22 +0000 Subject: [PATCH 1/2] Generated from 7b751f105846a18d948d19efc742af6f514303de Add support for HDIinsight cluster with Enterprise Serurity Package --- .../mgmt/2018-06-01/datafactory/models.go | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/services/datafactory/mgmt/2018-06-01/datafactory/models.go b/services/datafactory/mgmt/2018-06-01/datafactory/models.go index dd327ade6814..99d30f4d1765 100644 --- a/services/datafactory/mgmt/2018-06-01/datafactory/models.go +++ b/services/datafactory/mgmt/2018-06-01/datafactory/models.go @@ -49743,6 +49743,10 @@ type HDInsightHiveActivityTypeProperties struct { ScriptLinkedService *LinkedServiceReference `json:"scriptLinkedService,omitempty"` // Defines - Allows user to specify defines for Hive job request. Defines map[string]interface{} `json:"defines"` + // Variables - User specified arguments under hivevar namespace. + Variables *[]interface{} `json:"variables,omitempty"` + // QueryTimeout - Query timeout value (in minutes). Effective when the HDInsight culster is with ESP (Enterprise Security Package) + QueryTimeout *int32 `json:"queryTimeout,omitempty"` } // MarshalJSON is the custom marshaler for HDInsightHiveActivityTypeProperties. @@ -49766,6 +49770,12 @@ func (hihatp HDInsightHiveActivityTypeProperties) MarshalJSON() ([]byte, error) if hihatp.Defines != nil { objectMap["defines"] = hihatp.Defines } + if hihatp.Variables != nil { + objectMap["variables"] = hihatp.Variables + } + if hihatp.QueryTimeout != nil { + objectMap["queryTimeout"] = hihatp.QueryTimeout + } return json.Marshal(objectMap) } @@ -50280,6 +50290,8 @@ type HDInsightLinkedServiceTypeProperties struct { HcatalogLinkedServiceName *LinkedServiceReference `json:"hcatalogLinkedServiceName,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"` + // IsEspEnabled - Specify if the HDInsight is created with ESP (Enterprise Security Package). Type: Boolean. + IsEspEnabled interface{} `json:"isEspEnabled,omitempty"` } // UnmarshalJSON is the custom unmarshaler for HDInsightLinkedServiceTypeProperties struct. @@ -50344,6 +50356,15 @@ func (hilstp *HDInsightLinkedServiceTypeProperties) UnmarshalJSON(body []byte) e } hilstp.EncryptedCredential = encryptedCredential } + case "isEspEnabled": + if v != nil { + var isEspEnabled interface{} + err = json.Unmarshal(*v, &isEspEnabled) + if err != nil { + return err + } + hilstp.IsEspEnabled = isEspEnabled + } } } From 675b23c5d0de528ea81f5f327f2b728bf23d39e6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 6 Dec 2018 15:04:32 +0000 Subject: [PATCH 2/2] Generated from 7b751f105846a18d948d19efc742af6f514303de Add support for HDIinsight cluster with Enterprise Serurity Package --- .../datafactory/mgmt/datafactory/models.go | 1 + .../mgmt/2018-06-01/datafactory/models.go | 78 ++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/profiles/preview/datafactory/mgmt/datafactory/models.go b/profiles/preview/datafactory/mgmt/datafactory/models.go index 80c8757a21c8..79b9e9f55d3d 100644 --- a/profiles/preview/datafactory/mgmt/datafactory/models.go +++ b/profiles/preview/datafactory/mgmt/datafactory/models.go @@ -1181,6 +1181,7 @@ type LinkedServiceListResponsePage = original.LinkedServiceListResponsePage type LinkedServiceReference = original.LinkedServiceReference type LinkedServiceResource = original.LinkedServiceResource type LinkedServicesClient = original.LinkedServicesClient +type LogStorageSettings = original.LogStorageSettings type LookupActivity = original.LookupActivity type LookupActivityTypeProperties = original.LookupActivityTypeProperties type MagentoLinkedService = original.MagentoLinkedService diff --git a/services/datafactory/mgmt/2018-06-01/datafactory/models.go b/services/datafactory/mgmt/2018-06-01/datafactory/models.go index 99d30f4d1765..b2178d63229e 100644 --- a/services/datafactory/mgmt/2018-06-01/datafactory/models.go +++ b/services/datafactory/mgmt/2018-06-01/datafactory/models.go @@ -33814,8 +33814,14 @@ func (da *DeleteActivity) UnmarshalJSON(body []byte) error { // DeleteActivityTypeProperties delete activity properties. type DeleteActivityTypeProperties struct { - // Recursive - If true, files under the folder path will be deleted recursively. Default is true. Type: boolean (or Expression with resultType boolean). + // Recursive - If true, files or sub-folders under current folder path will be deleted recursively. Default is false. Type: boolean (or Expression with resultType boolean). Recursive interface{} `json:"recursive,omitempty"` + // MaxConcurrentConnections - The max concurrent connections to connect data source at the same time. + MaxConcurrentConnections *int32 `json:"maxConcurrentConnections,omitempty"` + // EnableLogging - Whether to record detailed logs of delete-activity execution. Default value is false. Type: boolean (or Expression with resultType boolean). + EnableLogging interface{} `json:"enableLogging,omitempty"` + // LogStorageSettings - Log storage settings customer need to provide when enableLogging is true. + LogStorageSettings *LogStorageSettings `json:"logStorageSettings,omitempty"` // Dataset - Delete activity dataset reference. Dataset *DatasetReference `json:"dataset,omitempty"` } @@ -63078,6 +63084,76 @@ func (lsr *LinkedServiceResource) UnmarshalJSON(body []byte) error { return nil } +// LogStorageSettings log storage settings. +type LogStorageSettings struct { + // AdditionalProperties - Unmatched properties from the message are deserialized this collection + AdditionalProperties map[string]interface{} `json:""` + // LinkedServiceName - Log storage linked service reference. + LinkedServiceName *LinkedServiceReference `json:"linkedServiceName,omitempty"` + // Path - The path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string). + Path interface{} `json:"path,omitempty"` +} + +// MarshalJSON is the custom marshaler for LogStorageSettings. +func (lss LogStorageSettings) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if lss.LinkedServiceName != nil { + objectMap["linkedServiceName"] = lss.LinkedServiceName + } + if lss.Path != nil { + objectMap["path"] = lss.Path + } + for k, v := range lss.AdditionalProperties { + objectMap[k] = v + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for LogStorageSettings struct. +func (lss *LogStorageSettings) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + default: + if v != nil { + var additionalProperties interface{} + err = json.Unmarshal(*v, &additionalProperties) + if err != nil { + return err + } + if lss.AdditionalProperties == nil { + lss.AdditionalProperties = make(map[string]interface{}) + } + lss.AdditionalProperties[k] = additionalProperties + } + case "linkedServiceName": + if v != nil { + var linkedServiceName LinkedServiceReference + err = json.Unmarshal(*v, &linkedServiceName) + if err != nil { + return err + } + lss.LinkedServiceName = &linkedServiceName + } + case "path": + if v != nil { + var pathVar interface{} + err = json.Unmarshal(*v, &pathVar) + if err != nil { + return err + } + lss.Path = pathVar + } + } + } + + return nil +} + // LookupActivity lookup activity. type LookupActivity struct { // LookupActivityTypeProperties - Lookup activity properties.