diff --git a/plan/task/import.go b/plan/task/import.go index 20feb38c..a567a223 100644 --- a/plan/task/import.go +++ b/plan/task/import.go @@ -70,7 +70,7 @@ func (c importTask) Run(ctx context.Context, pctx *plancontext.Context, s solver fs := pctx.FS.New(result) out := compiler.NewValue() - if err := out.FillPath(cue.ParsePath("fs"), fs.Value()); err != nil { + if err := out.FillPath(cue.ParsePath("fs"), fs.MarshalCUE()); err != nil { return nil, err } return out, nil diff --git a/plan/task/secretenv.go b/plan/task/secretenv.go index 90fc0b6d..f3db6923 100644 --- a/plan/task/secretenv.go +++ b/plan/task/secretenv.go @@ -38,7 +38,7 @@ func (c secretEnvTask) Run(ctx context.Context, pctx *plancontext.Context, _ sol } secret := pctx.Secrets.New(env) out := compiler.NewValue() - if err := out.FillPath(cue.ParsePath("contents"), secret.Value()); err != nil { + if err := out.FillPath(cue.ParsePath("contents"), secret.MarshalCUE()); err != nil { return nil, err } return out, nil diff --git a/plan/task/secretfile.go b/plan/task/secretfile.go index 344b0f96..3cb5a335 100644 --- a/plan/task/secretfile.go +++ b/plan/task/secretfile.go @@ -38,7 +38,7 @@ func (c secretFileTask) Run(ctx context.Context, pctx *plancontext.Context, _ so secret := pctx.Secrets.New(string(plaintext)) out := compiler.NewValue() - if err := out.FillPath(cue.ParsePath("contents"), secret.Value()); err != nil { + if err := out.FillPath(cue.ParsePath("contents"), secret.MarshalCUE()); err != nil { return nil, err } return out, nil diff --git a/plancontext/context_test.go b/plancontext/context_test.go index bbd3e300..4cf788f1 100644 --- a/plancontext/context_test.go +++ b/plancontext/context_test.go @@ -10,7 +10,7 @@ func TestContext(t *testing.T) { ctx := New() secret := ctx.Secrets.New("test") - get, err := ctx.Secrets.FromValue(secret.Value()) + get, err := ctx.Secrets.FromValue(secret.MarshalCUE()) require.NoError(t, err) require.Equal(t, "test", get.PlainText()) } diff --git a/plancontext/fs.go b/plancontext/fs.go index dc8ca6a2..3287b7ef 100644 --- a/plancontext/fs.go +++ b/plancontext/fs.go @@ -31,7 +31,7 @@ func (fs *FS) Result() bkgw.Reference { return fs.result } -func (fs *FS) Value() *compiler.Value { +func (fs *FS) MarshalCUE() *compiler.Value { v := compiler.NewValue() if err := v.FillPath(fsIDPath, fs.id); err != nil { panic(err) diff --git a/plancontext/secret.go b/plancontext/secret.go index 0a08ab67..16aefb4d 100644 --- a/plancontext/secret.go +++ b/plancontext/secret.go @@ -33,7 +33,7 @@ func (s *Secret) PlainText() string { return s.plainText } -func (s *Secret) Value() *compiler.Value { +func (s *Secret) MarshalCUE() *compiler.Value { v := compiler.NewValue() if err := v.FillPath(secretIDPath, s.id); err != nil { panic(err) diff --git a/plancontext/service.go b/plancontext/service.go index 0b2a7bee..6fc6d9b7 100644 --- a/plancontext/service.go +++ b/plancontext/service.go @@ -39,7 +39,7 @@ func (s *Service) NPipe() string { return s.npipe } -func (s *Service) Value() *compiler.Value { +func (s *Service) MarshalCUE() *compiler.Value { v := compiler.NewValue() if err := v.FillPath(serviceIDPath, s.id); err != nil { panic(err) diff --git a/state/input.go b/state/input.go index 22b1fefd..726ec5b7 100644 --- a/state/input.go +++ b/state/input.go @@ -193,7 +193,7 @@ type secretInput string func (i secretInput) Compile(st *State) (*compiler.Value, error) { secret := st.Context.Secrets.New(i.PlainText()) - return secret.Value(), nil + return secret.MarshalCUE(), nil } func (i secretInput) PlainText() string { @@ -296,5 +296,5 @@ type socketInput struct { func (i socketInput) Compile(st *State) (*compiler.Value, error) { service := st.Context.Services.New(i.Unix, i.Npipe) - return service.Value(), nil + return service.MarshalCUE(), nil }