Merge pull request #4327 from GodloveD/backport-encrypt-env-var-fix

GodloveD · web-flow · commit 798c7c16f0e0 · 2019-08-28T21:58:08.000-06:00
Fix cli to use pem path envvar
diff --git a/cmd/internal/cli/build_linux.go b/cmd/internal/cli/build_linux.go
@@ -375,13 +375,13 @@ func getEncryptionMaterial(cmd *cobra.Command) (crypt.KeyInfo, error) {
 	}
 
 	if pemPathEnvOK {
-		exists, err := fs.FileExists(encryptionPEMPath)
+		exists, err := fs.FileExists(pemPathEnv)
 		if err != nil {
-			sylog.Fatalf("Unable to verify existence of %s: %v", encryptionPEMPath, err)
+			sylog.Fatalf("Unable to verify existence of %s: %v", pemPathEnv, err)
 		}
 
 		if !exists {
-			sylog.Fatalf("Specified PEM file %s: does not exist.", encryptionPEMPath)
+			sylog.Fatalf("Specified PEM file %s: does not exist.", pemPathEnv)
 		}
 
 		sylog.Verbosef("Using pem path environment variable for encrypted container")

Original file line number	Diff line number	Diff line change
`@@ -375,13 +375,13 @@ func getEncryptionMaterial(cmd *cobra.Command) (crypt.KeyInfo, error) {`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`if pemPathEnvOK {`
`378`		`- exists, err := fs.FileExists(encryptionPEMPath)`
	`378`	`+ exists, err := fs.FileExists(pemPathEnv)`
`379`	`379`	`if err != nil {`
`380`		`- sylog.Fatalf("Unable to verify existence of %s: %v", encryptionPEMPath, err)`
	`380`	`+ sylog.Fatalf("Unable to verify existence of %s: %v", pemPathEnv, err)`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`if !exists {`
`384`		`- sylog.Fatalf("Specified PEM file %s: does not exist.", encryptionPEMPath)`
	`384`	`+ sylog.Fatalf("Specified PEM file %s: does not exist.", pemPathEnv)`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`sylog.Verbosef("Using pem path environment variable for encrypted container")`