backport of commit 771c681

internal/config/pipeline_test.go

@@ -4,6 +4,8 @@ import (
  "path/filepath"
  "testing"
 
+ "github.com/hashicorp/go-hclog"
+ "github.com/hashicorp/waypoint/internal/config/variables"
  pb "github.com/hashicorp/waypoint/pkg/server/gen"
  "github.com/stretchr/testify/require"
  "google.golang.org/grpc/codes"
@@ -59,6 +61,29 @@ func TestPipeline(t *testing.T) {
  },
  },
 
+ {
+ "pipeline_input_var.hcl",
+ "foo",
+ func(t *testing.T, c *Pipeline) {
+ require := require.New(t)
+
+ require.NotNil(t, c)
+ require.Equal("foo", c.Name)
+
+ steps := c.Steps
+ s := steps[0]
+
+ var p testStepPluginConfig
+ diag := s.Configure(&p, nil)
+ if diag.HasErrors() {
+ t.Fatal(diag.Error())
+ }
+
+ require.NotEmpty(t, p.config.Foo)
+ require.Equal("example.com/test", s.ImageURL)
+ },
+ },
+
  {
  "pipeline_multi_step.hcl",
  "foo",
@@ -222,7 +247,11 @@ func TestPipeline(t *testing.T) {
  })
  require.NoError(err)
 
- pipeline, err := cfg.Pipeline(tt.Pipeline, nil)
+ evalCtx := EvalContext(nil, "").NewChild()
+ inputVars, _, _ := variables.EvaluateVariables(hclog.L(), nil, cfg.InputVariables, "")
+ AddVariables(evalCtx, inputVars)
+
+ pipeline, err := cfg.Pipeline(tt.Pipeline, evalCtx)
  require.NoError(err)
 
  tt.Func(t, pipeline)

internal/config/testdata/pipelines/pipeline_input_var.hcl

@@ -0,0 +1,28 @@
+project = "foo"
+
+pipeline "foo" {
+ step "test" {
+ image_url = var.image_url
+
+ use "test" {
+ foo = "bar"
+ }
+ }
+}
+
+app "web" {
+ config {
+ env = {
+ static = "hello"
+ }
+ }
+
+ build {}
+
+ deploy {}
+}
+
+variable "image_url" {
+ default = "example.com/test"
+ type = string
+}