This changeset performs the following: - Updates `masterzen/winrm` vendor to include change from (https://github.com/masterzen/winrm/pull/73). - Removes `masterzen/xmlpath` dependency, as it is licensed under the LGPL license. - Updates `dylanmei/winrmtest` vendor to include change from (https://github.com/dylanmei/winrmtest/pull/4). - Updates `packer-community/winrmcp` vendor to include the removal of the `masterzen/winrm/winrm` sub-class as a result of the `winrm` CLI tool being removed from the `masterzen/winrm` repository. - Updates nested dependencies as a result of the above vendor changes. - Refactors `parallels/driver_9` to use `goxpath` instead of `xmlpath`, as `xmlpath` is licensed under LGPL. - Adds a basic unit test for the refactor work in `parallels/driver_9` to confirm functionality. This should completely remove any LGPL licensed dependencies inside of the Packer project. ``` $ make test /home/jake/src/go/src/github.com/hashicorp/packer/scripts/gofmtcheck.sh $(find . -not -path "./vendor/*" -name "*.go") ==> Checking that code complies with gofmt requirements... Check passed. ok github.com/hashicorp/packer 0.044s ok github.com/hashicorp/packer/builder/alicloud/ecs 0.055s ok github.com/hashicorp/packer/builder/amazon/chroot 0.040s ok github.com/hashicorp/packer/builder/amazon/common 0.021s ok github.com/hashicorp/packer/builder/amazon/ebs 0.016s ok github.com/hashicorp/packer/builder/amazon/ebssurrogate 0.015s ok github.com/hashicorp/packer/builder/amazon/ebsvolume 0.014s ok github.com/hashicorp/packer/builder/amazon/instance 0.058s ok github.com/hashicorp/packer/builder/azure/arm 2.833s ok github.com/hashicorp/packer/builder/azure/common 0.018s ? github.com/hashicorp/packer/builder/azure/common/constants [no test files] ? github.com/hashicorp/packer/builder/azure/common/lin [no test files] ? github.com/hashicorp/packer/builder/azure/common/logutil [no test files] ok github.com/hashicorp/packer/builder/azure/common/template 0.038s ok github.com/hashicorp/packer/builder/azure/pkcs12 0.120s ok github.com/hashicorp/packer/builder/azure/pkcs12/rc2 0.020s ok github.com/hashicorp/packer/builder/cloudstack 0.038s ok github.com/hashicorp/packer/builder/digitalocean 0.015s ok github.com/hashicorp/packer/builder/docker 0.028s ok github.com/hashicorp/packer/builder/file 0.029s ok github.com/hashicorp/packer/builder/googlecompute 3.162s ok github.com/hashicorp/packer/builder/hyperv/common 0.006s ok github.com/hashicorp/packer/builder/hyperv/iso 0.042s ok github.com/hashicorp/packer/builder/null 0.018s ok github.com/hashicorp/packer/builder/oneandone 0.022s ok github.com/hashicorp/packer/builder/openstack 0.052s ok github.com/hashicorp/packer/builder/parallels/common 2.549s ok github.com/hashicorp/packer/builder/parallels/iso 0.050s ok github.com/hashicorp/packer/builder/parallels/pvm 0.033s ok github.com/hashicorp/packer/builder/profitbricks 0.023s ok github.com/hashicorp/packer/builder/qemu 0.039s ok github.com/hashicorp/packer/builder/triton 0.018s ok github.com/hashicorp/packer/builder/virtualbox/common 5.533s ok github.com/hashicorp/packer/builder/virtualbox/iso 0.044s ok github.com/hashicorp/packer/builder/virtualbox/ovf 0.012s ok github.com/hashicorp/packer/builder/vmware/common 5.325s ok github.com/hashicorp/packer/builder/vmware/iso 0.076s ok github.com/hashicorp/packer/builder/vmware/vmx 0.010s ok github.com/hashicorp/packer/command 0.062s ok github.com/hashicorp/packer/common 0.053s ok github.com/hashicorp/packer/common/json 0.003s [no tests to run] ok github.com/hashicorp/packer/common/powershell 0.015s ? github.com/hashicorp/packer/common/powershell/hyperv [no test files] ? github.com/hashicorp/packer/common/ssh [no test files] ok github.com/hashicorp/packer/common/uuid 0.010s ok github.com/hashicorp/packer/communicator/none 0.008s ok github.com/hashicorp/packer/communicator/ssh 0.068s ok github.com/hashicorp/packer/communicator/winrm 0.046s ok github.com/hashicorp/packer/fix 0.005s ok github.com/hashicorp/packer/helper/builder/testing 0.007s ok github.com/hashicorp/packer/helper/communicator 0.013s ok github.com/hashicorp/packer/helper/config 0.004s ? github.com/hashicorp/packer/helper/enumflag [no test files] ok github.com/hashicorp/packer/helper/flag-kv 0.009s ok github.com/hashicorp/packer/helper/flag-slice 0.006s ok github.com/hashicorp/packer/packer 0.219s ok github.com/hashicorp/packer/packer/plugin 0.233s ok github.com/hashicorp/packer/packer/rpc 0.141s ok github.com/hashicorp/packer/plugin/example 0.008s [no tests to run] ? github.com/hashicorp/packer/post-processor/alicloud-import [no test files] ? github.com/hashicorp/packer/post-processor/amazon-import [no test files] ok github.com/hashicorp/packer/post-processor/artifice 0.003s [no tests to run] ok github.com/hashicorp/packer/post-processor/atlas 0.018s ok github.com/hashicorp/packer/post-processor/checksum 0.015s ok github.com/hashicorp/packer/post-processor/compress 0.047s ok github.com/hashicorp/packer/post-processor/docker-import 0.012s ok github.com/hashicorp/packer/post-processor/docker-push 0.012s ok github.com/hashicorp/packer/post-processor/docker-save 0.008s ok github.com/hashicorp/packer/post-processor/docker-tag 0.008s ok github.com/hashicorp/packer/post-processor/googlecompute-export 0.015s [no tests to run] ? github.com/hashicorp/packer/post-processor/manifest [no test files] ok github.com/hashicorp/packer/post-processor/shell-local 0.028s ok github.com/hashicorp/packer/post-processor/vagrant 0.030s ok github.com/hashicorp/packer/post-processor/vagrant-cloud 0.028s ok github.com/hashicorp/packer/post-processor/vsphere 0.014s ok github.com/hashicorp/packer/provisioner 0.011s ok github.com/hashicorp/packer/provisioner/ansible 0.140s ok github.com/hashicorp/packer/provisioner/ansible-local 0.056s ok github.com/hashicorp/packer/provisioner/chef-client 0.050s ok github.com/hashicorp/packer/provisioner/chef-solo 0.061s ok github.com/hashicorp/packer/provisioner/converge 0.018s ok github.com/hashicorp/packer/provisioner/file 0.015s ok github.com/hashicorp/packer/provisioner/powershell 0.168s ok github.com/hashicorp/packer/provisioner/puppet-masterless 0.008s ok github.com/hashicorp/packer/provisioner/puppet-server 0.031s ok github.com/hashicorp/packer/provisioner/salt-masterless 0.010s ok github.com/hashicorp/packer/provisioner/shell 0.010s ok github.com/hashicorp/packer/provisioner/shell-local 0.037s ok github.com/hashicorp/packer/provisioner/windows-restart 0.180s ok github.com/hashicorp/packer/provisioner/windows-shell 0.159s ? github.com/hashicorp/packer/scripts [no test files] ok github.com/hashicorp/packer/template 0.008s ok github.com/hashicorp/packer/template/interpolate 0.004s ? github.com/hashicorp/packer/version [no test files] ```
107 lines
2.6 KiB
Go
107 lines
2.6 KiB
Go
package xmlele
|
|
|
|
import (
|
|
"encoding/xml"
|
|
|
|
"github.com/ChrisTrenkamp/goxpath/tree"
|
|
"github.com/ChrisTrenkamp/goxpath/tree/xmltree/xmlbuilder"
|
|
"github.com/ChrisTrenkamp/goxpath/tree/xmltree/xmlnode"
|
|
)
|
|
|
|
//XMLEle is an implementation of XPRes for XML elements
|
|
type XMLEle struct {
|
|
xml.StartElement
|
|
tree.NSBuilder
|
|
Attrs []tree.Node
|
|
Children []tree.Node
|
|
Parent tree.Elem
|
|
tree.NodePos
|
|
tree.NodeType
|
|
}
|
|
|
|
//Root is the default root node builder for xmltree.ParseXML
|
|
func Root() xmlbuilder.XMLBuilder {
|
|
return &XMLEle{NodeType: tree.NtRoot}
|
|
}
|
|
|
|
//CreateNode is an implementation of xmlbuilder.XMLBuilder. It appends the node
|
|
//specified in opts and returns the child if it is an element. Otherwise, it returns x.
|
|
func (x *XMLEle) CreateNode(opts *xmlbuilder.BuilderOpts) xmlbuilder.XMLBuilder {
|
|
if opts.NodeType == tree.NtElem {
|
|
ele := &XMLEle{
|
|
StartElement: opts.Tok.(xml.StartElement),
|
|
NSBuilder: tree.NSBuilder{NS: opts.NS},
|
|
Attrs: make([]tree.Node, len(opts.Attrs)),
|
|
Parent: x,
|
|
NodePos: tree.NodePos(opts.NodePos),
|
|
NodeType: opts.NodeType,
|
|
}
|
|
for i := range opts.Attrs {
|
|
ele.Attrs[i] = xmlnode.XMLNode{
|
|
Token: opts.Attrs[i],
|
|
NodePos: tree.NodePos(opts.AttrStartPos + i),
|
|
NodeType: tree.NtAttr,
|
|
Parent: ele,
|
|
}
|
|
}
|
|
x.Children = append(x.Children, ele)
|
|
return ele
|
|
}
|
|
|
|
node := xmlnode.XMLNode{
|
|
Token: opts.Tok,
|
|
NodePos: tree.NodePos(opts.NodePos),
|
|
NodeType: opts.NodeType,
|
|
Parent: x,
|
|
}
|
|
x.Children = append(x.Children, node)
|
|
return x
|
|
}
|
|
|
|
//EndElem is an implementation of xmlbuilder.XMLBuilder. It returns x's parent.
|
|
func (x *XMLEle) EndElem() xmlbuilder.XMLBuilder {
|
|
return x.Parent.(*XMLEle)
|
|
}
|
|
|
|
//GetToken returns the xml.Token representation of the node
|
|
func (x *XMLEle) GetToken() xml.Token {
|
|
return x.StartElement
|
|
}
|
|
|
|
//GetParent returns the parent node, or itself if it's the root
|
|
func (x *XMLEle) GetParent() tree.Elem {
|
|
return x.Parent
|
|
}
|
|
|
|
//GetChildren returns all child nodes of the element
|
|
func (x *XMLEle) GetChildren() []tree.Node {
|
|
ret := make([]tree.Node, len(x.Children))
|
|
|
|
for i := range x.Children {
|
|
ret[i] = x.Children[i]
|
|
}
|
|
|
|
return ret
|
|
}
|
|
|
|
//GetAttrs returns all attributes of the element
|
|
func (x *XMLEle) GetAttrs() []tree.Node {
|
|
ret := make([]tree.Node, len(x.Attrs))
|
|
for i := range x.Attrs {
|
|
ret[i] = x.Attrs[i]
|
|
}
|
|
return ret
|
|
}
|
|
|
|
//ResValue returns the string value of the element and children
|
|
func (x *XMLEle) ResValue() string {
|
|
ret := ""
|
|
for i := range x.Children {
|
|
switch x.Children[i].GetNodeType() {
|
|
case tree.NtChd, tree.NtElem, tree.NtRoot:
|
|
ret += x.Children[i].ResValue()
|
|
}
|
|
}
|
|
return ret
|
|
}
|