Merge pull request #355 from jumppad-labs/f-new-hclconfig

nicholasjackson · web-flow · commit 660a2c771d33 · 2025-05-27T17:42:56.000+01:00
F new hclconfig
diff --git a/go.mod b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/infinytum/raymond/v2 v2.0.5
 	github.com/jumppad-labs/connector v0.4.0
 	github.com/jumppad-labs/gohup v0.4.0
-	github.com/jumppad-labs/hclconfig v0.29.0
+	github.com/jumppad-labs/hclconfig v0.30.1
 	github.com/jumppad-labs/plugin-sdk v0.4.0
 	github.com/kennygrant/sanitize v1.2.4
 	github.com/mattn/go-isatty v0.0.20
diff --git a/go.sum b/go.sum
@@ -1174,8 +1174,8 @@ github.com/jumppad-labs/go-cty v0.0.0-20230804061424-9e985cb751f6 h1:1ADItCWr5pr
 github.com/jumppad-labs/go-cty v0.0.0-20230804061424-9e985cb751f6/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
 github.com/jumppad-labs/gohup v0.4.0 h1:0OplHvnKnOLkqWm417sRHLSiJ4xGeb8LiSSAJ51QrYg=
 github.com/jumppad-labs/gohup v0.4.0/go.mod h1:JYvZnemxJlWDyx8RbDNcCBLZSvIrYlYLnkQqR1BKFW4=
-github.com/jumppad-labs/hclconfig v0.29.0 h1:ZJKsei7agJ8wEx+r0iZQsOKWYxWvN8Wldd5/897xBxk=
-github.com/jumppad-labs/hclconfig v0.29.0/go.mod h1:UiDq9kWaSsw5MQp0iDej2oxvo0E+Xwx7UVuEDlzetnw=
+github.com/jumppad-labs/hclconfig v0.30.1 h1:gMsmxVctE+ozfqUrCy2p0CeLdcoWH+cIhc4zYsiQzR0=
+github.com/jumppad-labs/hclconfig v0.30.1/go.mod h1:UiDq9kWaSsw5MQp0iDej2oxvo0E+Xwx7UVuEDlzetnw=
 github.com/jumppad-labs/log v0.0.0-20240827082827-4404884e31a7 h1:tuoFYWXAqT5BheDlQNumY1DxvkW8bjG9JOzoxpFneZs=
 github.com/jumppad-labs/log v0.0.0-20240827082827-4404884e31a7/go.mod h1:S9jhxE2C1+jv2PlLTAow3h+ZILzvXRhd6eBjFAUcfgI=
 github.com/jumppad-labs/plugin-sdk v0.4.0 h1:deNk7h8W+6dsxj2ADP63o07Dv313vcBI8C4d1aBUO/c=
diff --git a/pkg/config/resources/exec/provider.go b/pkg/config/resources/exec/provider.go
@@ -352,15 +352,16 @@ func (p *Provider) generateOutput() error {
 		return fmt.Errorf("unable to read output file: %w", err)
 	}
 
-	output := map[string]string{}
+	output := make(map[string]cty.Value)
+
 	outs := strings.Split(string(d), "\n")
 	for _, v := range outs {
 		parts := strings.Split(v, "=")
 		if len(parts) != 2 {
 			continue
 		}
 
-		output[parts[0]] = parts[1]
+		output[parts[0]] = cty.StringVal(parts[1])
 	}
 
 	values := map[string]cty.Value{}

Original file line number	Diff line number	Diff line change
`@@ -352,15 +352,16 @@ func (p *Provider) generateOutput() error {`
`352`	`352`	`return fmt.Errorf("unable to read output file: %w", err)`
`353`	`353`	`}`
`354`	`354`
`355`		`- output := map[string]string{}`
	`355`	`+ output := make(map[string]cty.Value)`
	`356`	`+`
`356`	`357`	`outs := strings.Split(string(d), "\n")`
`357`	`358`	`for _, v := range outs {`
`358`	`359`	`parts := strings.Split(v, "=")`
`359`	`360`	`if len(parts) != 2 {`
`360`	`361`	`continue`
`361`	`362`	`}`
`362`	`363`
`363`		`- output[parts[0]] = parts[1]`
	`364`	`+ output[parts[0]] = cty.StringVal(parts[1])`
`364`	`365`	`}`
`365`	`366`
`366`	`367`	`values := map[string]cty.Value{}`