refactor: replace file permission literals with fileperms constants (#65)

Copilot · dmcilvaney · web-flow · commit 534f29f8ee8d · 2026-04-06T12:15:11.000-07:00
Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: dmcilvaney &lt;23200982+dmcilvaney@users.noreply.github.com&gt;
diff --git a/internal/app/azldev/cmds/advanced/mock_test.go b/internal/app/azldev/cmds/advanced/mock_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev/cmds/advanced"
 	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev/core/testutils"
 	"github.com/microsoft/azure-linux-dev-tools/internal/projectconfig"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -128,7 +129,7 @@ func TestBuildRPMS(t *testing.T) {
 			OutputDirPath: testOutputDirPath,
 		}
 
-		require.NoError(t, fileutils.WriteFile(testEnv.FS(), testMockConfigPath, []byte{}, 0o600))
+		require.NoError(t, fileutils.WriteFile(testEnv.FS(), testMockConfigPath, []byte{}, fileperms.PrivateFile))
 
 		// Confirm that we can "build" RPMs without an explicit mock config file, because
 		// the loaded project config provides that.
diff --git a/internal/app/azldev/core/sources/overlays_test.go b/internal/app/azldev/core/sources/overlays_test.go
diff --git a/internal/app/azldev/core/sources/sourceprep_test.go b/internal/app/azldev/core/sources/sourceprep_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/microsoft/azure-linux-dev-tools/internal/projectconfig"
 	"github.com/microsoft/azure-linux-dev-tools/internal/providers/sourceproviders"
 	"github.com/microsoft/azure-linux-dev-tools/internal/providers/sourceproviders/sourceproviders_test"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -60,7 +61,7 @@ func TestPrepareSources_Success(t *testing.T) {
 	sourceManager.EXPECT().FetchComponent(gomock.Any(), component, testOutputDir, gomock.Any()).DoAndReturn(
 		func(_ interface{}, _ interface{}, outputDir string, _ ...sourceproviders.FetchComponentOption) error {
 			// Create the expected spec file.
-			return fileutils.WriteFile(ctx.FS(), outputSpecPath, []byte("# test spec"), 0o644)
+			return fileutils.WriteFile(ctx.FS(), outputSpecPath, []byte("# test spec"), fileperms.PublicFile)
 		},
 	)
 
@@ -184,7 +185,7 @@ func TestPrepareSources_WritesMacrosFile(t *testing.T) {
 			// Create the expected spec file.
 			specPath := filepath.Join(outputDir, "my-package.spec")
 
-			return fileutils.WriteFile(ctx.FS(), specPath, []byte("# test spec"), 0o644)
+			return fileutils.WriteFile(ctx.FS(), specPath, []byte("# test spec"), fileperms.PublicFile)
 		},
 	)
 
@@ -441,7 +442,7 @@ Summary: Test component
 make test
 `
 
-			return fileutils.WriteFile(ctx.FS(), outputSpecPath, []byte(specContent), 0o644)
+			return fileutils.WriteFile(ctx.FS(), outputSpecPath, []byte(specContent), fileperms.PublicFile)
 		},
 	)
 
@@ -498,7 +499,7 @@ Summary: Test component
 make test
 `
 
-			return fileutils.WriteFile(ctx.FS(), outputSpecPath, []byte(specContent), 0o644)
+			return fileutils.WriteFile(ctx.FS(), outputSpecPath, []byte(specContent), fileperms.PublicFile)
 		},
 	)
 
@@ -536,7 +537,7 @@ func TestDiffSources_NoOverlays(t *testing.T) {
 		func(_ interface{}, _ interface{}, outputDir string, _ ...sourceproviders.FetchComponentOption) error {
 			specPath := filepath.Join(outputDir, "test-component.spec")
 
-			return fileutils.WriteFile(ctx.FS(), specPath, []byte("Name: test-component\nVersion: 1.0\n"), 0o644)
+			return fileutils.WriteFile(ctx.FS(), specPath, []byte("Name: test-component\nVersion: 1.0\n"), fileperms.PublicFile)
 		},
 	)
 
@@ -579,7 +580,7 @@ func TestDiffSources_WithOverlays(t *testing.T) {
 		func(_ interface{}, _ interface{}, outputDir string, _ ...sourceproviders.FetchComponentOption) error {
 			specPath := filepath.Join(outputDir, "test-component.spec")
 
-			return fileutils.WriteFile(ctx.FS(), specPath, []byte("Name: test-component\nVersion: 1.0\n"), 0o644)
+			return fileutils.WriteFile(ctx.FS(), specPath, []byte("Name: test-component\nVersion: 1.0\n"), fileperms.PublicFile)
 		},
 	)
 
