set filemodes after writing file to sidestep umask

debug.log override filemodes to clarify octal vs bin issues
replicatedhq · Aug 26, 2019 · 451e277 · 451e277
1 parent 930e0c3
commit 451e277
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/pkg/lifecycle/render/github/render.go b/pkg/lifecycle/render/github/render.go
@@ -167,6 +167,7 @@ func (r *LocalRenderer) resolveProxyGithubAssets(asset api.GitHubAsset, builder
 
 		mode := os.FileMode(0644) // TODO: how to get mode info from github?
 		if asset.AssetShared.Mode != os.FileMode(0000) {
+			debug.Log("event", "applying override permissions", "override.filemode", asset.AssetShared.Mode, "override.filemode.int", int(asset.AssetShared.Mode))
 			mode = asset.AssetShared.Mode
 		}
 		if err := rootFs.WriteFile(filePath, []byte(built), mode); err != nil {

diff --git a/pkg/lifecycle/render/inline/render.go b/pkg/lifecycle/render/inline/render.go
@@ -85,14 +85,18 @@ func (r *LocalRenderer) Execute(
 
 		mode := os.FileMode(0644)
 		if builtAsset.Mode != os.FileMode(0) {
-			debug.Log("event", "applying override permissions")
+			debug.Log("event", "applying override permissions", "override.filemode", builtAsset.Mode, "override.filemode.int", int(builtAsset.Mode))
 			mode = builtAsset.Mode
 		}
 
 		if err := rootFs.WriteFile(builtAsset.Dest, []byte(builtAsset.Contents), mode); err != nil {
 			debug.Log("event", "execute.fail", "err", err)
 			return errors.Wrapf(err, "Write inline asset to %s", builtAsset.Dest)
 		}
+		if err := rootFs.Chmod(builtAsset.Dest, mode); err != nil {
+			debug.Log("event", "chmod.fail", "err", err)
+			return errors.Wrapf(err, "Set inline asset %s filemode to %s", builtAsset.Dest, mode)
+		}
 		return nil
 
 	}

diff --git a/pkg/lifecycle/render/inline/render_test.go b/pkg/lifecycle/render/inline/render_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/replicatedhq/libyaml"
@@ -227,6 +228,8 @@ func TestAfero(t *testing.T) {
 
 			err := aferoFS.WriteFile("test.txt", []byte("Hello, World!"), mode)
 			req.NoError(err)
+			err = aferoFS.Chmod("test.txt", mode)
+			req.NoError(err)
 
 			stat, err := aferoFS.Stat("test.txt")
 			req.NoError(err)
@@ -243,11 +246,29 @@ func TestAfero(t *testing.T) {
 
 			err = realFS.WriteFile("test.txt", []byte("Hello, World!"), mode)
 			req.NoError(err)
+			err = realFS.Chmod("test.txt", mode)
+			req.NoError(err)
 
 			stat, err := realFS.Stat("test.txt")
 			req.NoError(err)
 
 			req.Equal(fmt.Sprint(mode), fmt.Sprint(stat.Mode()))
 		})
+
+		t.Run(fmt.Sprint(mode)+" manual FS", func(t *testing.T) {
+			req := require.New(t)
+			tempdir, err := ioutil.TempDir("", "afero-test")
+			req.NoError(err)
+			defer os.RemoveAll(tempdir)
+
+			err = ioutil.WriteFile(filepath.Join(tempdir, "test.txt"), []byte("Hello, World!"), mode)
+			req.NoError(err)
+			err = os.Chmod(filepath.Join(tempdir, "test.txt"), mode)
+			req.NoError(err)
+			stat, err := os.Stat(filepath.Join(tempdir, "test.txt"))
+			req.NoError(err)
+
+			req.Equal(fmt.Sprint(mode), fmt.Sprint(stat.Mode()))
+		})
 	}
 }