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] ```
398 lines
7.7 KiB
Go
398 lines
7.7 KiB
Go
package execxp
|
|
|
|
import (
|
|
"encoding/xml"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/ChrisTrenkamp/goxpath/internal/parser"
|
|
"github.com/ChrisTrenkamp/goxpath/internal/parser/findutil"
|
|
"github.com/ChrisTrenkamp/goxpath/internal/parser/intfns"
|
|
"github.com/ChrisTrenkamp/goxpath/internal/xconst"
|
|
"github.com/ChrisTrenkamp/goxpath/internal/xsort"
|
|
|
|
"github.com/ChrisTrenkamp/goxpath/internal/lexer"
|
|
"github.com/ChrisTrenkamp/goxpath/internal/parser/pathexpr"
|
|
"github.com/ChrisTrenkamp/goxpath/tree"
|
|
)
|
|
|
|
type xpFilt struct {
|
|
t tree.Node
|
|
ctx tree.Result
|
|
expr pathexpr.PathExpr
|
|
ns map[string]string
|
|
ctxPos int
|
|
ctxSize int
|
|
proxPos map[int]int
|
|
fns map[xml.Name]tree.Wrap
|
|
variables map[string]tree.Result
|
|
}
|
|
|
|
type xpExecFn func(*xpFilt, string)
|
|
|
|
var xpFns = map[lexer.XItemType]xpExecFn{
|
|
lexer.XItemAbsLocPath: xfAbsLocPath,
|
|
lexer.XItemAbbrAbsLocPath: xfAbbrAbsLocPath,
|
|
lexer.XItemRelLocPath: xfRelLocPath,
|
|
lexer.XItemAbbrRelLocPath: xfAbbrRelLocPath,
|
|
lexer.XItemAxis: xfAxis,
|
|
lexer.XItemAbbrAxis: xfAbbrAxis,
|
|
lexer.XItemNCName: xfNCName,
|
|
lexer.XItemQName: xfQName,
|
|
lexer.XItemNodeType: xfNodeType,
|
|
lexer.XItemProcLit: xfProcInstLit,
|
|
lexer.XItemStrLit: xfStrLit,
|
|
lexer.XItemNumLit: xfNumLit,
|
|
}
|
|
|
|
func xfExec(f *xpFilt, n *parser.Node) (err error) {
|
|
for n != nil {
|
|
if fn, ok := xpFns[n.Val.Typ]; ok {
|
|
fn(f, n.Val.Val)
|
|
n = n.Left
|
|
} else if n.Val.Typ == lexer.XItemPredicate {
|
|
if err = xfPredicate(f, n.Left); err != nil {
|
|
return
|
|
}
|
|
|
|
n = n.Right
|
|
} else if n.Val.Typ == lexer.XItemFunction {
|
|
if err = xfFunction(f, n); err != nil {
|
|
return
|
|
}
|
|
|
|
n = n.Right
|
|
} else if n.Val.Typ == lexer.XItemOperator {
|
|
lf := xpFilt{
|
|
t: f.t,
|
|
ns: f.ns,
|
|
ctx: f.ctx,
|
|
ctxPos: f.ctxPos,
|
|
ctxSize: f.ctxSize,
|
|
proxPos: f.proxPos,
|
|
fns: f.fns,
|
|
variables: f.variables,
|
|
}
|
|
left, err := exec(&lf, n.Left)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
rf := xpFilt{
|
|
t: f.t,
|
|
ns: f.ns,
|
|
ctx: f.ctx,
|
|
fns: f.fns,
|
|
variables: f.variables,
|
|
}
|
|
right, err := exec(&rf, n.Right)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return xfOperator(left, right, f, n.Val.Val)
|
|
} else if n.Val.Typ == lexer.XItemVariable {
|
|
if res, ok := f.variables[n.Val.Val]; ok {
|
|
f.ctx = res
|
|
return nil
|
|
}
|
|
return fmt.Errorf("Invalid variable '%s'", n.Val.Val)
|
|
} else if string(n.Val.Typ) == "" {
|
|
n = n.Left
|
|
//} else {
|
|
// return fmt.Errorf("Cannot process " + string(n.Val.Typ))
|
|
}
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func xfPredicate(f *xpFilt, n *parser.Node) (err error) {
|
|
res := f.ctx.(tree.NodeSet)
|
|
newRes := make(tree.NodeSet, 0, len(res))
|
|
|
|
for i := range res {
|
|
pf := xpFilt{
|
|
t: f.t,
|
|
ns: f.ns,
|
|
ctxPos: i,
|
|
ctxSize: f.ctxSize,
|
|
ctx: tree.NodeSet{res[i]},
|
|
fns: f.fns,
|
|
variables: f.variables,
|
|
}
|
|
|
|
predRes, err := exec(&pf, n)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ok, err := checkPredRes(predRes, f, res[i])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if ok {
|
|
newRes = append(newRes, res[i])
|
|
}
|
|
}
|
|
|
|
f.proxPos = make(map[int]int)
|
|
for pos, j := range newRes {
|
|
f.proxPos[j.Pos()] = pos + 1
|
|
}
|
|
|
|
f.ctx = newRes
|
|
f.ctxSize = len(newRes)
|
|
|
|
return
|
|
}
|
|
|
|
func checkPredRes(ret tree.Result, f *xpFilt, node tree.Node) (bool, error) {
|
|
if num, ok := ret.(tree.Num); ok {
|
|
if float64(f.proxPos[node.Pos()]) == float64(num) {
|
|
return true, nil
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
if b, ok := ret.(tree.IsBool); ok {
|
|
return bool(b.Bool()), nil
|
|
}
|
|
|
|
return false, fmt.Errorf("Cannot convert argument to boolean")
|
|
}
|
|
|
|
func xfFunction(f *xpFilt, n *parser.Node) error {
|
|
spl := strings.Split(n.Val.Val, ":")
|
|
var name xml.Name
|
|
if len(spl) == 1 {
|
|
name.Local = spl[0]
|
|
} else {
|
|
name.Space = f.ns[spl[0]]
|
|
name.Local = spl[1]
|
|
}
|
|
fn, ok := intfns.BuiltIn[name]
|
|
if !ok {
|
|
fn, ok = f.fns[name]
|
|
}
|
|
|
|
if ok {
|
|
args := []tree.Result{}
|
|
param := n.Left
|
|
|
|
for param != nil {
|
|
pf := xpFilt{
|
|
t: f.t,
|
|
ctx: f.ctx,
|
|
ns: f.ns,
|
|
ctxPos: f.ctxPos,
|
|
ctxSize: f.ctxSize,
|
|
fns: f.fns,
|
|
variables: f.variables,
|
|
}
|
|
res, err := exec(&pf, param.Left)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
args = append(args, res)
|
|
param = param.Right
|
|
}
|
|
|
|
filt, err := fn.Call(tree.Ctx{NodeSet: f.ctx.(tree.NodeSet), Size: f.ctxSize, Pos: f.ctxPos + 1}, args...)
|
|
f.ctx = filt
|
|
return err
|
|
}
|
|
|
|
return fmt.Errorf("Unknown function: %s", n.Val.Val)
|
|
}
|
|
|
|
var eqOps = map[string]bool{
|
|
"=": true,
|
|
"!=": true,
|
|
}
|
|
|
|
var booleanOps = map[string]bool{
|
|
"=": true,
|
|
"!=": true,
|
|
"<": true,
|
|
"<=": true,
|
|
">": true,
|
|
">=": true,
|
|
}
|
|
|
|
var numOps = map[string]bool{
|
|
"*": true,
|
|
"div": true,
|
|
"mod": true,
|
|
"+": true,
|
|
"-": true,
|
|
"=": true,
|
|
"!=": true,
|
|
"<": true,
|
|
"<=": true,
|
|
">": true,
|
|
">=": true,
|
|
}
|
|
|
|
var andOrOps = map[string]bool{
|
|
"and": true,
|
|
"or": true,
|
|
}
|
|
|
|
func xfOperator(left, right tree.Result, f *xpFilt, op string) error {
|
|
if booleanOps[op] {
|
|
lNode, lOK := left.(tree.NodeSet)
|
|
rNode, rOK := right.(tree.NodeSet)
|
|
if lOK && rOK {
|
|
return bothNodeOperator(lNode, rNode, f, op)
|
|
}
|
|
|
|
if lOK {
|
|
return leftNodeOperator(lNode, right, f, op)
|
|
}
|
|
|
|
if rOK {
|
|
return rightNodeOperator(left, rNode, f, op)
|
|
}
|
|
|
|
if eqOps[op] {
|
|
return equalsOperator(left, right, f, op)
|
|
}
|
|
}
|
|
|
|
if numOps[op] {
|
|
return numberOperator(left, right, f, op)
|
|
}
|
|
|
|
if andOrOps[op] {
|
|
return andOrOperator(left, right, f, op)
|
|
}
|
|
|
|
//if op == "|" {
|
|
return unionOperator(left, right, f, op)
|
|
//}
|
|
|
|
//return fmt.Errorf("Unknown operator " + op)
|
|
}
|
|
|
|
func xfAbsLocPath(f *xpFilt, val string) {
|
|
i := f.t
|
|
for i.GetNodeType() != tree.NtRoot {
|
|
i = i.GetParent()
|
|
}
|
|
f.ctx = tree.NodeSet{i}
|
|
}
|
|
|
|
func xfAbbrAbsLocPath(f *xpFilt, val string) {
|
|
i := f.t
|
|
for i.GetNodeType() != tree.NtRoot {
|
|
i = i.GetParent()
|
|
}
|
|
f.ctx = tree.NodeSet{i}
|
|
f.expr = abbrPathExpr()
|
|
find(f)
|
|
}
|
|
|
|
func xfRelLocPath(f *xpFilt, val string) {
|
|
}
|
|
|
|
func xfAbbrRelLocPath(f *xpFilt, val string) {
|
|
f.expr = abbrPathExpr()
|
|
find(f)
|
|
}
|
|
|
|
func xfAxis(f *xpFilt, val string) {
|
|
f.expr.Axis = val
|
|
}
|
|
|
|
func xfAbbrAxis(f *xpFilt, val string) {
|
|
f.expr.Axis = xconst.AxisAttribute
|
|
}
|
|
|
|
func xfNCName(f *xpFilt, val string) {
|
|
f.expr.Name.Space = val
|
|
}
|
|
|
|
func xfQName(f *xpFilt, val string) {
|
|
f.expr.Name.Local = val
|
|
find(f)
|
|
}
|
|
|
|
func xfNodeType(f *xpFilt, val string) {
|
|
f.expr.NodeType = val
|
|
find(f)
|
|
}
|
|
|
|
func xfProcInstLit(f *xpFilt, val string) {
|
|
filt := tree.NodeSet{}
|
|
for _, i := range f.ctx.(tree.NodeSet) {
|
|
if i.GetToken().(xml.ProcInst).Target == val {
|
|
filt = append(filt, i)
|
|
}
|
|
}
|
|
f.ctx = filt
|
|
}
|
|
|
|
func xfStrLit(f *xpFilt, val string) {
|
|
f.ctx = tree.String(val)
|
|
}
|
|
|
|
func xfNumLit(f *xpFilt, val string) {
|
|
num, _ := strconv.ParseFloat(val, 64)
|
|
f.ctx = tree.Num(num)
|
|
}
|
|
|
|
func abbrPathExpr() pathexpr.PathExpr {
|
|
return pathexpr.PathExpr{
|
|
Name: xml.Name{},
|
|
Axis: xconst.AxisDescendentOrSelf,
|
|
NodeType: xconst.NodeTypeNode,
|
|
}
|
|
}
|
|
|
|
func find(f *xpFilt) {
|
|
dupFilt := make(map[int]tree.Node)
|
|
f.proxPos = make(map[int]int)
|
|
|
|
if f.expr.Axis == "" && f.expr.NodeType == "" && f.expr.Name.Space == "" {
|
|
if f.expr.Name.Local == "." {
|
|
f.expr = pathexpr.PathExpr{
|
|
Name: xml.Name{},
|
|
Axis: xconst.AxisSelf,
|
|
NodeType: xconst.NodeTypeNode,
|
|
}
|
|
}
|
|
|
|
if f.expr.Name.Local == ".." {
|
|
f.expr = pathexpr.PathExpr{
|
|
Name: xml.Name{},
|
|
Axis: xconst.AxisParent,
|
|
NodeType: xconst.NodeTypeNode,
|
|
}
|
|
}
|
|
}
|
|
|
|
f.expr.NS = f.ns
|
|
|
|
for _, i := range f.ctx.(tree.NodeSet) {
|
|
for pos, j := range findutil.Find(i, f.expr) {
|
|
dupFilt[j.Pos()] = j
|
|
f.proxPos[j.Pos()] = pos + 1
|
|
}
|
|
}
|
|
|
|
res := make(tree.NodeSet, 0, len(dupFilt))
|
|
for _, i := range dupFilt {
|
|
res = append(res, i)
|
|
}
|
|
|
|
xsort.SortNodes(res)
|
|
|
|
f.expr = pathexpr.PathExpr{}
|
|
f.ctxSize = len(res)
|
|
f.ctx = res
|
|
}
|