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] ```
222 lines
4.7 KiB
Go
222 lines
4.7 KiB
Go
package tree
|
|
|
|
import (
|
|
"encoding/xml"
|
|
"sort"
|
|
)
|
|
|
|
//XMLSpace is the W3C XML namespace
|
|
const XMLSpace = "http://www.w3.org/XML/1998/namespace"
|
|
|
|
//NodePos is a helper for representing the node's document order
|
|
type NodePos int
|
|
|
|
//Pos returns the node's document order position
|
|
func (n NodePos) Pos() int {
|
|
return int(n)
|
|
}
|
|
|
|
//NodeType is a safer way to determine a node's type than type assertions.
|
|
type NodeType int
|
|
|
|
//GetNodeType returns the node's type.
|
|
func (t NodeType) GetNodeType() NodeType {
|
|
return t
|
|
}
|
|
|
|
//These are all the possible node types
|
|
const (
|
|
NtAttr NodeType = iota
|
|
NtChd
|
|
NtComm
|
|
NtElem
|
|
NtNs
|
|
NtRoot
|
|
NtPi
|
|
)
|
|
|
|
//Node is a XPath result that is a node except elements
|
|
type Node interface {
|
|
//ResValue prints the node's string value
|
|
ResValue() string
|
|
//Pos returns the node's position in the document order
|
|
Pos() int
|
|
//GetToken returns the xml.Token representation of the node
|
|
GetToken() xml.Token
|
|
//GetParent returns the parent node, which will always be an XML element
|
|
GetParent() Elem
|
|
//GetNodeType returns the node's type
|
|
GetNodeType() NodeType
|
|
}
|
|
|
|
//Elem is a XPath result that is an element node
|
|
type Elem interface {
|
|
Node
|
|
//GetChildren returns the elements children.
|
|
GetChildren() []Node
|
|
//GetAttrs returns the attributes of the element
|
|
GetAttrs() []Node
|
|
}
|
|
|
|
//NSElem is a node that keeps track of namespaces.
|
|
type NSElem interface {
|
|
Elem
|
|
GetNS() map[xml.Name]string
|
|
}
|
|
|
|
//NSBuilder is a helper-struct for satisfying the NSElem interface
|
|
type NSBuilder struct {
|
|
NS map[xml.Name]string
|
|
}
|
|
|
|
//GetNS returns the namespaces found on the current element. It should not be
|
|
//confused with BuildNS, which actually resolves the namespace nodes.
|
|
func (ns NSBuilder) GetNS() map[xml.Name]string {
|
|
return ns.NS
|
|
}
|
|
|
|
type nsValueSort []NS
|
|
|
|
func (ns nsValueSort) Len() int { return len(ns) }
|
|
func (ns nsValueSort) Swap(i, j int) {
|
|
ns[i], ns[j] = ns[j], ns[i]
|
|
}
|
|
func (ns nsValueSort) Less(i, j int) bool {
|
|
return ns[i].Value < ns[j].Value
|
|
}
|
|
|
|
//BuildNS resolves all the namespace nodes of the element and returns them
|
|
func BuildNS(t Elem) (ret []NS) {
|
|
vals := make(map[xml.Name]string)
|
|
|
|
if nselem, ok := t.(NSElem); ok {
|
|
buildNS(nselem, vals)
|
|
|
|
ret = make([]NS, 0, len(vals))
|
|
i := 1
|
|
|
|
for k, v := range vals {
|
|
if !(k.Local == "xmlns" && k.Space == "" && v == "") {
|
|
ret = append(ret, NS{
|
|
Attr: xml.Attr{Name: k, Value: v},
|
|
Parent: t,
|
|
NodeType: NtNs,
|
|
})
|
|
i++
|
|
}
|
|
}
|
|
|
|
sort.Sort(nsValueSort(ret))
|
|
for i := range ret {
|
|
ret[i].NodePos = NodePos(t.Pos() + i + 1)
|
|
}
|
|
}
|
|
|
|
return ret
|
|
}
|
|
|
|
func buildNS(x NSElem, ret map[xml.Name]string) {
|
|
if x.GetNodeType() == NtRoot {
|
|
return
|
|
}
|
|
|
|
if nselem, ok := x.GetParent().(NSElem); ok {
|
|
buildNS(nselem, ret)
|
|
}
|
|
|
|
for k, v := range x.GetNS() {
|
|
ret[k] = v
|
|
}
|
|
}
|
|
|
|
//NS is a namespace node.
|
|
type NS struct {
|
|
xml.Attr
|
|
Parent Elem
|
|
NodePos
|
|
NodeType
|
|
}
|
|
|
|
//GetToken returns the xml.Token representation of the namespace.
|
|
func (ns NS) GetToken() xml.Token {
|
|
return ns.Attr
|
|
}
|
|
|
|
//GetParent returns the parent node of the namespace.
|
|
func (ns NS) GetParent() Elem {
|
|
return ns.Parent
|
|
}
|
|
|
|
//ResValue returns the string value of the namespace
|
|
func (ns NS) ResValue() string {
|
|
return ns.Attr.Value
|
|
}
|
|
|
|
//GetAttribute is a convenience function for getting the specified attribute from an element.
|
|
//false is returned if the attribute is not found.
|
|
func GetAttribute(n Elem, local, space string) (xml.Attr, bool) {
|
|
attrs := n.GetAttrs()
|
|
for _, i := range attrs {
|
|
attr := i.GetToken().(xml.Attr)
|
|
if local == attr.Name.Local && space == attr.Name.Space {
|
|
return attr, true
|
|
}
|
|
}
|
|
return xml.Attr{}, false
|
|
}
|
|
|
|
//GetAttributeVal is like GetAttribute, except it returns the attribute's value.
|
|
func GetAttributeVal(n Elem, local, space string) (string, bool) {
|
|
attr, ok := GetAttribute(n, local, space)
|
|
return attr.Value, ok
|
|
}
|
|
|
|
//GetAttrValOrEmpty is like GetAttributeVal, except it returns an empty string if
|
|
//the attribute is not found instead of false.
|
|
func GetAttrValOrEmpty(n Elem, local, space string) string {
|
|
val, ok := GetAttributeVal(n, local, space)
|
|
if !ok {
|
|
return ""
|
|
}
|
|
return val
|
|
}
|
|
|
|
//FindNodeByPos finds a node from the given position. Returns nil if the node
|
|
//is not found.
|
|
func FindNodeByPos(n Node, pos int) Node {
|
|
if n.Pos() == pos {
|
|
return n
|
|
}
|
|
|
|
if elem, ok := n.(Elem); ok {
|
|
chldrn := elem.GetChildren()
|
|
for i := 1; i < len(chldrn); i++ {
|
|
if chldrn[i-1].Pos() <= pos && chldrn[i].Pos() > pos {
|
|
return FindNodeByPos(chldrn[i-1], pos)
|
|
}
|
|
}
|
|
|
|
if len(chldrn) > 0 {
|
|
if chldrn[len(chldrn)-1].Pos() <= pos {
|
|
return FindNodeByPos(chldrn[len(chldrn)-1], pos)
|
|
}
|
|
}
|
|
|
|
attrs := elem.GetAttrs()
|
|
for _, i := range attrs {
|
|
if i.Pos() == pos {
|
|
return i
|
|
}
|
|
}
|
|
|
|
ns := BuildNS(elem)
|
|
for _, i := range ns {
|
|
if i.Pos() == pos {
|
|
return i
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|