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

Merge pull request #1526 from TomChv/fix/embed-sh-script

Browse Source 
Embed shell script into universe
This commit is contained in:
Andrea Luzzardi 2022-01-28 15:22:26 -08:00 committed by GitHub
commit 025ce14ed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/dagger/cmd/doc.go
View File

@ -338,7 +338,9 @@ func walkStdlib(ctx context.Context, output, format string) {
return err return err
} }
if p == "." || d.Name() == pkg.AlphaModule || !d.IsDir() || d.Name() == "cue.mod" { // Ignore useless embedded files
if p == "." || d.Name() == pkg.AlphaModule || !d.IsDir() || d.Name() == "cue.mod" ||
strings.Contains(p, "cue.mod") || strings.Contains(p, "tests") {
return nil return nil
} }
@ -357,6 +359,10 @@ func walkStdlib(ctx context.Context, output, format string) {
lg.Warn().Str("package", p).Err(err).Msg("ignoring") lg.Warn().Str("package", p).Err(err).Msg("ignoring")
return nil return nil
} }
if strings.Contains(err.Error(), "cannot find package") {
lg.Warn().Str("package", p).Err(err).Msg("ignoring")
return nil
}
return err return err
} }

11
pkg/pkg.go
View File

@ -17,7 +17,7 @@ import (
var ( var (
// FS contains the filesystem of the stdlib. // FS contains the filesystem of the stdlib.
//go:embed */**/*.cue */**/**/*.cue //go:embed alpha.dagger.io dagger.io universe.dagger.io
FS embed.FS FS embed.FS
) )
@ -122,10 +122,6 @@ func extractModules(dest string) error {
return nil return nil
} }
if filepath.Ext(entry.Name()) != ".cue" {
return nil
}
contents, err := fs.ReadFile(FS, p) contents, err := fs.ReadFile(FS, p)
if err != nil { if err != nil {
return fmt.Errorf("%s: %w", p, err) return fmt.Errorf("%s: %w", p, err)
@ -137,7 +133,10 @@ func extractModules(dest string) error {
return err return err
} }
return os.WriteFile(overlayPath, contents, 0600) // Give exec permission on embedded file to freely use shell script
// Exclude permission linter
//nolint
return os.WriteFile(overlayPath, contents, 0700)
}) })
} }