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.

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] ADLS Gen 2 support for HDI BYOC and vNet support for HDI on demand #4947

Merged
Merged
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
33 changes: 33 additions & 0 deletions services/datafactory/mgmt/2018-06-01/datafactory/models.go
Original file line number Diff line number Diff line change
Expand Up @@ -65466,6 +65466,8 @@ type HDInsightLinkedServiceTypeProperties struct {
EncryptedCredential interface{} `json:"encryptedCredential,omitempty"`
// IsEspEnabled - Specify if the HDInsight is created with ESP (Enterprise Security Package). Type: Boolean.
IsEspEnabled interface{} `json:"isEspEnabled,omitempty"`
// FileSystem - Specify the FileSystem if the main storage for the HDInsight is ADLS Gen2. Type: string (or Expression with resultType string).
FileSystem interface{} `json:"fileSystem,omitempty"`
}

// UnmarshalJSON is the custom unmarshaler for HDInsightLinkedServiceTypeProperties struct.
Expand Down Expand Up @@ -65539,6 +65541,15 @@ func (hilstp *HDInsightLinkedServiceTypeProperties) UnmarshalJSON(body []byte) e
}
hilstp.IsEspEnabled = isEspEnabled
}
case "fileSystem":
if v != nil {
var fileSystem interface{}
err = json.Unmarshal(*v, &fileSystem)
if err != nil {
return err
}
hilstp.FileSystem = fileSystem
}
}
}

Expand Down Expand Up @@ -66546,6 +66557,10 @@ type HDInsightOnDemandLinkedServiceTypeProperties struct {
ZookeeperNodeSize interface{} `json:"zookeeperNodeSize,omitempty"`
// ScriptActions - Custom script actions to run on HDI ondemand cluster once it's up. Please refer to https://docs.microsoft.com/en-us/azure/hdinsight/hdinsight-hadoop-customize-cluster-linux?toc=%2Fen-us%2Fazure%2Fhdinsight%2Fr-server%2FTOC.json&bc=%2Fen-us%2Fazure%2Fbread%2Ftoc.json#understanding-script-actions.
ScriptActions *[]ScriptAction `json:"scriptActions,omitempty"`
// VirtualNetworkID - The ARM resource ID for the vNet to which the cluster should be joined after creation. Type: string (or Expression with resultType string).
VirtualNetworkID interface{} `json:"virtualNetworkId,omitempty"`
// SubnetName - The ARM resource ID for the subnet in the vNet. If virtualNetworkId was specified, then this property is required. Type: string (or Expression with resultType string).
SubnetName interface{} `json:"subnetName,omitempty"`
}

// UnmarshalJSON is the custom unmarshaler for HDInsightOnDemandLinkedServiceTypeProperties struct.
Expand Down Expand Up @@ -66833,6 +66848,24 @@ func (hiodlstp *HDInsightOnDemandLinkedServiceTypeProperties) UnmarshalJSON(body
}
hiodlstp.ScriptActions = &scriptActions
}
case "virtualNetworkId":
if v != nil {
var virtualNetworkID interface{}
err = json.Unmarshal(*v, &virtualNetworkID)
if err != nil {
return err
}
hiodlstp.VirtualNetworkID = virtualNetworkID
}
case "subnetName":
if v != nil {
var subnetName interface{}
err = json.Unmarshal(*v, &subnetName)
if err != nil {
return err
}
hiodlstp.SubnetName = subnetName
}
}
}

Expand Down