test (e2e) : Improve crc version assertion

Improve how to verify crc version output. Instead of just
doing a string match. Parse `crc version` JSON output and
verify each field.

Add a special condition for crc version, if it's not matching
but it's an actual date skip it.

Signed-off-by: Rohan Kumar <rohaan@redhat.com>

Author: rohanKanojia

test/e2e/features/basic.feature

@@ -6,8 +6,7 @@ Feature: Basic test
 
     @darwin @linux @windows @release
     Scenario: CRC version
-        When executing crc version command
-        Then stdout should contain correct version
+        Then crc version has expected output
 
     @darwin @linux @windows
     Scenario: CRC help

test/e2e/testsuite/testsuite.go

@@ -3,6 +3,7 @@ package testsuite
 import (
 	"context"
 	"crypto/tls"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"
@@ -404,8 +405,6 @@ func InitializeScenario(s *godog.ScenarioContext) {
 		util.CommandReturnShouldNotContain)
 	s.Step(`^(stdout|stderr|exitcode) (?:should|does not) contain$`,
 		util.CommandReturnShouldNotContainContent)
-	s.Step(`^(stdout|stderr|exitcode) (?:should contain|contains) correct version$`,
-		CommandReturnShouldContainCorrectVersion)
 
 	s.Step(`^(stdout|stderr|exitcode) (?:should equal|equals) "(.*)"$`,
 		util.CommandReturnShouldEqual)
@@ -554,6 +553,8 @@ func InitializeScenario(s *godog.ScenarioContext) {
 		EnsureMicroshiftClusterIsOperational)
 	s.Step(`^kubeconfig is cleaned up$`,
 		EnsureKubeConfigIsCleanedUp)
+	s.Step(`^crc version has expected output$`,
+		EnsureCrcVersionIsCorrect)
 
 	s.After(func(ctx context.Context, _ *godog.Scenario, err error) (context.Context, error) {
 
@@ -642,13 +643,39 @@ func CheckOutputMatchWithRetry(retryCount int, retryTime string, command string,
 	return matchErr
 }
 
-func CommandReturnShouldContainCorrectVersion() error {
-
-	if CRCVersion == "" {
-		return util.CommandReturnShouldContain("stdout", "version:")
+func EnsureCrcVersionIsCorrect() error {
+	err := util.ExecuteCommand("crc version -ojson")
+	if err != nil {
+		return fmt.Errorf("could not execute 'crc version -ojson' command: %v", err)
 	}
-
-	return util.CommandReturnShouldContain("stdout", CRCVersion)
+	crcVersionJSONOutput := util.GetLastCommandOutput("stdout")
+	type CrcVersionOutput struct {
+		Version           string `json:"version"`
+		Commit            string `json:"commit"`
+		OpenShiftVersion  string `json:"openshiftVersion"`
+		MicroShiftVersion string `json:"microshiftVersion"`
+	}
+	var crcVersionOutput CrcVersionOutput
+	err = json.Unmarshal([]byte(crcVersionJSONOutput), &crcVersionOutput)
+	if err != nil {
+		return fmt.Errorf("error in unmarshalling crc version output json: %v", err)
+	}
+	if crcVersionOutput.Version != version.GetCRCVersion() {
+		_, err := time.Parse("06.01.02", crcVersionOutput.Version)
+		if err != nil {
+			return fmt.Errorf("crc version doesn't match, expected '%s', actual '%s'", version.GetCRCVersion(), crcVersionOutput.Version)
+		}
+	}
+	if crcVersionOutput.Commit != version.GetCommitSha() {
+		return fmt.Errorf("crc version commit sha don't match, expected '%s', actual '%s'", version.GetCommitSha(), crcVersionOutput.Commit)
+	}
+	if len(crcVersionOutput.OpenShiftVersion) == 0 {
+		return fmt.Errorf("expected OpenShift version to be set in crc version output")
+	}
+	if len(crcVersionOutput.MicroShiftVersion) == 0 {
+		return fmt.Errorf("expected MicroShift version to be set in crc version output")
+	}
+	return nil
 }
 
 func CheckCRCStatus(state string) error {