Skip to content

Commit d7db87a

Browse files
Use latest version of HCL Config
1 parent fb61895 commit d7db87a

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/infinytum/raymond/v2 v2.0.5
3535
github.com/jumppad-labs/connector v0.4.0
3636
github.com/jumppad-labs/gohup v0.4.0
37-
github.com/jumppad-labs/hclconfig v0.29.0
37+
github.com/jumppad-labs/hclconfig v0.30.1-0.20250527100114-61949d3d5ab1
3838
github.com/jumppad-labs/plugin-sdk v0.4.0
3939
github.com/kennygrant/sanitize v1.2.4
4040
github.com/mattn/go-isatty v0.0.20

go.sum

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,15 @@ github.com/jumppad-labs/go-cty v0.0.0-20230804061424-9e985cb751f6 h1:1ADItCWr5pr
11741174
github.com/jumppad-labs/go-cty v0.0.0-20230804061424-9e985cb751f6/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
11751175
github.com/jumppad-labs/gohup v0.4.0 h1:0OplHvnKnOLkqWm417sRHLSiJ4xGeb8LiSSAJ51QrYg=
11761176
github.com/jumppad-labs/gohup v0.4.0/go.mod h1:JYvZnemxJlWDyx8RbDNcCBLZSvIrYlYLnkQqR1BKFW4=
1177+
<<<<<<< HEAD
11771178
github.com/jumppad-labs/hclconfig v0.29.0 h1:ZJKsei7agJ8wEx+r0iZQsOKWYxWvN8Wldd5/897xBxk=
11781179
github.com/jumppad-labs/hclconfig v0.29.0/go.mod h1:UiDq9kWaSsw5MQp0iDej2oxvo0E+Xwx7UVuEDlzetnw=
1180+
=======
1181+
github.com/jumppad-labs/hclconfig v0.28.2-0.20250513065622-4556e0f28745 h1:qpKlLIKrxhwZzShCCXIlfBxClXQhsVK1yZrF6HTCtYE=
1182+
github.com/jumppad-labs/hclconfig v0.28.2-0.20250513065622-4556e0f28745/go.mod h1:UiDq9kWaSsw5MQp0iDej2oxvo0E+Xwx7UVuEDlzetnw=
1183+
github.com/jumppad-labs/hclconfig v0.30.1-0.20250527100114-61949d3d5ab1 h1:nxas6mcfmDcEjQzh2y2A2+GCUrGZ1W3cm6th/qZPgZQ=
1184+
github.com/jumppad-labs/hclconfig v0.30.1-0.20250527100114-61949d3d5ab1/go.mod h1:UiDq9kWaSsw5MQp0iDej2oxvo0E+Xwx7UVuEDlzetnw=
1185+
>>>>>>> a364d15 (Use latest version of HCL Config)
11791186
github.com/jumppad-labs/log v0.0.0-20240827082827-4404884e31a7 h1:tuoFYWXAqT5BheDlQNumY1DxvkW8bjG9JOzoxpFneZs=
11801187
github.com/jumppad-labs/log v0.0.0-20240827082827-4404884e31a7/go.mod h1:S9jhxE2C1+jv2PlLTAow3h+ZILzvXRhd6eBjFAUcfgI=
11811188
github.com/jumppad-labs/plugin-sdk v0.4.0 h1:deNk7h8W+6dsxj2ADP63o07Dv313vcBI8C4d1aBUO/c=

pkg/config/resources/exec/provider.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,17 +352,19 @@ func (p *Provider) generateOutput() error {
352352
return fmt.Errorf("unable to read output file: %w", err)
353353
}
354354

355-
output := map[string]string{}
355+
output := make(map[string]cty.Value)
356+
356357
outs := strings.Split(string(d), "\n")
357358
for _, v := range outs {
358359
parts := strings.Split(v, "=")
359360
if len(parts) != 2 {
360361
continue
361362
}
362363

363-
output[parts[0]] = parts[1]
364+
output[parts[0]] = cty.StringVal(parts[1])
364365
}
365366

367+
<<<<<<< HEAD
366368
values := map[string]cty.Value{}
367369
for k, v := range output {
368370
value, err := convert.GoToCtyValue(v)
@@ -374,6 +376,9 @@ func (p *Provider) generateOutput() error {
374376
}
375377

376378
p.config.Output = cty.ObjectVal(values)
379+
=======
380+
p.config.Output = cty.MapVal(output)
381+
>>>>>>> a364d15 (Use latest version of HCL Config)
377382

378383
return nil
379384
}

0 commit comments

Comments
 (0)