Change env var prefix to JUMPPAD_VAR_

pkg/config/zz_hclparser.go

@@ -37,7 +37,9 @@
 // setupHCLConfig configures the HCLConfig package and registers the custom types
 func NewParser(callback hclconfig.WalkCallback, variables map[string]string, variablesFiles []string) *hclconfig.Parser {
 	cfg := hclconfig.DefaultOptions()
-	cfg.Callback = callback
+
+	cfg.ParseCallback = callback
+	cfg.VariableEnvPrefix = "JUMPPAD_VAR_"
 	cfg.Variables = variables
 	cfg.VariablesFiles = variablesFiles
 

pkg/jumppad/engine.go

@@ -22,7 +22,7 @@ import (
 
 // Clients contains clients which are responsible for creating and destroying resources
 
-// Engine defines an interface for the Shipyard engine
+// Engine defines an interface for the Jumppad engine
 //
 //go:generate mockery --name Engine --filename engine.go
 type Engine interface {
@@ -46,7 +46,7 @@ type EngineImpl struct {
 	config    *hclconfig.Config
 }
 
-// New creates a new shipyard engine
+// New creates a new Jumppad engine
 func New(p config.Providers, l logger.Logger) (Engine, error) {
 	e := &EngineImpl{}
 	e.log = l
@@ -63,14 +63,14 @@ func (e *EngineImpl) Config() *hclconfig.Config {
 	return e.config
 }
 
-// ParseConfig parses the given Shipyard files and creating the resource types but does
+// ParseConfig parses the given Jumppad files and creating the resource types but does
 // not apply or destroy the resources.
 // This function can be used to check the validity of a configuration without making changes
 func (e *EngineImpl) ParseConfig(path string) (*hclconfig.Config, error) {
 	return e.ParseConfigWithVariables(path, nil, "")
 }
 
-// ParseConfigWithVariables parses the given Shipyard files and creating the resource types but does
+// ParseConfigWithVariables parses the given Jumppad files and creating the resource types but does
 // not apply or destroy the resources.
 // This function can be used to check the validity of a configuration without making changes
 func (e *EngineImpl) ParseConfigWithVariables(path string, vars map[string]string, variablesFile string) (*hclconfig.Config, error) {

pkg/jumppad/engine_test.go

@@ -3,6 +3,7 @@ package jumppad
 import (
 	"fmt"
 	"log"
+	"os"
 	"strings"
 	"sync"
 	"testing"
@@ -398,7 +399,7 @@ func TestParseConfig(t *testing.T) {
 
 	require.Len(t, r.Resources, 6)
 
-	// should not have crated any providers
+	// should not have created any providers
 	testAssertMethodCalled(t, mp, "Create", 0)
 	testAssertMethodCalled(t, mp, "Destroy", 0)
 }
@@ -411,7 +412,27 @@ func TestParseWithVariables(t *testing.T) {
 
 	require.Len(t, r.Resources, 6)
 
-	// should not have crated any providers
+	// should not have created any providers
+	testAssertMethodCalled(t, mp, "Create", 0)
+	testAssertMethodCalled(t, mp, "Destroy", 0)
+
+	c, err := e.config.FindResource("resource.container.consul")
+	require.NoError(t, err)
+	require.Equal(t, "consul:1.8.1", c.(*container.Container).Image.Name)
+}
+
+func TestParseWithEnvironmentVariables(t *testing.T) {
+	e, mp := setupTests(t, nil)
+
+	err := os.Setenv("JUMPPAD_VAR_version", "consul:1.8.1")
+	require.NoError(t, err)
+
+	r, err := e.ParseConfig("../../examples/single_file/container.hcl")
+	require.NoError(t, err)
+
+	require.Len(t, r.Resources, 6)
+
+	// should not have created any providers
 	testAssertMethodCalled(t, mp, "Create", 0)
 	testAssertMethodCalled(t, mp, "Destroy", 0)