Move age environment variable names to constants

getsops · Feb 25, 2022 · b7c58e4 · b7c58e4
1 parent 6bfd72d
commit b7c58e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/age/keysource.go b/age/keysource.go
@@ -21,6 +21,8 @@ func init() {
 }
 
 const privateKeySizeLimit = 1 << 24 // 16 MiB
+const SopsAgeKeyEnv = "SOPS_AGE_KEY"
+const SopsAgeKeyFileEnv = "SOPS_AGE_KEY_FILE"
 
 // MasterKey is an age key used to encrypt and decrypt sops' data key.
 type MasterKey struct {
@@ -100,15 +102,15 @@ func (key *MasterKey) Decrypt() ([]byte, error) {
 	var ageKeyReaderName string
 
 	if ageKeyReader == nil {
-		ageKey, ok := os.LookupEnv("SOPS_AGE_KEY")
+		ageKey, ok := os.LookupEnv(SopsAgeKeyEnv)
 		if ok {
 			ageKeyReader = strings.NewReader(ageKey)
 			ageKeyReaderName = "environment variable"
 		}
 	}
 
 	if ageKeyReader == nil {
-		ageKeyFilePath, ok := os.LookupEnv("SOPS_AGE_KEY_FILE")
+		ageKeyFilePath, ok := os.LookupEnv(SopsAgeKeyFileEnv)
 		if ok {
 			ageKeyFile, err := os.Open(ageKeyFilePath)
 			if err != nil {

diff --git a/age/keysource_test.go b/age/keysource_test.go
@@ -45,7 +45,7 @@ func TestAge(t *testing.T) {
 	assert.NoError(err)
 
 	_, filename, _, _ := runtime.Caller(0)
-	err = os.Setenv("SOPS_AGE_KEY_FILE", path.Join(path.Dir(filename), "keys.txt"))
+	err = os.Setenv(SopsAgeKeyFileEnv, path.Join(path.Dir(filename), "keys.txt"))
 	assert.NoError(err)
 
 	decryptedKey, err := key.Decrypt()
@@ -71,8 +71,8 @@ DOMAIN=files.127.0.0.1.nip.io`
 	assert.NoError(err)
 
 	_, filename, _, _ := runtime.Caller(0)
-	err = os.Setenv("SOPS_AGE_KEY_FILE", path.Join(path.Dir(filename), "keys.txt"))
-	defer os.Unsetenv("SOPS_AGE_KEY_FILE")
+	err = os.Setenv(SopsAgeKeyFileEnv, path.Join(path.Dir(filename), "keys.txt"))
+	defer os.Unsetenv(SopsAgeKeyFileEnv)
 	assert.NoError(err)
 
 	decryptedKey, err := key.Decrypt()
@@ -96,8 +96,8 @@ func TestAgeEnv(t *testing.T) {
 	_, filename, _, _ := runtime.Caller(0)
 	keysBytes, err := ioutil.ReadFile(path.Join(path.Dir(filename), "keys.txt"))
 	assert.NoError(err)
-	err = os.Setenv("SOPS_AGE_KEY", string(keysBytes))
-	defer os.Unsetenv("SOPS_AGE_KEY")
+	err = os.Setenv(SopsAgeKeyEnv, string(keysBytes))
+	defer os.Unsetenv(SopsAgeKeyEnv)
 	assert.NoError(err)
 
 	decryptedKey, err := key.Decrypt()