Order package revisions

kptdev · Apr 22, 2022 · 5abfb37 · 5abfb37
1 parent c1e49b9
commit 5abfb37
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/e2e/testdata/porch/rpkg-get/config.yaml b/e2e/testdata/porch/rpkg-get/config.yaml
@@ -15,10 +15,10 @@ commands:
       - --output=custom-columns=NAME:.metadata.name,PKG:.spec.packageName,REPO:.spec.repository,REV:.spec.revision
     stdout: |
       NAME                                                       PKG      REPO              REV
-      test-blueprints-526fa27229adcc3b6a9a544c455c344a3b4d7597   basens   test-blueprints   v1
-      test-blueprints-e78ee77d9560703561c2656c97c77e9abb8c4c53   empty    test-blueprints   v1
       test-blueprints-9626794e984ff13c9a4c64df5af0f15ec3a146bf   basens   test-blueprints   main
+      test-blueprints-526fa27229adcc3b6a9a544c455c344a3b4d7597   basens   test-blueprints   v1
       test-blueprints-58fffeb908ead18e2c05c873e61bff11a5292963   empty    test-blueprints   main
+      test-blueprints-e78ee77d9560703561c2656c97c77e9abb8c4c53   empty    test-blueprints   v1
   - args:
       - alpha
       - rpkg
@@ -38,5 +38,5 @@ commands:
       - --output=custom-columns=NAME:.metadata.name,PKG:.spec.packageName,REPO:.spec.repository,REV:.spec.revision
     stdout: |
       NAME                                                       PKG      REPO              REV
-      test-blueprints-526fa27229adcc3b6a9a544c455c344a3b4d7597   basens   test-blueprints   v1
       test-blueprints-9626794e984ff13c9a4c64df5af0f15ec3a146bf   basens   test-blueprints   main
+      test-blueprints-526fa27229adcc3b6a9a544c455c344a3b4d7597   basens   test-blueprints   v1
diff --git a/porch/repository/pkg/cache/repository.go b/porch/repository/pkg/cache/repository.go
@@ -16,6 +16,8 @@ package cache
 
 import (
 	"context"
+	"sort"
+	"strings"
 	"sync"
 	"time"
 
@@ -320,5 +322,34 @@ func toPackageRevisionSlice(cached []*cachedPackageRevision, filter repository.L
 			result = append(result, p)
 		}
 	}
+	sort.Slice(result, func(i, j int) bool {
+		ki, kl := result[i].Key(), result[j].Key()
+		switch res := strings.Compare(ki.Package, kl.Package); {
+		case res < 0:
+			return true
+		case res > 0:
+			return false
+		default:
+			// Equal. Compare next element
+		}
+		switch res := strings.Compare(ki.Revision, kl.Revision); {
+		case res < 0:
+			return true
+		case res > 0:
+			return false
+		default:
+			// Equal. Compare next element
+		}
+		switch res := strings.Compare(string(result[i].Lifecycle()), string(result[j].Lifecycle())); {
+		case res < 0:
+			return true
+		case res > 0:
+			return false
+		default:
+			// Equal. Compare next element
+		}
+
+		return strings.Compare(result[i].KubeObjectName(), result[j].KubeObjectName()) < 0
+	})
 	return result
 }