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] ```
213 lines
4.0 KiB
Go
213 lines
4.0 KiB
Go
package execxp
|
|
|
|
import (
|
|
"fmt"
|
|
"math"
|
|
|
|
"github.com/ChrisTrenkamp/goxpath/tree"
|
|
)
|
|
|
|
func bothNodeOperator(left tree.NodeSet, right tree.NodeSet, f *xpFilt, op string) error {
|
|
var err error
|
|
for _, l := range left {
|
|
for _, r := range right {
|
|
lStr := l.ResValue()
|
|
rStr := r.ResValue()
|
|
|
|
if eqOps[op] {
|
|
err = equalsOperator(tree.String(lStr), tree.String(rStr), f, op)
|
|
if err == nil && f.ctx.String() == tree.True {
|
|
return nil
|
|
}
|
|
} else {
|
|
err = numberOperator(tree.String(lStr), tree.String(rStr), f, op)
|
|
if err == nil && f.ctx.String() == tree.True {
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
f.ctx = tree.Bool(false)
|
|
|
|
return nil
|
|
}
|
|
|
|
func leftNodeOperator(left tree.NodeSet, right tree.Result, f *xpFilt, op string) error {
|
|
var err error
|
|
for _, l := range left {
|
|
lStr := l.ResValue()
|
|
|
|
if eqOps[op] {
|
|
err = equalsOperator(tree.String(lStr), right, f, op)
|
|
if err == nil && f.ctx.String() == tree.True {
|
|
return nil
|
|
}
|
|
} else {
|
|
err = numberOperator(tree.String(lStr), right, f, op)
|
|
if err == nil && f.ctx.String() == tree.True {
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
f.ctx = tree.Bool(false)
|
|
|
|
return nil
|
|
}
|
|
|
|
func rightNodeOperator(left tree.Result, right tree.NodeSet, f *xpFilt, op string) error {
|
|
var err error
|
|
for _, r := range right {
|
|
rStr := r.ResValue()
|
|
|
|
if eqOps[op] {
|
|
err = equalsOperator(left, tree.String(rStr), f, op)
|
|
if err == nil && f.ctx.String() == "true" {
|
|
return nil
|
|
}
|
|
} else {
|
|
err = numberOperator(left, tree.String(rStr), f, op)
|
|
if err == nil && f.ctx.String() == "true" {
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
f.ctx = tree.Bool(false)
|
|
|
|
return nil
|
|
}
|
|
|
|
func equalsOperator(left, right tree.Result, f *xpFilt, op string) error {
|
|
_, lOK := left.(tree.Bool)
|
|
_, rOK := right.(tree.Bool)
|
|
|
|
if lOK || rOK {
|
|
lTest, lt := left.(tree.IsBool)
|
|
rTest, rt := right.(tree.IsBool)
|
|
if !lt || !rt {
|
|
return fmt.Errorf("Cannot convert argument to boolean")
|
|
}
|
|
|
|
if op == "=" {
|
|
f.ctx = tree.Bool(lTest.Bool() == rTest.Bool())
|
|
} else {
|
|
f.ctx = tree.Bool(lTest.Bool() != rTest.Bool())
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
_, lOK = left.(tree.Num)
|
|
_, rOK = right.(tree.Num)
|
|
if lOK || rOK {
|
|
return numberOperator(left, right, f, op)
|
|
}
|
|
|
|
lStr := left.String()
|
|
rStr := right.String()
|
|
|
|
if op == "=" {
|
|
f.ctx = tree.Bool(lStr == rStr)
|
|
} else {
|
|
f.ctx = tree.Bool(lStr != rStr)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func numberOperator(left, right tree.Result, f *xpFilt, op string) error {
|
|
lt, lOK := left.(tree.IsNum)
|
|
rt, rOK := right.(tree.IsNum)
|
|
if !lOK || !rOK {
|
|
return fmt.Errorf("Cannot convert data type to number")
|
|
}
|
|
|
|
ln, rn := lt.Num(), rt.Num()
|
|
|
|
switch op {
|
|
case "*":
|
|
f.ctx = ln * rn
|
|
case "div":
|
|
if rn != 0 {
|
|
f.ctx = ln / rn
|
|
} else {
|
|
if ln == 0 {
|
|
f.ctx = tree.Num(math.NaN())
|
|
} else {
|
|
if math.Signbit(float64(ln)) == math.Signbit(float64(rn)) {
|
|
f.ctx = tree.Num(math.Inf(1))
|
|
} else {
|
|
f.ctx = tree.Num(math.Inf(-1))
|
|
}
|
|
}
|
|
}
|
|
case "mod":
|
|
f.ctx = tree.Num(int(ln) % int(rn))
|
|
case "+":
|
|
f.ctx = ln + rn
|
|
case "-":
|
|
f.ctx = ln - rn
|
|
case "=":
|
|
f.ctx = tree.Bool(ln == rn)
|
|
case "!=":
|
|
f.ctx = tree.Bool(ln != rn)
|
|
case "<":
|
|
f.ctx = tree.Bool(ln < rn)
|
|
case "<=":
|
|
f.ctx = tree.Bool(ln <= rn)
|
|
case ">":
|
|
f.ctx = tree.Bool(ln > rn)
|
|
case ">=":
|
|
f.ctx = tree.Bool(ln >= rn)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func andOrOperator(left, right tree.Result, f *xpFilt, op string) error {
|
|
lt, lOK := left.(tree.IsBool)
|
|
rt, rOK := right.(tree.IsBool)
|
|
|
|
if !lOK || !rOK {
|
|
return fmt.Errorf("Cannot convert argument to boolean")
|
|
}
|
|
|
|
l, r := lt.Bool(), rt.Bool()
|
|
|
|
if op == "and" {
|
|
f.ctx = l && r
|
|
} else {
|
|
f.ctx = l || r
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func unionOperator(left, right tree.Result, f *xpFilt, op string) error {
|
|
lNode, lOK := left.(tree.NodeSet)
|
|
rNode, rOK := right.(tree.NodeSet)
|
|
|
|
if !lOK || !rOK {
|
|
return fmt.Errorf("Cannot convert data type to node-set")
|
|
}
|
|
|
|
uniq := make(map[int]tree.Node)
|
|
for _, i := range lNode {
|
|
uniq[i.Pos()] = i
|
|
}
|
|
for _, i := range rNode {
|
|
uniq[i.Pos()] = i
|
|
}
|
|
|
|
res := make(tree.NodeSet, 0, len(uniq))
|
|
for _, v := range uniq {
|
|
res = append(res, v)
|
|
}
|
|
|
|
f.ctx = res
|
|
|
|
return nil
|
|
}
|