feat: version command should show both app version and lunchpail version

Signed-off-by: Nick Mitchell <[email protected]>

Author: starpit

cmd/subcommands/version.go

@@ -12,12 +12,12 @@ var versionCmd = &cobra.Command{
 	Short: "version",
 	Long:  "version",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		version := lunchpail.Version()
-		if assembly.IsAssembled() {
-			version = assembly.AppVersion()
+		if assembly.IsAssembled() && assembly.AppVersion() != "" {
+			fmt.Printf("Application Version: %s\n", assembly.AppVersion())
 		}
 
-		fmt.Printf("%s\n", version)
+		fmt.Printf("  Lunchpail Version: %s\n", lunchpail.Version())
+
 		return nil
 	},
 }

tests/bin/deploy-tests.sh

@@ -77,7 +77,7 @@ if [[ -d "$2" ]] && [[ -f "$2"/version ]]
 then
     # Check that app version passes through
     expectedAppVersion=$(cat "$2"/version)
-    actualAppVersion=$($testapp version)
+    actualAppVersion=$($testapp version | grep 'Application Version' | awk '{print $NF}')
     if [[ "$expectedAppVersion" = "$actualAppVersion" ]]
     then echo "✅ PASS App Version passthrough $expectedAppVersion"
     else echo "❌ FAIL App Version passthrough expected!=actual '$expectedAppVersion'!='$actualAppVersion'" && exit 1