diff --git a/cmd/dagger/cmd/doc.go b/cmd/dagger/cmd/doc.go index eee6c296..48025d42 100644 --- a/cmd/dagger/cmd/doc.go +++ b/cmd/dagger/cmd/doc.go @@ -338,7 +338,9 @@ func walkStdlib(ctx context.Context, output, format string) { 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 } @@ -357,6 +359,10 @@ func walkStdlib(ctx context.Context, output, format string) { lg.Warn().Str("package", p).Err(err).Msg("ignoring") return nil } + if strings.Contains(err.Error(), "cannot find package") { + lg.Warn().Str("package", p).Err(err).Msg("ignoring") + return nil + } return err } diff --git a/pkg/pkg.go b/pkg/pkg.go index d4d96d0d..a5ee0170 100644 --- a/pkg/pkg.go +++ b/pkg/pkg.go @@ -17,7 +17,7 @@ import ( var ( // FS contains the filesystem of the stdlib. - //go:embed */**/*.cue */**/**/*.cue + //go:embed alpha.dagger.io dagger.io universe.dagger.io FS embed.FS ) @@ -122,10 +122,6 @@ func extractModules(dest string) error { return nil } - if filepath.Ext(entry.Name()) != ".cue" { - return nil - } - contents, err := fs.ReadFile(FS, p) if err != nil { return fmt.Errorf("%s: %w", p, err) @@ -137,7 +133,10 @@ func extractModules(dest string) error { 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) }) }