CR and testsFixes

asafambar · Feb 28, 2024 · 36476a8 · 36476a8
1 parent 1bec57a
commit 36476a8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/commands/curation/curationaudit.go b/commands/curation/curationaudit.go
@@ -65,21 +65,16 @@ var supportedTech = map[coreutils.Technology]func(ca *CurationAuditCommand) (boo
 }
 
 func (ca *CurationAuditCommand) checkSupportByVersionOrEnv(tech coreutils.Technology, minRtVersion, minXrayVersion, envName string) (bool, error) {
-	flag, errResolveFlag := clientutils.GetBoolEnvValue(envName, false)
-	if errResolveFlag != nil {
-		log.Error(errResolveFlag)
-	}
-	if flag {
+	if flag, err := clientutils.GetBoolEnvValue(envName, false); flag {
 		return true, nil
+	} else if err != nil {
+		log.Error(err)
 	}
-	rtManager, serverDetails, err := ca.getRtManagerAndAuth(tech)
-	if err != nil {
-		return false, err
-	}
-	rtVersion, err := rtManager.GetVersion()
+	rtVersion, serverDetails, err := ca.getRtVersionAndServiceDetails(tech)
 	if err != nil {
 		return false, err
 	}
+
 	_, xrayVersion, err := utils.CreateXrayServiceManagerAndGetVersion(serverDetails)
 	if err != nil {
 		return false, err
@@ -94,6 +89,18 @@ func (ca *CurationAuditCommand) checkSupportByVersionOrEnv(tech coreutils.Techno
 	return true, nil
 }
 
+func (ca *CurationAuditCommand) getRtVersionAndServiceDetails(tech coreutils.Technology) (string, *config.ServerDetails, error) {
+	rtManager, serveDetails, err := ca.getRtManagerAndAuth(tech)
+	if err != nil {
+		return "", nil, err
+	}
+	rtVersion, err := rtManager.GetVersion()
+	if err != nil {
+		return "", nil, err
+	}
+	return rtVersion, serveDetails, err
+}
+
 type ErrorsResp struct {
 	Errors []ErrorResp `json:"errors"`
 }

diff --git a/commands/curation/curationaudit_test.go b/commands/curation/curationaudit_test.go
@@ -163,7 +163,7 @@ func TestGetNameScopeAndVersion(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			gotDownloadUrl, gotName, gotScope, gotVersion := getNpmNameScopeAndVersion(tt.componentId, tt.artiUrl, tt.repo, tt.repo)
-			assert.Equal(t, tt.wantDownloadUrl, gotDownloadUrl, "getNameScopeAndVersion() gotDownloadUrl = %v, want %v", gotDownloadUrl, tt.wantDownloadUrl)
+			assert.Equal(t, tt.wantDownloadUrl, gotDownloadUrl[0], "getNameScopeAndVersion() gotDownloadUrl = %v, want %v", gotDownloadUrl[0], tt.wantDownloadUrl)
 			assert.Equal(t, tt.wantName, gotName, "getNpmNameScopeAndVersion() gotName = %v, want %v", gotName, tt.wantName)
 			assert.Equal(t, tt.wantScope, gotScope, "getNpmNameScopeAndVersion() gotScope = %v, want %v", gotScope, tt.wantScope)
 			assert.Equal(t, tt.wantVersion, gotVersion, "getNpmNameScopeAndVersion() gotVersion = %v, want %v", gotVersion, tt.wantVersion)
@@ -401,7 +401,7 @@ func fillSyncedMap(pkgStatus []*PackageStatus) *sync.Map {
 	return &syncMap
 }
 
-func TestDoCurationAuditNpm(t *testing.T) {
+func TestDoCurationAudit(t *testing.T) {
 	tests := getTestCasesForDoCurationAudit()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {