Skip to content

Commit 0a734da

Browse files
committed
Improve upload archive progress bar
Signed-off-by: Michael Sverdlov <[email protected]>
1 parent 91f9a19 commit 0a734da

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

artifactory/commands/setup/setup.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,19 @@ func NewSetupCommand(packageManager project.ProjectType) *SetupCommand {
7171
}
7272
}
7373

74-
// GetSupportedPackageManagersList returns a sorted list of supported package managers.
75-
func GetSupportedPackageManagersList() []project.ProjectType {
74+
// GetSupportedPackageManagersList returns a sorted list of supported package manager names as strings.
75+
func GetSupportedPackageManagersList() []string {
7676
allSupportedPackageManagers := maps.Keys(packageManagerToRepositoryPackageType)
7777
// Sort keys based on their natural enum order
7878
slices.SortFunc(allSupportedPackageManagers, func(a, b project.ProjectType) int {
7979
return int(a) - int(b)
8080
})
81-
return allSupportedPackageManagers
81+
// Convert enums to their string representation
82+
result := make([]string, len(allSupportedPackageManagers))
83+
for i, manager := range allSupportedPackageManagers {
84+
result[i] = manager.String()
85+
}
86+
return result
8287
}
8388

8489
func IsSupportedPackageManager(packageManager project.ProjectType) bool {

artifactory/commands/setup/setup_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ func testBuildToolLoginCommandConfigureDotnetNuget(t *testing.T, packageManager
371371

372372
func TestGetSupportedPackageManagersList(t *testing.T) {
373373
result := GetSupportedPackageManagersList()
374-
// Check that Go is before Pip, and Pip is before Npm using GreaterOrEqual
375-
assert.GreaterOrEqual(t, slices.Index(result, project.Pip), slices.Index(result, project.Go), "Go should come before Pip")
376-
assert.GreaterOrEqual(t, slices.Index(result, project.Npm), slices.Index(result, project.Pip), "Pip should come before Npm")
374+
// Check that "Go" is before "Pip", and "Pip" is before "Npm"
375+
assert.GreaterOrEqual(t, slices.Index(result, project.Go.String()), slices.Index(result, project.Pip.String()), "Go should come before Pip")
376+
assert.GreaterOrEqual(t, slices.Index(result, project.Pip.String()), slices.Index(result, project.Npm.String()), "Pip should come before Npm")
377377
}
378378

379379
func TestIsSupportedPackageManager(t *testing.T) {

0 commit comments

Comments
 (0)