kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

plancontext cleanup

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-12-07 14:20:08 -05:00
parent c881bc2dba
commit a58ca16c3d
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plan/task/import.go
View File

@ -70,7 +70,7 @@ func (c importTask) Run(ctx context.Context, pctx *plancontext.Context, s solver
fs := pctx.FS.New(result) fs := pctx.FS.New(result)
out := compiler.NewValue() 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 nil, err
} }
return out, nil return out, nil

2
plan/task/secretenv.go
View File

@ -38,7 +38,7 @@ func (c secretEnvTask) Run(ctx context.Context, pctx *plancontext.Context, _ sol
} }
secret := pctx.Secrets.New(env) secret := pctx.Secrets.New(env)
out := compiler.NewValue() 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 nil, err
} }
return out, nil return out, nil

2
plan/task/secretfile.go
View File

@ -38,7 +38,7 @@ func (c secretFileTask) Run(ctx context.Context, pctx *plancontext.Context, _ so
secret := pctx.Secrets.New(string(plaintext)) secret := pctx.Secrets.New(string(plaintext))
out := compiler.NewValue() 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 nil, err
} }
return out, nil return out, nil

2
plancontext/context_test.go
View File

@ -10,7 +10,7 @@ func TestContext(t *testing.T) {
ctx := New() ctx := New()
secret := ctx.Secrets.New("test") secret := ctx.Secrets.New("test")
get, err := ctx.Secrets.FromValue(secret.Value()) get, err := ctx.Secrets.FromValue(secret.MarshalCUE())
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "test", get.PlainText()) require.Equal(t, "test", get.PlainText())
} }

2
plancontext/fs.go
View File

@ -31,7 +31,7 @@ func (fs *FS) Result() bkgw.Reference {
return fs.result return fs.result
} }
func (fs *FS) Value() *compiler.Value { func (fs *FS) MarshalCUE() *compiler.Value {
v := compiler.NewValue() v := compiler.NewValue()
if err := v.FillPath(fsIDPath, fs.id); err != nil { if err := v.FillPath(fsIDPath, fs.id); err != nil {
panic(err) panic(err)

2
plancontext/secret.go
View File

@ -33,7 +33,7 @@ func (s *Secret) PlainText() string {
return s.plainText return s.plainText
} }
func (s *Secret) Value() *compiler.Value { func (s *Secret) MarshalCUE() *compiler.Value {
v := compiler.NewValue() v := compiler.NewValue()
if err := v.FillPath(secretIDPath, s.id); err != nil { if err := v.FillPath(secretIDPath, s.id); err != nil {
panic(err) panic(err)

2
plancontext/service.go
View File

@ -39,7 +39,7 @@ func (s *Service) NPipe() string {
return s.npipe return s.npipe
} }
func (s *Service) Value() *compiler.Value { func (s *Service) MarshalCUE() *compiler.Value {
v := compiler.NewValue() v := compiler.NewValue()
if err := v.FillPath(serviceIDPath, s.id); err != nil { if err := v.FillPath(serviceIDPath, s.id); err != nil {
panic(err) panic(err)

4
state/input.go
View File

@ -193,7 +193,7 @@ type secretInput string
func (i secretInput) Compile(st *State) (*compiler.Value, error) { func (i secretInput) Compile(st *State) (*compiler.Value, error) {
secret := st.Context.Secrets.New(i.PlainText()) secret := st.Context.Secrets.New(i.PlainText())
return secret.Value(), nil return secret.MarshalCUE(), nil
} }
func (i secretInput) PlainText() string { func (i secretInput) PlainText() string {
@ -296,5 +296,5 @@ type socketInput struct {
func (i socketInput) Compile(st *State) (*compiler.Value, error) { func (i socketInput) Compile(st *State) (*compiler.Value, error) {
service := st.Context.Services.New(i.Unix, i.Npipe) service := st.Context.Services.New(i.Unix, i.Npipe)
return service.Value(), nil return service.MarshalCUE(), nil
} }