From dc69eced0f4cfd914aabfdf9213378564391396c Mon Sep 17 00:00:00 2001 From: James Nugent Date: Mon, 18 Apr 2016 16:31:19 -0700 Subject: [PATCH 1/2] deps: Update github.com/hashicorp/hil/... --- Godeps/Godeps.json | 6 +- vendor/github.com/hashicorp/hil/LICENSE | 353 ++++++++++++++++++ vendor/github.com/hashicorp/hil/README.md | 2 +- vendor/github.com/hashicorp/hil/ast/concat.go | 42 --- vendor/github.com/hashicorp/hil/ast/output.go | 78 ++++ .../hashicorp/hil/ast/type_string.go | 4 + .../hashicorp/hil/check_identifier.go | 2 +- .../github.com/hashicorp/hil/check_types.go | 16 +- vendor/github.com/hashicorp/hil/convert.go | 54 +++ vendor/github.com/hashicorp/hil/eval.go | 100 ++++- .../hashicorp/hil/evaltype_string.go | 34 ++ vendor/github.com/hashicorp/hil/lang.y | 12 +- .../hashicorp/hil/transform_fixed.go | 2 +- vendor/github.com/hashicorp/hil/y.go | 12 +- 14 files changed, 646 insertions(+), 71 deletions(-) create mode 100644 vendor/github.com/hashicorp/hil/LICENSE delete mode 100644 vendor/github.com/hashicorp/hil/ast/concat.go create mode 100644 vendor/github.com/hashicorp/hil/ast/output.go create mode 100644 vendor/github.com/hashicorp/hil/convert.go create mode 100644 vendor/github.com/hashicorp/hil/evaltype_string.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index bee88b9baf..526f646985 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "github.com/hashicorp/terraform", "GoVersion": "go1.6", - "GodepVersion": "v61", + "GodepVersion": "v62", "Packages": [ "./..." ], @@ -760,11 +760,11 @@ }, { "ImportPath": "github.com/hashicorp/hil", - "Rev": "59cce4313fb7be2d9064afbdb3cacd76737cfa3c" + "Rev": "0640fefa3817883b16b77bf760c4c3a6f2589545" }, { "ImportPath": "github.com/hashicorp/hil/ast", - "Rev": "59cce4313fb7be2d9064afbdb3cacd76737cfa3c" + "Rev": "0640fefa3817883b16b77bf760c4c3a6f2589545" }, { "ImportPath": "github.com/hashicorp/logutils", diff --git a/vendor/github.com/hashicorp/hil/LICENSE b/vendor/github.com/hashicorp/hil/LICENSE new file mode 100644 index 0000000000..82b4de97c7 --- /dev/null +++ b/vendor/github.com/hashicorp/hil/LICENSE @@ -0,0 +1,353 @@ +Mozilla Public License, version 2.0 + +1. Definitions + +1.1. “Contributor” + + means each individual or legal entity that creates, contributes to the + creation of, or owns Covered Software. + +1.2. “Contributor Version” + + means the combination of the Contributions of others (if any) used by a + Contributor and that particular Contributor’s Contribution. + +1.3. “Contribution” + + means Covered Software of a particular Contributor. + +1.4. “Covered Software” + + means Source Code Form to which the initial Contributor has attached the + notice in Exhibit A, the Executable Form of such Source Code Form, and + Modifications of such Source Code Form, in each case including portions + thereof. + +1.5. “Incompatible With Secondary Licenses” + means + + a. that the initial Contributor has attached the notice described in + Exhibit B to the Covered Software; or + + b. that the Covered Software was made available under the terms of version + 1.1 or earlier of the License, but not also under the terms of a + Secondary License. + +1.6. “Executable Form” + + means any form of the work other than Source Code Form. + +1.7. “Larger Work” + + means a work that combines Covered Software with other material, in a separate + file or files, that is not Covered Software. + +1.8. “License” + + means this document. + +1.9. “Licensable” + + means having the right to grant, to the maximum extent possible, whether at the + time of the initial grant or subsequently, any and all of the rights conveyed by + this License. + +1.10. “Modifications” + + means any of the following: + + a. any file in Source Code Form that results from an addition to, deletion + from, or modification of the contents of Covered Software; or + + b. any new file in Source Code Form that contains any Covered Software. + +1.11. “Patent Claims” of a Contributor + + means any patent claim(s), including without limitation, method, process, + and apparatus claims, in any patent Licensable by such Contributor that + would be infringed, but for the grant of the License, by the making, + using, selling, offering for sale, having made, import, or transfer of + either its Contributions or its Contributor Version. + +1.12. “Secondary License” + + means either the GNU General Public License, Version 2.0, the GNU Lesser + General Public License, Version 2.1, the GNU Affero General Public + License, Version 3.0, or any later versions of those licenses. + +1.13. “Source Code Form” + + means the form of the work preferred for making modifications. + +1.14. “You” (or “Your”) + + means an individual or a legal entity exercising rights under this + License. For legal entities, “You” includes any entity that controls, is + controlled by, or is under common control with You. For purposes of this + definition, “control” means (a) the power, direct or indirect, to cause + the direction or management of such entity, whether by contract or + otherwise, or (b) ownership of more than fifty percent (50%) of the + outstanding shares or beneficial ownership of such entity. + + +2. License Grants and Conditions + +2.1. Grants + + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: + + a. under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or as + part of a Larger Work; and + + b. under Patent Claims of such Contributor to make, use, sell, offer for + sale, have made, import, and otherwise transfer either its Contributions + or its Contributor Version. + +2.2. Effective Date + + The licenses granted in Section 2.1 with respect to any Contribution become + effective for each Contribution on the date the Contributor first distributes + such Contribution. + +2.3. Limitations on Grant Scope + + The licenses granted in this Section 2 are the only rights granted under this + License. No additional rights or licenses will be implied from the distribution + or licensing of Covered Software under this License. Notwithstanding Section + 2.1(b) above, no patent license is granted by a Contributor: + + a. for any code that a Contributor has removed from Covered Software; or + + b. for infringements caused by: (i) Your and any other third party’s + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + + c. under Patent Claims infringed by Covered Software in the absence of its + Contributions. + + This License does not grant any rights in the trademarks, service marks, or + logos of any Contributor (except as may be necessary to comply with the + notice requirements in Section 3.4). + +2.4. Subsequent Licenses + + No Contributor makes additional grants as a result of Your choice to + distribute the Covered Software under a subsequent version of this License + (see Section 10.2) or under the terms of a Secondary License (if permitted + under the terms of Section 3.3). + +2.5. Representation + + Each Contributor represents that the Contributor believes its Contributions + are its original creation(s) or it has sufficient rights to grant the + rights to its Contributions conveyed by this License. + +2.6. Fair Use + + This License is not intended to limit any rights You have under applicable + copyright doctrines of fair use, fair dealing, or other equivalents. + +2.7. Conditions + + Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in + Section 2.1. + + +3. Responsibilities + +3.1. Distribution of Source Form + + All distribution of Covered Software in Source Code Form, including any + Modifications that You create or to which You contribute, must be under the + terms of this License. You must inform recipients that the Source Code Form + of the Covered Software is governed by the terms of this License, and how + they can obtain a copy of this License. You may not attempt to alter or + restrict the recipients’ rights in the Source Code Form. + +3.2. Distribution of Executable Form + + If You distribute Covered Software in Executable Form then: + + a. such Covered Software must also be made available in Source Code Form, + as described in Section 3.1, and You must inform recipients of the + Executable Form how they can obtain a copy of such Source Code Form by + reasonable means in a timely manner, at a charge no more than the cost + of distribution to the recipient; and + + b. You may distribute such Executable Form under the terms of this License, + or sublicense it under different terms, provided that the license for + the Executable Form does not attempt to limit or alter the recipients’ + rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + + You may create and distribute a Larger Work under terms of Your choice, + provided that You also comply with the requirements of this License for the + Covered Software. If the Larger Work is a combination of Covered Software + with a work governed by one or more Secondary Licenses, and the Covered + Software is not Incompatible With Secondary Licenses, this License permits + You to additionally distribute such Covered Software under the terms of + such Secondary License(s), so that the recipient of the Larger Work may, at + their option, further distribute the Covered Software under the terms of + either this License or such Secondary License(s). + +3.4. Notices + + You may not remove or alter the substance of any license notices (including + copyright notices, patent notices, disclaimers of warranty, or limitations + of liability) contained within the Source Code Form of the Covered + Software, except that You may alter any license notices to the extent + required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + + You may choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of Covered + Software. However, You may do so only on Your own behalf, and not on behalf + of any Contributor. You must make it absolutely clear that any such + warranty, support, indemnity, or liability obligation is offered by You + alone, and You hereby agree to indemnify every Contributor for any + liability incurred by such Contributor as a result of warranty, support, + indemnity or liability terms You offer. You may include additional + disclaimers of warranty and limitations of liability specific to any + jurisdiction. + +4. Inability to Comply Due to Statute or Regulation + + If it is impossible for You to comply with any of the terms of this License + with respect to some or all of the Covered Software due to statute, judicial + order, or regulation then You must: (a) comply with the terms of this License + to the maximum extent possible; and (b) describe the limitations and the code + they affect. Such description must be placed in a text file included with all + distributions of the Covered Software under this License. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Termination + +5.1. The rights granted under this License will terminate automatically if You + fail to comply with any of its terms. However, if You become compliant, + then the rights granted under this License from a particular Contributor + are reinstated (a) provisionally, unless and until such Contributor + explicitly and finally terminates Your grants, and (b) on an ongoing basis, + if such Contributor fails to notify You of the non-compliance by some + reasonable means prior to 60 days after You have come back into compliance. + Moreover, Your grants from a particular Contributor are reinstated on an + ongoing basis if such Contributor notifies You of the non-compliance by + some reasonable means, this is the first time You have received notice of + non-compliance with this License from such Contributor, and You become + compliant prior to 30 days after Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent + infringement claim (excluding declaratory judgment actions, counter-claims, + and cross-claims) alleging that a Contributor Version directly or + indirectly infringes any patent, then the rights granted to You by any and + all Contributors for the Covered Software under Section 2.1 of this License + shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user + license agreements (excluding distributors and resellers) which have been + validly granted by You or Your distributors under this License prior to + termination shall survive termination. + +6. Disclaimer of Warranty + + Covered Software is provided under this License on an “as is” basis, without + warranty of any kind, either expressed, implied, or statutory, including, + without limitation, warranties that the Covered Software is free of defects, + merchantable, fit for a particular purpose or non-infringing. The entire + risk as to the quality and performance of the Covered Software is with You. + Should any Covered Software prove defective in any respect, You (not any + Contributor) assume the cost of any necessary servicing, repair, or + correction. This disclaimer of warranty constitutes an essential part of this + License. No use of any Covered Software is authorized under this License + except under this disclaimer. + +7. Limitation of Liability + + Under no circumstances and under no legal theory, whether tort (including + negligence), contract, or otherwise, shall any Contributor, or anyone who + distributes Covered Software as permitted above, be liable to You for any + direct, indirect, special, incidental, or consequential damages of any + character including, without limitation, damages for lost profits, loss of + goodwill, work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses, even if such party shall have been + informed of the possibility of such damages. This limitation of liability + shall not apply to liability for death or personal injury resulting from such + party’s negligence to the extent applicable law prohibits such limitation. + Some jurisdictions do not allow the exclusion or limitation of incidental or + consequential damages, so this exclusion and limitation may not apply to You. + +8. Litigation + + Any litigation relating to this License may be brought only in the courts of + a jurisdiction where the defendant maintains its principal place of business + and such litigation shall be governed by laws of that jurisdiction, without + reference to its conflict-of-law provisions. Nothing in this Section shall + prevent a party’s ability to bring cross-claims or counter-claims. + +9. Miscellaneous + + This License represents the complete agreement concerning the subject matter + hereof. If any provision of this License is held to be unenforceable, such + provision shall be reformed only to the extent necessary to make it + enforceable. Any law or regulation which provides that the language of a + contract shall be construed against the drafter shall not be used to construe + this License against a Contributor. + + +10. Versions of the License + +10.1. New Versions + + Mozilla Foundation is the license steward. Except as provided in Section + 10.3, no one other than the license steward has the right to modify or + publish new versions of this License. Each version will be given a + distinguishing version number. + +10.2. Effect of New Versions + + You may distribute the Covered Software under the terms of the version of + the License under which You originally received the Covered Software, or + under the terms of any subsequent version published by the license + steward. + +10.3. Modified Versions + + If you create software not governed by this License, and you want to + create a new license for such software, you may create and use a modified + version of this License if you rename the license and remove any + references to the name of the license steward (except to note that such + modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses + If You choose to distribute Source Code Form that is Incompatible With + Secondary Licenses under the terms of this version of the License, the + notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice + + This Source Code Form is subject to the + terms of the Mozilla Public License, v. + 2.0. If a copy of the MPL was not + distributed with this file, You can + obtain one at + http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular file, then +You may include the notice in a location (such as a LICENSE file in a relevant +directory) where a recipient would be likely to look for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - “Incompatible With Secondary Licenses” Notice + + This Source Code Form is “Incompatible + With Secondary Licenses”, as defined by + the Mozilla Public License, v. 2.0. diff --git a/vendor/github.com/hashicorp/hil/README.md b/vendor/github.com/hashicorp/hil/README.md index 2b405ecfe4..186ed2518c 100644 --- a/vendor/github.com/hashicorp/hil/README.md +++ b/vendor/github.com/hashicorp/hil/README.md @@ -72,7 +72,7 @@ docs, we'll assume you're within `${}`. `add(1, var.foo)` or even nested function calls: `add(1, get("some value"))`. - * Witin strings, further interpolations can be opened with `${}`. + * Within strings, further interpolations can be opened with `${}`. Example: `"Hello ${nested}"`. A full example including the original `${}` (remember this list assumes were inside of one already) could be: `foo ${func("hello ${var.foo}")}`. diff --git a/vendor/github.com/hashicorp/hil/ast/concat.go b/vendor/github.com/hashicorp/hil/ast/concat.go deleted file mode 100644 index 0246a3bc11..0000000000 --- a/vendor/github.com/hashicorp/hil/ast/concat.go +++ /dev/null @@ -1,42 +0,0 @@ -package ast - -import ( - "bytes" - "fmt" -) - -// Concat represents a node where the result of two or more expressions are -// concatenated. The result of all expressions must be a string. -type Concat struct { - Exprs []Node - Posx Pos -} - -func (n *Concat) Accept(v Visitor) Node { - for i, expr := range n.Exprs { - n.Exprs[i] = expr.Accept(v) - } - - return v(n) -} - -func (n *Concat) Pos() Pos { - return n.Posx -} - -func (n *Concat) GoString() string { - return fmt.Sprintf("*%#v", *n) -} - -func (n *Concat) String() string { - var b bytes.Buffer - for _, expr := range n.Exprs { - b.WriteString(fmt.Sprintf("%s", expr)) - } - - return b.String() -} - -func (n *Concat) Type(Scope) (Type, error) { - return TypeString, nil -} diff --git a/vendor/github.com/hashicorp/hil/ast/output.go b/vendor/github.com/hashicorp/hil/ast/output.go new file mode 100644 index 0000000000..1e27f970b3 --- /dev/null +++ b/vendor/github.com/hashicorp/hil/ast/output.go @@ -0,0 +1,78 @@ +package ast + +import ( + "bytes" + "fmt" +) + +// Output represents the root node of all interpolation evaluations. If the +// output only has one expression which is either a TypeList or TypeMap, the +// Output can be type-asserted to []interface{} or map[string]interface{} +// respectively. Otherwise the Output evaluates as a string, and concatenates +// the evaluation of each expression. +type Output struct { + Exprs []Node + Posx Pos +} + +func (n *Output) Accept(v Visitor) Node { + for i, expr := range n.Exprs { + n.Exprs[i] = expr.Accept(v) + } + + return v(n) +} + +func (n *Output) Pos() Pos { + return n.Posx +} + +func (n *Output) GoString() string { + return fmt.Sprintf("*%#v", *n) +} + +func (n *Output) String() string { + var b bytes.Buffer + for _, expr := range n.Exprs { + b.WriteString(fmt.Sprintf("%s", expr)) + } + + return b.String() +} + +func (n *Output) Type(s Scope) (Type, error) { + // Special case no expressions for backward compatibility + if len(n.Exprs) == 0 { + return TypeString, nil + } + + // Special case a single expression of types list or map + if len(n.Exprs) == 1 { + exprType, err := n.Exprs[0].Type(s) + if err != nil { + return TypeInvalid, err + } + switch exprType { + case TypeList: + return TypeList, nil + case TypeMap: + return TypeMap, nil + } + } + + // Otherwise ensure all our expressions are strings + for index, expr := range n.Exprs { + exprType, err := expr.Type(s) + if err != nil { + return TypeInvalid, err + } + // We only look for things we know we can't coerce with an implicit conversion func + if exprType == TypeList || exprType == TypeMap { + return TypeInvalid, fmt.Errorf( + "multi-expression HIL outputs may only have string inputs: %d is type %s", + index, exprType) + } + } + + return TypeString, nil +} diff --git a/vendor/github.com/hashicorp/hil/ast/type_string.go b/vendor/github.com/hashicorp/hil/ast/type_string.go index 32bfde8403..11793ea591 100644 --- a/vendor/github.com/hashicorp/hil/ast/type_string.go +++ b/vendor/github.com/hashicorp/hil/ast/type_string.go @@ -11,6 +11,7 @@ const ( _Type_name_3 = "TypeInt" _Type_name_4 = "TypeFloat" _Type_name_5 = "TypeList" + _Type_name_6 = "TypeMap" ) var ( @@ -20,6 +21,7 @@ var ( _Type_index_3 = [...]uint8{0, 7} _Type_index_4 = [...]uint8{0, 9} _Type_index_5 = [...]uint8{0, 8} + _Type_index_6 = [...]uint8{0, 7} ) func (i Type) String() string { @@ -36,6 +38,8 @@ func (i Type) String() string { return _Type_name_4 case i == 32: return _Type_name_5 + case i == 64: + return _Type_name_6 default: return fmt.Sprintf("Type(%d)", i) } diff --git a/vendor/github.com/hashicorp/hil/check_identifier.go b/vendor/github.com/hashicorp/hil/check_identifier.go index d36ee97bf8..474f50588e 100644 --- a/vendor/github.com/hashicorp/hil/check_identifier.go +++ b/vendor/github.com/hashicorp/hil/check_identifier.go @@ -35,7 +35,7 @@ func (c *IdentifierCheck) visit(raw ast.Node) ast.Node { c.visitCall(n) case *ast.VariableAccess: c.visitVariableAccess(n) - case *ast.Concat: + case *ast.Output: // Ignore case *ast.LiteralNode: // Ignore diff --git a/vendor/github.com/hashicorp/hil/check_types.go b/vendor/github.com/hashicorp/hil/check_types.go index b5a88eefeb..554676a418 100644 --- a/vendor/github.com/hashicorp/hil/check_types.go +++ b/vendor/github.com/hashicorp/hil/check_types.go @@ -64,8 +64,8 @@ func (v *TypeCheck) visit(raw ast.Node) ast.Node { case *ast.Index: tc := &typeCheckIndex{n} result, err = tc.TypeCheck(v) - case *ast.Concat: - tc := &typeCheckConcat{n} + case *ast.Output: + tc := &typeCheckOutput{n} result, err = tc.TypeCheck(v) case *ast.LiteralNode: tc := &typeCheckLiteral{n} @@ -230,11 +230,11 @@ func (tc *typeCheckCall) TypeCheck(v *TypeCheck) (ast.Node, error) { return tc.n, nil } -type typeCheckConcat struct { - n *ast.Concat +type typeCheckOutput struct { + n *ast.Output } -func (tc *typeCheckConcat) TypeCheck(v *TypeCheck) (ast.Node, error) { +func (tc *typeCheckOutput) TypeCheck(v *TypeCheck) (ast.Node, error) { n := tc.n types := make([]ast.Type, len(n.Exprs)) for i, _ := range n.Exprs { @@ -247,6 +247,12 @@ func (tc *typeCheckConcat) TypeCheck(v *TypeCheck) (ast.Node, error) { return n, nil } + // If there is only one argument and it is a map, we evaluate to a map + if len(types) == 1 && types[0] == ast.TypeMap { + v.StackPush(ast.TypeMap) + return n, nil + } + // Otherwise, all concat args must be strings, so validate that for i, t := range types { if t != ast.TypeString { diff --git a/vendor/github.com/hashicorp/hil/convert.go b/vendor/github.com/hashicorp/hil/convert.go new file mode 100644 index 0000000000..c52e2f3054 --- /dev/null +++ b/vendor/github.com/hashicorp/hil/convert.go @@ -0,0 +1,54 @@ +package hil + +import ( + "fmt" + + "github.com/hashicorp/hil/ast" + "github.com/mitchellh/mapstructure" +) + +func InterfaceToVariable(input interface{}) (ast.Variable, error) { + var stringVal string + if err := mapstructure.WeakDecode(input, &stringVal); err == nil { + return ast.Variable{ + Type: ast.TypeString, + Value: stringVal, + }, nil + } + + var sliceVal []interface{} + if err := mapstructure.WeakDecode(input, &sliceVal); err == nil { + elements := make([]ast.Variable, len(sliceVal)) + for i, element := range sliceVal { + varElement, err := InterfaceToVariable(element) + if err != nil { + return ast.Variable{}, err + } + elements[i] = varElement + } + + return ast.Variable{ + Type: ast.TypeList, + Value: elements, + }, nil + } + + var mapVal map[string]interface{} + if err := mapstructure.WeakDecode(input, &mapVal); err == nil { + elements := make(map[string]ast.Variable) + for i, element := range mapVal { + varElement, err := InterfaceToVariable(element) + if err != nil { + return ast.Variable{}, err + } + elements[i] = varElement + } + + return ast.Variable{ + Type: ast.TypeMap, + Value: elements, + }, nil + } + + return ast.Variable{}, fmt.Errorf("value for conversion must be a string, interface{} or map[string]interface: got %T", input) +} diff --git a/vendor/github.com/hashicorp/hil/eval.go b/vendor/github.com/hashicorp/hil/eval.go index 51c8aa7123..f5537312e9 100644 --- a/vendor/github.com/hashicorp/hil/eval.go +++ b/vendor/github.com/hashicorp/hil/eval.go @@ -23,9 +23,68 @@ type EvalConfig struct { // semantic check on an AST tree. This will be called with the root node. type SemanticChecker func(ast.Node) error +// EvalType represents the type of the output returned from a HIL +// evaluation. +type EvalType uint32 + +const ( + TypeInvalid EvalType = 0 + TypeString EvalType = 1 << iota + TypeList + TypeMap +) + +//go:generate stringer -type=EvalType + +// EvaluationResult is a struct returned from the hil.Eval function, +// representing the result of an interpolation. Results are returned in their +// "natural" Go structure rather than in terms of the HIL AST. For the types +// currently implemented, this means that the Value field can be interpreted as +// the following Go types: +// TypeInvalid: undefined +// TypeString: string +// TypeList: []interface{} +// TypeMap: map[string]interface{} +type EvaluationResult struct { + Type EvalType + Value interface{} +} + +// InvalidResult is a structure representing the result of a HIL interpolation +// which has invalid syntax, missing variables, or some other type of error. +// The error is described out of band in the accompanying error return value. +var InvalidResult = EvaluationResult{Type: TypeInvalid, Value: nil} + +func Eval(root ast.Node, config *EvalConfig) (EvaluationResult, error) { + output, outputType, err := internalEval(root, config) + if err != nil { + return InvalidResult, err + } + + switch outputType { + case ast.TypeList: + return EvaluationResult{ + Type: TypeList, + Value: hilListToGoSlice(output.([]ast.Variable)), + }, nil + case ast.TypeMap: + return EvaluationResult{ + Type: TypeMap, + Value: hilMapToGoMap(output.(map[string]ast.Variable)), + }, nil + case ast.TypeString: + return EvaluationResult{ + Type: TypeString, + Value: output, + }, nil + default: + return InvalidResult, fmt.Errorf("unknown type %s as interpolation output", outputType) + } +} + // Eval evaluates the given AST tree and returns its output value, the type // of the output, and any error that occurred. -func Eval(root ast.Node, config *EvalConfig) (interface{}, ast.Type, error) { +func internalEval(root ast.Node, config *EvalConfig) (interface{}, ast.Type, error) { // Copy the scope so we can add our builtins if config == nil { config = new(EvalConfig) @@ -145,8 +204,8 @@ func evalNode(raw ast.Node) (EvalNode, error) { return &evalIndex{n}, nil case *ast.Call: return &evalCall{n}, nil - case *ast.Concat: - return &evalConcat{n}, nil + case *ast.Output: + return &evalOutput{n}, nil case *ast.LiteralNode: return &evalLiteralNode{n}, nil case *ast.VariableAccess: @@ -278,9 +337,35 @@ func (v *evalIndex) evalMapIndex(variableName string, target interface{}, key in return value.Value, value.Type, nil } -type evalConcat struct{ *ast.Concat } +// hilListToGoSlice converts an ast.Variable into a []interface{}. We assume that +// the type checking is already done since this is internal and only used in output +// evaluation. +func hilListToGoSlice(variable []ast.Variable) []interface{} { + output := make([]interface{}, len(variable)) -func (v *evalConcat) Eval(s ast.Scope, stack *ast.Stack) (interface{}, ast.Type, error) { + for index, element := range variable { + output[index] = element.Value + } + + return output +} + +// hilMapToGoMap converts an ast.Variable into a map[string]interface{}. We assume +// that the type checking is already done since this is internal and only used in +// output evaluation. +func hilMapToGoMap(variable map[string]ast.Variable) map[string]interface{} { + output := make(map[string]interface{}) + + for key, element := range variable { + output[key] = element.Value + } + + return output +} + +type evalOutput struct{ *ast.Output } + +func (v *evalOutput) Eval(s ast.Scope, stack *ast.Stack) (interface{}, ast.Type, error) { // The expressions should all be on the stack in reverse // order. So pop them off, reverse their order, and concatenate. nodes := make([]*ast.LiteralNode, 0, len(v.Exprs)) @@ -288,10 +373,13 @@ func (v *evalConcat) Eval(s ast.Scope, stack *ast.Stack) (interface{}, ast.Type, nodes = append(nodes, stack.Pop().(*ast.LiteralNode)) } - // Special case the single list + // Special case the single list and map if len(nodes) == 1 && nodes[0].Typex == ast.TypeList { return nodes[0].Value, ast.TypeList, nil } + if len(nodes) == 1 && nodes[0].Typex == ast.TypeMap { + return nodes[0].Value, ast.TypeMap, nil + } // Otherwise concatenate the strings var buf bytes.Buffer diff --git a/vendor/github.com/hashicorp/hil/evaltype_string.go b/vendor/github.com/hashicorp/hil/evaltype_string.go new file mode 100644 index 0000000000..911ff30e13 --- /dev/null +++ b/vendor/github.com/hashicorp/hil/evaltype_string.go @@ -0,0 +1,34 @@ +// Code generated by "stringer -type=EvalType"; DO NOT EDIT + +package hil + +import "fmt" + +const ( + _EvalType_name_0 = "TypeInvalid" + _EvalType_name_1 = "TypeString" + _EvalType_name_2 = "TypeList" + _EvalType_name_3 = "TypeMap" +) + +var ( + _EvalType_index_0 = [...]uint8{0, 11} + _EvalType_index_1 = [...]uint8{0, 10} + _EvalType_index_2 = [...]uint8{0, 8} + _EvalType_index_3 = [...]uint8{0, 7} +) + +func (i EvalType) String() string { + switch { + case i == 0: + return _EvalType_name_0 + case i == 2: + return _EvalType_name_1 + case i == 4: + return _EvalType_name_2 + case i == 8: + return _EvalType_name_3 + default: + return fmt.Sprintf("EvalType(%d)", i) + } +} diff --git a/vendor/github.com/hashicorp/hil/lang.y b/vendor/github.com/hashicorp/hil/lang.y index 6dc15f0d8b..67a7dc2aaa 100644 --- a/vendor/github.com/hashicorp/hil/lang.y +++ b/vendor/github.com/hashicorp/hil/lang.y @@ -44,17 +44,17 @@ top: { parserResult = $1 - // We want to make sure that the top value is always a Concat - // so that the return value is always a string type from an + // We want to make sure that the top value is always an Output + // so that the return value is always a string, list of map from an // interpolation. // // The logic for checking for a LiteralNode is a little annoying // because functionally the AST is the same, but we do that because // it makes for an easy literal check later (to check if a string // has any interpolations). - if _, ok := $1.(*ast.Concat); !ok { + if _, ok := $1.(*ast.Output); !ok { if n, ok := $1.(*ast.LiteralNode); !ok || n.Typex != ast.TypeString { - parserResult = &ast.Concat{ + parserResult = &ast.Output{ Exprs: []ast.Node{$1}, Posx: $1.Pos(), } @@ -70,13 +70,13 @@ literalModeTop: | literalModeTop literalModeValue { var result []ast.Node - if c, ok := $1.(*ast.Concat); ok { + if c, ok := $1.(*ast.Output); ok { result = append(c.Exprs, $2) } else { result = []ast.Node{$1, $2} } - $$ = &ast.Concat{ + $$ = &ast.Output{ Exprs: result, Posx: result[0].Pos(), } diff --git a/vendor/github.com/hashicorp/hil/transform_fixed.go b/vendor/github.com/hashicorp/hil/transform_fixed.go index 81c10377a5..e69df29432 100644 --- a/vendor/github.com/hashicorp/hil/transform_fixed.go +++ b/vendor/github.com/hashicorp/hil/transform_fixed.go @@ -14,7 +14,7 @@ func FixedValueTransform(root ast.Node, Value *ast.LiteralNode) ast.Node { // We visit the nodes in top-down order result := root switch n := result.(type) { - case *ast.Concat: + case *ast.Output: for i, v := range n.Exprs { n.Exprs[i] = FixedValueTransform(v, Value) } diff --git a/vendor/github.com/hashicorp/hil/y.go b/vendor/github.com/hashicorp/hil/y.go index cf9887cf3c..30eb86aa7e 100644 --- a/vendor/github.com/hashicorp/hil/y.go +++ b/vendor/github.com/hashicorp/hil/y.go @@ -484,17 +484,17 @@ parserdefault: { parserResult = parserDollar[1].node - // We want to make sure that the top value is always a Concat - // so that the return value is always a string type from an + // We want to make sure that the top value is always an Output + // so that the return value is always a string, list of map from an // interpolation. // // The logic for checking for a LiteralNode is a little annoying // because functionally the AST is the same, but we do that because // it makes for an easy literal check later (to check if a string // has any interpolations). - if _, ok := parserDollar[1].node.(*ast.Concat); !ok { + if _, ok := parserDollar[1].node.(*ast.Output); !ok { if n, ok := parserDollar[1].node.(*ast.LiteralNode); !ok || n.Typex != ast.TypeString { - parserResult = &ast.Concat{ + parserResult = &ast.Output{ Exprs: []ast.Node{parserDollar[1].node}, Posx: parserDollar[1].node.Pos(), } @@ -512,13 +512,13 @@ parserdefault: //line lang.y:71 { var result []ast.Node - if c, ok := parserDollar[1].node.(*ast.Concat); ok { + if c, ok := parserDollar[1].node.(*ast.Output); ok { result = append(c.Exprs, parserDollar[2].node) } else { result = []ast.Node{parserDollar[1].node, parserDollar[2].node} } - parserVAL.node = &ast.Concat{ + parserVAL.node = &ast.Output{ Exprs: result, Posx: result[0].Pos(), } From a0cc7115b372891a72bdcf802f70f72c20c1ab72 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Fri, 8 Apr 2016 20:23:36 -0500 Subject: [PATCH 2/2] deps: Update call sites of hil.Eval from update hil.Eval() now returns (hil.EvaluationResult, error) instead of (value, type, error). This commit updates the call sites, but retains all previous behaviour. Tests are also updated. --- .../template/resource_template_file.go | 8 ++++---- config/config.go | 6 +++--- config/interpolate_funcs_test.go | 17 ++++++++--------- config/raw_config.go | 4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/builtin/providers/template/resource_template_file.go b/builtin/providers/template/resource_template_file.go index 78fdf83267..c5b3b3b090 100644 --- a/builtin/providers/template/resource_template_file.go +++ b/builtin/providers/template/resource_template_file.go @@ -160,15 +160,15 @@ func execute(s string, vars map[string]interface{}) (string, error) { }, } - out, typ, err := hil.Eval(root, &cfg) + result, err := hil.Eval(root, &cfg) if err != nil { return "", err } - if typ != ast.TypeString { - return "", fmt.Errorf("unexpected output ast.Type: %v", typ) + if result.Type != hil.TypeString { + return "", fmt.Errorf("unexpected output hil.Type: %v", result.Type) } - return out.(string), nil + return result.Value.(string), nil } func hash(s string) string { diff --git a/config/config.go b/config/config.go index 6b8d1f8079..38578ae493 100644 --- a/config/config.go +++ b/config/config.go @@ -450,7 +450,7 @@ func (c *Config) Validate() error { r.RawCount.interpolate(func(root ast.Node) (string, error) { // Execute the node but transform the AST so that it returns // a fixed value of "5" for all interpolations. - out, _, err := hil.Eval( + result, err := hil.Eval( hil.FixedValueTransform( root, &ast.LiteralNode{Value: "5", Typex: ast.TypeString}), nil) @@ -458,7 +458,7 @@ func (c *Config) Validate() error { return "", err } - return out.(string), nil + return result.Value.(string), nil }) _, err := strconv.ParseInt(r.RawCount.Value().(string), 0, 0) if err != nil { @@ -680,7 +680,7 @@ func (c *Config) validateVarContextFn( node = node.Accept(func(n ast.Node) ast.Node { // If it is a concat or variable access, we allow it. switch n.(type) { - case *ast.Concat: + case *ast.Output: return n case *ast.VariableAccess: return n diff --git a/config/interpolate_funcs_test.go b/config/interpolate_funcs_test.go index 123ee39f36..774a7bf458 100644 --- a/config/interpolate_funcs_test.go +++ b/config/interpolate_funcs_test.go @@ -1004,16 +1004,16 @@ func TestInterpolateFuncUUID(t *testing.T) { t.Fatalf("err: %s", err) } - out, _, err := hil.Eval(ast, langEvalConfig(nil)) + result, err := hil.Eval(ast, langEvalConfig(nil)) if err != nil { t.Fatalf("err: %s", err) } - if results[out.(string)] { - t.Fatalf("Got unexpected duplicate uuid: %s", out) + if results[result.Value.(string)] { + t.Fatalf("Got unexpected duplicate uuid: %s", result.Value) } - results[out.(string)] = true + results[result.Value.(string)] = true } } @@ -1035,15 +1035,14 @@ func testFunction(t *testing.T, config testFunctionConfig) { t.Fatalf("Case #%d: input: %#v\nerr: %s", i, tc.Input, err) } - out, _, err := hil.Eval(ast, langEvalConfig(config.Vars)) + result, err := hil.Eval(ast, langEvalConfig(config.Vars)) if err != nil != tc.Error { t.Fatalf("Case #%d:\ninput: %#v\nerr: %s", i, tc.Input, err) } - if !reflect.DeepEqual(out, tc.Result) { - t.Fatalf( - "%d: bad output for input: %s\n\nOutput: %#v\nExpected: %#v", - i, tc.Input, out, tc.Result) + if !reflect.DeepEqual(result.Value, tc.Result) { + t.Fatalf("%d: bad output for input: %s\n\nOutput: %#v\nExpected: %#v", + i, tc.Input, result.Value, tc.Result) } } } diff --git a/config/raw_config.go b/config/raw_config.go index c897ed387a..6fc15ebd5e 100644 --- a/config/raw_config.go +++ b/config/raw_config.go @@ -132,12 +132,12 @@ func (r *RawConfig) Interpolate(vs map[string]ast.Variable) error { // None of the variables we need are computed, meaning we should // be able to properly evaluate. - out, _, err := hil.Eval(root, config) + result, err := hil.Eval(root, config) if err != nil { return "", err } - return out.(string), nil + return result.Value.(string), nil }) }