mirror of
https://github.com/opentffoundation/opentf.git
synced 2026-03-07 09:00:28 -05:00
This changeset performs the following: - Updates `masterzen/winrm` vendor to include change from (https://github.com/masterzen/winrm/pull/73) - 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. - Changes `communicator/winrm/communicator.go` to conform to the new ABI in the `masterzen/winrm` library. This should completely remove any LGPL licensed dependencies inside of the Terraform project. ``` $ make test ==> Checking that code complies with gofmt requirements... go generate $(go list ./... | grep -v /terraform/vendor/) 2017/08/20 13:40:16 Generated command/internal_plugin_list.go go test -i $(go list ./... | grep -v '/terraform/vendor/' | grep -v '/builtin/bins/') || exit 1 echo $(go list ./... | grep -v '/terraform/vendor/' | grep -v '/builtin/bins/') | \ xargs -t -n4 go test -timeout=60s -parallel=4 go test -timeout=60s -parallel=4 github.com/hashicorp/terraform github.com/hashicorp/terraform/backend github.com/hashicorp/terraform/backend/atlas github.com/hashicorp/terraform/backend/init ok github.com/hashicorp/terraform 0.011s ok github.com/hashicorp/terraform/backend 0.020s ok github.com/hashicorp/terraform/backend/atlas 0.634s ok github.com/hashicorp/terraform/backend/init 0.007s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/backend/legacy github.com/hashicorp/terraform/backend/local github.com/hashicorp/terraform/backend/remote-state github.com/hashicorp/terraf orm/backend/remote-state/azure ok github.com/hashicorp/terraform/backend/legacy 0.009s ok github.com/hashicorp/terraform/backend/local 0.211s ok github.com/hashicorp/terraform/backend/remote-state 0.006s ok github.com/hashicorp/terraform/backend/remote-state/azure 0.010s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/backend/remote-state/consul github.com/hashicorp/terraform/backend/remote-state/inmem github.com/hashicorp/terraform/backend/remote-state/s 3 github.com/hashicorp/terraform/backend/remote-state/swift ok github.com/hashicorp/terraform/backend/remote-state/consul 0.007s ok github.com/hashicorp/terraform/backend/remote-state/inmem 0.013s ok github.com/hashicorp/terraform/backend/remote-state/s3 0.007s ok github.com/hashicorp/terraform/backend/remote-state/swift 0.013s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/builtin/providers/test github.com/hashicorp/terraform/builtin/provisioners/chef github.com/hashicorp/terraform/builtin/provisioners/file gi thub.com/hashicorp/terraform/builtin/provisioners/local-exec ok github.com/hashicorp/terraform/builtin/providers/test 1.544s ok github.com/hashicorp/terraform/builtin/provisioners/chef 0.017s ok github.com/hashicorp/terraform/builtin/provisioners/file 0.006s ok github.com/hashicorp/terraform/builtin/provisioners/local-exec 0.078s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/builtin/provisioners/remote-exec github.com/hashicorp/terraform/builtin/provisioners/salt-masterless github.com/hashicorp/terraform/command github.com/hashicorp/terraform/command/clistate ok github.com/hashicorp/terraform/builtin/provisioners/remote-exec 1.037s ok github.com/hashicorp/terraform/builtin/provisioners/salt-masterless 0.008s ok github.com/hashicorp/terraform/command 14.589s ? github.com/hashicorp/terraform/command/clistate [no test files] go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/command/e2etest github.com/hashicorp/terraform/command/format github.com/hashicorp/terraform/communicator github.com/hashicorp/terraform/co mmunicator/remote ok github.com/hashicorp/terraform/command/e2etest 3.729s ok github.com/hashicorp/terraform/command/format 0.004s ok github.com/hashicorp/terraform/communicator 0.005s ok github.com/hashicorp/terraform/communicator/remote 0.003s [no tests to run] go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/communicator/shared github.com/hashicorp/terraform/communicator/ssh github.com/hashicorp/terraform/communicator/winrm github.com/hashicorp/ terraform/config ok github.com/hashicorp/terraform/communicator/shared 0.007s ok github.com/hashicorp/terraform/communicator/ssh 0.016s ok github.com/hashicorp/terraform/communicator/winrm 0.018s ok github.com/hashicorp/terraform/config 0.213s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/config/module github.com/hashicorp/terraform/dag github.com/hashicorp/terraform/digraph github.com/hashicorp/terraform/flatmap ok github.com/hashicorp/terraform/config/module 0.044s ok github.com/hashicorp/terraform/dag 0.010s ok github.com/hashicorp/terraform/digraph 0.002s ok github.com/hashicorp/terraform/flatmap 0.002s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/helper/acctest github.com/hashicorp/terraform/helper/config github.com/hashicorp/terraform/helper/copy github.com/hashicorp/terraform/helpe r/diff ? github.com/hashicorp/terraform/helper/acctest [no test files] ok github.com/hashicorp/terraform/helper/config 0.005s ? github.com/hashicorp/terraform/helper/copy [no test files] ok github.com/hashicorp/terraform/helper/diff 0.005s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/helper/encryption github.com/hashicorp/terraform/helper/experiment github.com/hashicorp/terraform/helper/hashcode github.com/hashicorp/terr aform/helper/hilmapstructure ? github.com/hashicorp/terraform/helper/encryption [no test files] ok github.com/hashicorp/terraform/helper/experiment 0.001s ok github.com/hashicorp/terraform/helper/hashcode 0.001s ? github.com/hashicorp/terraform/helper/hilmapstructure [no test files] go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/helper/logging github.com/hashicorp/terraform/helper/mutexkv github.com/hashicorp/terraform/helper/pathorcontents github.com/hashicorp/terr aform/helper/resource ? github.com/hashicorp/terraform/helper/logging [no test files] ok github.com/hashicorp/terraform/helper/mutexkv 0.055s ok github.com/hashicorp/terraform/helper/pathorcontents 0.002s ok github.com/hashicorp/terraform/helper/resource 2.659s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/helper/schema github.com/hashicorp/terraform/helper/shadow github.com/hashicorp/terraform/helper/signalwrapper github.com/hashicorp/terrafo rm/helper/slowmessage ok github.com/hashicorp/terraform/helper/schema 0.063s ok github.com/hashicorp/terraform/helper/shadow 0.156s ok github.com/hashicorp/terraform/helper/signalwrapper 0.022s ok github.com/hashicorp/terraform/helper/slowmessage 0.102s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/helper/structure github.com/hashicorp/terraform/helper/validation github.com/hashicorp/terraform/helper/variables github.com/hashicorp/terr aform/helper/wrappedreadline ok github.com/hashicorp/terraform/helper/structure 0.004s ok github.com/hashicorp/terraform/helper/validation 0.004s ok github.com/hashicorp/terraform/helper/variables 0.006s ? github.com/hashicorp/terraform/helper/wrappedreadline [no test files] go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/helper/wrappedstreams github.com/hashicorp/terraform/moduledeps github.com/hashicorp/terraform/plugin github.com/hashicorp/terraform/plugin /discovery ? github.com/hashicorp/terraform/helper/wrappedstreams [no test files] ok github.com/hashicorp/terraform/moduledeps 0.004s ok github.com/hashicorp/terraform/plugin 0.046s ok github.com/hashicorp/terraform/plugin/discovery 0.029s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/repl github.com/hashicorp/terraform/scripts github.com/hashicorp/terraform/state github.com/hashicorp/terraform/state/remote ok github.com/hashicorp/terraform/repl 0.006s ok github.com/hashicorp/terraform/scripts 0.008s ok github.com/hashicorp/terraform/state 2.617s ok github.com/hashicorp/terraform/state/remote 0.025s go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/terraform github.com/hashicorp/terraform/tools/terraform-bundle go test -timeout=60s -parallel=4 github.com/hashicorp/terraform/terraform github.com/hashicorp/terraform/tools/terraform-bundle ok github.com/hashicorp/terraform/terraform 4.222s ? github.com/hashicorp/terraform/tools/terraform-bundle [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
|
|
}
|