diff --git a/internal/projectconfig/configfile.go b/internal/projectconfig/configfile.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/go-playground/validator/v10"
 	"github.com/microsoft/azure-linux-dev-tools/internal/global/opctx"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/pelletier/go-toml/v2"
 )
@@ -114,7 +115,7 @@ func (f ConfigFile) ToBytes() ([]byte, error) {
 // Serializes writes the config file to the specified path in appropriate format (TOML). If the given path already
 // exists, it will be overwritten.
 func (f ConfigFile) Serialize(fs opctx.FS, filePath string) error {
-	const defaultPerms = 0o644
+	const defaultPerms = fileperms.PublicFile
 
 	bytes, err := f.ToBytes()
 	if err != nil {
diff --git a/internal/projectgen/projectgen.go b/internal/projectgen/projectgen.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/microsoft/azure-linux-dev-tools/internal/global/opctx"
 	"github.com/microsoft/azure-linux-dev-tools/internal/projectconfig"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 )
 
@@ -22,7 +23,7 @@ const (
 	DefaultWorkDir               = "build/work"
 	defaultOutputDir             = "out"
 
-	defaultFilePerms = 0o644
+	defaultFilePerms = fileperms.PublicFile
 )
 
 // ErrProjectRootAlreadyExists is returned when a project root directory already exists but an attempt
diff --git a/internal/projectgen/projectgen_test.go b/internal/projectgen/projectgen_test.go
@@ -127,7 +127,7 @@ func TestInitializeProject(t *testing.T) {
 		// Create the test project path and a config file.
 		require.NoError(t, fileutils.MkdirAll(env.FS(), testProjectPath))
 		configFilePath := filepath.Join(testProjectPath, projectconfig.DefaultConfigFileName)
-		require.NoError(t, fileutils.WriteFile(env.FS(), configFilePath, []byte{}, 0o600))
+		require.NoError(t, fileutils.WriteFile(env.FS(), configFilePath, []byte{}, fileperms.PrivateFile))
 
 		// Run the code-under-test.
 		err := projectgen.InitializeProject(env.FS(), testProjectPath, &projectgen.NewProjectOptions{})
diff --git a/internal/providers/sourceproviders/fedorasource/fedorasource_test.go b/internal/providers/sourceproviders/fedorasource/fedorasource_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/microsoft/azure-linux-dev-tools/internal/global/testctx"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/downloader/downloader_test"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/retry"
 	"github.com/spf13/afero"
@@ -24,8 +25,8 @@ const (
 	testPackageName  = "test-package"
 	testRepoDir      = "/test/repo"
 	testEmptyRepoDir = "/test/empty-repo"
-	testFilePerms    = 0o644
-	testDirPerms     = 0o755
+	testFilePerms    = fileperms.PublicFile
+	testDirPerms     = fileperms.PublicDir
 
 	// Test source file data.
 	testSourcesContent = `SHA512 (example-1.0.tar.gz) = af5ae0eb4ad9c3f07b7d78ec9dfd03f6a00c257df6b829b21051d4ba2d106bf` +
@@ -135,7 +136,7 @@ func TestExtractSourcesFromRepoValidation(t *testing.T) {
 	})
 
 	t.Run("missing sources file", func(t *testing.T) {
-		require.NoError(t, ctx.FS().MkdirAll(testEmptyRepoDir, 0o755))
+		require.NoError(t, ctx.FS().MkdirAll(testEmptyRepoDir, fileperms.PublicDir))
 
 		// Missing sources file is valid - it means no external sources to download
 		err := extractor.ExtractSourcesFromRepo(
diff --git a/internal/utils/cloudinit/cloudconfig_test.go b/internal/utils/cloudinit/cloudconfig_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/microsoft/azure-linux-dev-tools/internal/global/testctx"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/cloudinit"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
@@ -264,7 +265,7 @@ func TestWriteDataFiles(t *testing.T) {
 			ctx := testctx.NewCtx()
 			dir := "/cloud-init"
 
-			require.NoError(t, ctx.FS().MkdirAll(dir, 0o755))
+			require.NoError(t, ctx.FS().MkdirAll(dir, fileperms.PublicDir))
 
 			metaDataPath, userDataPath, err := cloudinit.WriteDataFiles(ctx, dir, testCase.hostname, testCase.config)
 
diff --git a/internal/utils/fileutils/embedfs_test.go b/internal/utils/fileutils/embedfs_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/stretchr/testify/require"
 )
@@ -158,13 +159,13 @@ func TestEmbedFSReadOnlyOperations(t *testing.T) {
 		{
 			name: "Mkdir",
 			fn: func() error {
-				return embedfs.Mkdir("newdir", 0o755)
+				return embedfs.Mkdir("newdir", fileperms.PublicDir)
 			},
 		},
 		{
 			name: "MkdirAll",
 			fn: func() error {
-				return embedfs.MkdirAll("new/nested/dir", 0o755)
+				return embedfs.MkdirAll("new/nested/dir", fileperms.PublicDir)
 			},
 		},
 		{
@@ -188,7 +189,7 @@ func TestEmbedFSReadOnlyOperations(t *testing.T) {
 		{
 			name: "Chmod",
 			fn: func() error {
-				return embedfs.Chmod("testdata/embedfs/file1.txt", 0o644)
+				return embedfs.Chmod("testdata/embedfs/file1.txt", fileperms.PublicFile)
 			},
 		},
 		{
diff --git a/internal/utils/localrepo/localrepo_test.go b/internal/utils/localrepo/localrepo_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/microsoft/azure-linux-dev-tools/internal/global/testctx"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/localrepo"
 	"github.com/spf13/afero"
@@ -50,7 +51,7 @@ func TestPublisher_EnsureRepoExists_ExistingDirectory(t *testing.T) {
 	testFS := afero.NewMemMapFs()
 	ctx := testctx.NewCtx(testctx.WithFS(testFS))
 
-	require.NoError(t, testFS.MkdirAll(testRepoPath, 0o755))
+	require.NoError(t, testFS.MkdirAll(testRepoPath, fileperms.PublicDir))
 
 	publisher, err := localrepo.NewPublisher(ctx, testRepoPath, false)
 	require.NoError(t, err)
@@ -117,7 +118,7 @@ func TestPublisher_EnsureRepoInitialized_SkipsIfRepodataExists(t *testing.T) {
 	}
 
 	// Pre-create the repo with repodata directory.
-	require.NoError(t, testFS.MkdirAll(path.Join(testRepoPath, "repodata"), 0o755))
+	require.NoError(t, testFS.MkdirAll(path.Join(testRepoPath, "repodata"), fileperms.PublicDir))
 
 	publisher, err := localrepo.NewPublisher(ctx, testRepoPath, false)
 	require.NoError(t, err)
@@ -143,17 +144,17 @@ func TestPublisher_PublishRPMs_CopiesFilesAndRunsCreaterepoC(t *testing.T) {
 		return nil
 	}
 
-	require.NoError(t, testFS.MkdirAll(testRepoPath, 0o755))
+	require.NoError(t, testFS.MkdirAll(testRepoPath, fileperms.PublicDir))
 
 	// Create source RPM files.
 	sourcePath := "/build/output"
-	require.NoError(t, testFS.MkdirAll(sourcePath, 0o755))
+	require.NoError(t, testFS.MkdirAll(sourcePath, fileperms.PublicDir))
 
 	rpm1 := path.Join(sourcePath, "package-1.0-1.x86_64.rpm")
 	rpm2 := path.Join(sourcePath, "package-devel-1.0-1.x86_64.rpm")
 
-	require.NoError(t, fileutils.WriteFile(testFS, rpm1, []byte("rpm1 content"), 0o644))
-	require.NoError(t, fileutils.WriteFile(testFS, rpm2, []byte("rpm2 content"), 0o644))
+	require.NoError(t, fileutils.WriteFile(testFS, rpm1, []byte("rpm1 content"), fileperms.PublicFile))
+	require.NoError(t, fileutils.WriteFile(testFS, rpm2, []byte("rpm2 content"), fileperms.PublicFile))
 
 	publisher, err := localrepo.NewPublisher(ctx, testRepoPath, false)
 	require.NoError(t, err)
diff --git a/internal/utils/rootfs/rootfs_test.go b/internal/utils/rootfs/rootfs_test.go
@@ -765,7 +765,7 @@ func TestRootFs_Rename(t *testing.T) {
 
 		rootDir := t.TempDir()
 
-		originalPerm := os.FileMode(0o755)
+		originalPerm := fileperms.PublicExecutable
 
 		err := os.WriteFile(filepath.Join(rootDir, "perms.txt"), []byte("content"), originalPerm)
 		require.NoError(t, err)
@@ -887,7 +887,7 @@ func TestRootFs_Chmod(t *testing.T) {
 
 		defer rfs.Close()
 
-		err = rfs.Chmod("nonexistent", 0o755)
+		err = rfs.Chmod("nonexistent", fileperms.PublicExecutable)
 		require.Error(t, err)
 	})
 }
@@ -1432,7 +1432,7 @@ func TestRootFs_MkdirAllErrorCases(t *testing.T) {
 
 		// Ensure cleanup even if test fails.
 		defer func() {
-			_ = os.Chmod(restrictedDir, 0o755)
+			_ = os.Chmod(restrictedDir, fileperms.PublicDir)
 		}()
 
 		rfs, err := rootfs.New(rootDir)
@@ -1513,7 +1513,7 @@ func TestRootFs_RemoveAllErrorCases(t *testing.T) {
 
 		// Ensure cleanup.
 		defer func() {
-			_ = os.Chmod(subdir, 0o755)
+			_ = os.Chmod(subdir, fileperms.PublicDir)
 		}()
 
 		rfs, err := rootfs.New(rootDir)
@@ -1554,7 +1554,7 @@ func TestRootFs_RemoveAllErrorCases(t *testing.T) {
 		require.NoError(t, err)
 
 		defer func() {
-			_ = os.Chmod(protectedDir, 0o755)
+			_ = os.Chmod(protectedDir, fileperms.PublicDir)
 		}()
 
 		rfs, err := rootfs.New(rootDir)
@@ -1588,7 +1588,7 @@ func TestRootFs_RenameErrorCases(t *testing.T) {
 		require.NoError(t, err)
 
 		defer func() {
-			_ = os.Chmod(protectedDir, 0o755)
+			_ = os.Chmod(protectedDir, fileperms.PublicDir)
 		}()
 
 		rfs, err := rootfs.New(rootDir)
@@ -1620,12 +1620,12 @@ func TestRootFs_ChmodErrorCases(t *testing.T) {
 		defer rfs.Close()
 
 		// Chmod on directory should work.
-		err = rfs.Chmod("testdir", 0o755)
+		err = rfs.Chmod("testdir", fileperms.PublicDir)
 		require.NoError(t, err)
 
 		info, err := os.Stat(filepath.Join(rootDir, "testdir"))
 		require.NoError(t, err)
-		assert.Equal(t, os.FileMode(0o755), info.Mode().Perm())
+		assert.Equal(t, fileperms.PublicDir, info.Mode().Perm())
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`"github.com/microsoft/azure-linux-dev-tools/internal/global/opctx"`
`15`	`15`	`"github.com/microsoft/azure-linux-dev-tools/internal/projectconfig"`
	`16`	`+ "github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"`
`16`	`17`	`"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"`
`17`	`18`	`)`
`18`	`19`
`@@ -22,7 +23,7 @@ const (`
`22`	`23`	`DefaultWorkDir = "build/work"`
`23`	`24`	`defaultOutputDir = "out"`
`24`	`25`
`25`		`- defaultFilePerms = 0o644`
	`26`	`+ defaultFilePerms = fileperms.PublicFile`
`26`	`27`	`)`
`27`	`28`
`28`	`29`	`// ErrProjectRootAlreadyExists is returned when a project root directory already exists but an attempt`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"testing"`
`11`	`11`	`"time"`
`12`	`12`
	`13`	`+ "github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"`
`13`	`14`	`"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"`
`14`	`15`	`"github.com/stretchr/testify/require"`
`15`	`16`	`)`
`@@ -158,13 +159,13 @@ func TestEmbedFSReadOnlyOperations(t *testing.T) {`
`158`	`159`	`{`
`159`	`160`	`name: "Mkdir",`
`160`	`161`	`fn: func() error {`
`161`		`- return embedfs.Mkdir("newdir", 0o755)`
	`162`	`+ return embedfs.Mkdir("newdir", fileperms.PublicDir)`
`162`	`163`	`},`
`163`	`164`	`},`
`164`	`165`	`{`
`165`	`166`	`name: "MkdirAll",`
`166`	`167`	`fn: func() error {`
`167`		`- return embedfs.MkdirAll("new/nested/dir", 0o755)`
	`168`	`+ return embedfs.MkdirAll("new/nested/dir", fileperms.PublicDir)`
`168`	`169`	`},`
`169`	`170`	`},`
`170`	`171`	`{`
`@@ -188,7 +189,7 @@ func TestEmbedFSReadOnlyOperations(t *testing.T) {`
`188`	`189`	`{`
`189`	`190`	`name: "Chmod",`
`190`	`191`	`fn: func() error {`
`191`		`- return embedfs.Chmod("testdata/embedfs/file1.txt", 0o644)`
	`192`	`+ return embedfs.Chmod("testdata/embedfs/file1.txt", fileperms.PublicFile)`
`192`	`193`	`},`
`193`	`194`	`},`
`194`	`195`	`{`