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] ```
159 lines
3.6 KiB
Go
159 lines
3.6 KiB
Go
package xmltree
|
|
|
|
import (
|
|
"encoding/xml"
|
|
"io"
|
|
|
|
"golang.org/x/net/html/charset"
|
|
|
|
"github.com/ChrisTrenkamp/goxpath/tree"
|
|
"github.com/ChrisTrenkamp/goxpath/tree/xmltree/xmlbuilder"
|
|
"github.com/ChrisTrenkamp/goxpath/tree/xmltree/xmlele"
|
|
)
|
|
|
|
//ParseOptions is a set of methods and function pointers that alter
|
|
//the way the XML decoder works and the Node types that are created.
|
|
//Options that are not set will default to what is set in internal/defoverride.go
|
|
type ParseOptions struct {
|
|
Strict bool
|
|
XMLRoot func() xmlbuilder.XMLBuilder
|
|
}
|
|
|
|
//DirectiveParser is an optional interface extended from XMLBuilder that handles
|
|
//XML directives.
|
|
type DirectiveParser interface {
|
|
xmlbuilder.XMLBuilder
|
|
Directive(xml.Directive, *xml.Decoder)
|
|
}
|
|
|
|
//ParseSettings is a function for setting the ParseOptions you want when
|
|
//parsing an XML tree.
|
|
type ParseSettings func(s *ParseOptions)
|
|
|
|
//MustParseXML is like ParseXML, but panics instead of returning an error.
|
|
func MustParseXML(r io.Reader, op ...ParseSettings) tree.Node {
|
|
ret, err := ParseXML(r, op...)
|
|
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
return ret
|
|
}
|
|
|
|
//ParseXML creates an XMLTree structure from an io.Reader.
|
|
func ParseXML(r io.Reader, op ...ParseSettings) (tree.Node, error) {
|
|
ov := ParseOptions{
|
|
Strict: true,
|
|
XMLRoot: xmlele.Root,
|
|
}
|
|
for _, i := range op {
|
|
i(&ov)
|
|
}
|
|
|
|
dec := xml.NewDecoder(r)
|
|
dec.CharsetReader = charset.NewReaderLabel
|
|
dec.Strict = ov.Strict
|
|
|
|
ordrPos := 1
|
|
xmlTree := ov.XMLRoot()
|
|
|
|
t, err := dec.Token()
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if head, ok := t.(xml.ProcInst); ok && head.Target == "xml" {
|
|
t, err = dec.Token()
|
|
}
|
|
|
|
opts := xmlbuilder.BuilderOpts{
|
|
Dec: dec,
|
|
}
|
|
|
|
for err == nil {
|
|
switch xt := t.(type) {
|
|
case xml.StartElement:
|
|
setEle(&opts, xmlTree, xt, &ordrPos)
|
|
xmlTree = xmlTree.CreateNode(&opts)
|
|
case xml.CharData:
|
|
setNode(&opts, xmlTree, xt, tree.NtChd, &ordrPos)
|
|
xmlTree = xmlTree.CreateNode(&opts)
|
|
case xml.Comment:
|
|
setNode(&opts, xmlTree, xt, tree.NtComm, &ordrPos)
|
|
xmlTree = xmlTree.CreateNode(&opts)
|
|
case xml.ProcInst:
|
|
setNode(&opts, xmlTree, xt, tree.NtPi, &ordrPos)
|
|
xmlTree = xmlTree.CreateNode(&opts)
|
|
case xml.EndElement:
|
|
xmlTree = xmlTree.EndElem()
|
|
case xml.Directive:
|
|
if dp, ok := xmlTree.(DirectiveParser); ok {
|
|
dp.Directive(xt.Copy(), dec)
|
|
}
|
|
}
|
|
|
|
t, err = dec.Token()
|
|
}
|
|
|
|
if err == io.EOF {
|
|
err = nil
|
|
}
|
|
|
|
return xmlTree, err
|
|
}
|
|
|
|
func setEle(opts *xmlbuilder.BuilderOpts, xmlTree xmlbuilder.XMLBuilder, ele xml.StartElement, ordrPos *int) {
|
|
opts.NodePos = *ordrPos
|
|
opts.Tok = ele
|
|
opts.Attrs = opts.Attrs[0:0:cap(opts.Attrs)]
|
|
opts.NS = make(map[xml.Name]string)
|
|
opts.NodeType = tree.NtElem
|
|
|
|
for i := range ele.Attr {
|
|
attr := ele.Attr[i].Name
|
|
val := ele.Attr[i].Value
|
|
|
|
if (attr.Local == "xmlns" && attr.Space == "") || attr.Space == "xmlns" {
|
|
opts.NS[attr] = val
|
|
} else {
|
|
opts.Attrs = append(opts.Attrs, &ele.Attr[i])
|
|
}
|
|
}
|
|
|
|
if nstree, ok := xmlTree.(tree.NSElem); ok {
|
|
ns := make(map[xml.Name]string)
|
|
|
|
for _, i := range tree.BuildNS(nstree) {
|
|
ns[i.Name] = i.Value
|
|
}
|
|
|
|
for k, v := range opts.NS {
|
|
ns[k] = v
|
|
}
|
|
|
|
if ns[xml.Name{Local: "xmlns"}] == "" {
|
|
delete(ns, xml.Name{Local: "xmlns"})
|
|
}
|
|
|
|
for k, v := range ns {
|
|
opts.NS[k] = v
|
|
}
|
|
|
|
if xmlTree.GetNodeType() == tree.NtRoot {
|
|
opts.NS[xml.Name{Space: "xmlns", Local: "xml"}] = tree.XMLSpace
|
|
}
|
|
}
|
|
|
|
opts.AttrStartPos = len(opts.NS) + len(opts.Attrs) + *ordrPos
|
|
*ordrPos = opts.AttrStartPos + 1
|
|
}
|
|
|
|
func setNode(opts *xmlbuilder.BuilderOpts, xmlTree xmlbuilder.XMLBuilder, tok xml.Token, nt tree.NodeType, ordrPos *int) {
|
|
opts.Tok = xml.CopyToken(tok)
|
|
opts.NodeType = nt
|
|
opts.NodePos = *ordrPos
|
|
*ordrPos++
|
|
}
|