Skip to content

Commit bbfb589

Browse files
Merge pull request #66 from HumairAK/RHOAIENG-8225-bug-fix
UPSTREAM: <carry>: use asc artifact ordering by default.
2 parents 7d7659c + 41c133e commit bbfb589

File tree

6 files changed

+7
-12
lines changed

6 files changed

+7
-12
lines changed

backend/api/v2beta1/artifacts.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ message ListArtifactRequest {
8787

8888
// Optional. Ordering field. [default = ID]
8989
Field order_by_field = 2;
90-
// Optional. Can be either "asc" (ascending) or "dsc" (descending). [default = asc]
90+
// Optional. Can be either "asc" (ascending) or "desc" (descending). [default = asc]
9191
string order_by = 3;
9292

9393
// Optional. The next_page_token value returned from a previous List request, if any.

backend/api/v2beta1/go_client/artifacts.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/api/v2beta1/swagger/artifacts.swagger.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
},
5353
{
5454
"name": "order_by",
55-
"description": "Optional. Can be either \"asc\" (ascending) or \"dsc\" (descending). [default = asc].",
55+
"description": "Optional. Can be either \"asc\" (ascending) or \"desc\" (descending). [default = asc].",
5656
"in": "query",
5757
"required": false,
5858
"type": "string"

backend/api/v2beta1/swagger/kfp_api_single_file.swagger.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
},
6363
{
6464
"name": "order_by",
65-
"description": "Optional. Can be either \"asc\" (ascending) or \"dsc\" (descending). [default = asc].",
65+
"description": "Optional. Can be either \"asc\" (ascending) or \"desc\" (descending). [default = asc].",
6666
"in": "query",
6767
"required": false,
6868
"type": "string"

backend/src/apiserver/server/artifact_server.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,8 @@ func (s *ArtifactServer) ListArtifacts(ctx context.Context, r *apiv2beta1.ListAr
8282
orderByField := r.OrderByField.String()
8383

8484
orderByAsc := true
85-
switch r.OrderBy {
86-
case "asc":
87-
orderByAsc = true
88-
case "dsc":
85+
if r.OrderBy == "desc" {
8986
orderByAsc = false
90-
default:
91-
return nil, util.Wrap(err, "Invalid value for order_by, valid values are 'asc' or 'dsc'.")
9287
}
9388

9489
maxResultSize := r.MaxResultSize

backend/src/apiserver/server/artifact_server_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func TestListArtifacts(t *testing.T) {
190190
artifactRequest: &apiv2beta1.ListArtifactRequest{
191191
MaxResultSize: 2,
192192
Namespace: "test-namespace",
193-
OrderBy: "dsc",
193+
OrderBy: "desc",
194194
},
195195
expectedArtifacts: []*apiv2beta1.Artifact{artifact1, artifact0},
196196
wantErr: false,
@@ -200,7 +200,7 @@ func TestListArtifacts(t *testing.T) {
200200
artifactRequest: &apiv2beta1.ListArtifactRequest{
201201
MaxResultSize: 2,
202202
Namespace: "",
203-
OrderBy: "dsc",
203+
OrderBy: "desc",
204204
},
205205
expectedArtifacts: []*apiv2beta1.Artifact{artifact1, artifact0},
206206
wantErr: true,

0 commit comments

Comments
 (0)