From 5de86cb1ee844eeff276943adaa58409a86341a8 Mon Sep 17 00:00:00 2001 From: Vasek - Tom C Date: Fri, 28 Jan 2022 22:02:21 +0100 Subject: [PATCH] Embed all files instead of just cue file Signed-off-by: Vasek - Tom C --- pkg/pkg.go | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkg/pkg.go b/pkg/pkg.go index 0b7abbf6..8bfde31e 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 */**/*.sh + //go:embed alpha.dagger.io dagger.io universe.dagger.io FS embed.FS ) @@ -112,17 +112,6 @@ func Vendor(ctx context.Context, p string) error { return nil } -func isAllowedExt(ext string) bool { - // List of allowed extension to vendor in - allowedExtension := []string{".cue", ".sh"} - for _, v := range allowedExtension { - if v == ext { - return true - } - } - return false -} - func extractModules(dest string) error { return fs.WalkDir(FS, ".", func(p string, entry fs.DirEntry, err error) error { if err != nil { @@ -133,10 +122,6 @@ func extractModules(dest string) error { return nil } - if !isAllowedExt(filepath.Ext(entry.Name())) { - return nil - } - contents, err := fs.ReadFile(FS, p) if err != nil { return fmt.Errorf("%s: %w", p, err) @@ -148,7 +133,11 @@ func extractModules(dest string) error { return err } - return os.WriteFile(overlayPath, contents, 0600) + info, err := fs.Stat(FS, p) + if err != nil { + return err + } + return os.WriteFile(overlayPath, contents, info.Mode().Perm()) }) }