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

conforming to llb api

Browse Source 
Signed-off-by: Richard Jones <richard@dagger.io>
This commit is contained in:
Richard Jones 2021-12-20 13:30:35 -07:00
parent 7ca84282be
commit ee938111c6
No known key found for this signature in database
GPG Key ID: CFB3A382EB166F4C
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plan/task/gitPull.go
View File

@ -44,15 +44,17 @@ func (c gitPullTask) Run(ctx context.Context, pctx *plancontext.Context, s solve
if opts.KeepGitDir { if opts.KeepGitDir {
gitOpts = append(gitOpts, llb.KeepGitDir()) gitOpts = append(gitOpts, llb.KeepGitDir())
} }
// Secret // Secret
if authToken := v.Lookup("auth.token"); authToken.Exists() { if authToken := v.Lookup("authToken"); authToken.Exists() {
authTokenSecret, err := pctx.Secrets.FromValue(authToken) authTokenSecret, err := pctx.Secrets.FromValue(authToken)
if err != nil { if err != nil {
return nil, err return nil, err
} }
gitOpts = append(gitOpts, llb.AuthTokenSecret(authTokenSecret.ID())) gitOpts = append(gitOpts, llb.AuthTokenSecret(authTokenSecret.ID()))
} }
if authHeader := v.Lookup("auth.header"); authHeader.Exists() {
if authHeader := v.Lookup("authHeader"); authHeader.Exists() {
authHeaderSecret, err := pctx.Secrets.FromValue(authHeader) authHeaderSecret, err := pctx.Secrets.FromValue(authHeader)
if err != nil { if err != nil {
return nil, err return nil, err
@ -62,11 +64,7 @@ func (c gitPullTask) Run(ctx context.Context, pctx *plancontext.Context, s solve
gitOpts = append(gitOpts, withCustomName(v, "FetchGit %s@%s", remoteRedacted, ref)) gitOpts = append(gitOpts, withCustomName(v, "FetchGit %s@%s", remoteRedacted, ref))
st := llb.Git( st := llb.Git(remote, ref, gitOpts...)
remote,
ref,
gitOpts...,
)
result, err := s.Solve(ctx, st, pctx.Platform.Get()) result, err := s.Solve(ctx, st, pctx.Platform.Get())
if err != nil { if err != nil {
@ -75,6 +73,6 @@ func (c gitPullTask) Run(ctx context.Context, pctx *plancontext.Context, s solve
fs := pctx.FS.New(result) fs := pctx.FS.New(result)
return compiler.NewValue().FillFields(map[string]interface{}{ return compiler.NewValue().FillFields(map[string]interface{}{
"contents": fs.MarshalCUE(), "output": fs.MarshalCUE(),
}) })
} }

7
stdlib/europa/dagger/engine/git.cue
View File

@ -15,9 +15,8 @@ package engine
$dagger: task: _name: "GitPull" $dagger: task: _name: "GitPull"
remote: string remote: string
ref: string ref: string
auth: { authToken?: #Secret
token?: #Secret authHeader?: #Secret
header?: #Secret keepGitDir: true | *false
}
output: #FS output: #FS
} }