From 77f3a265d74d805e3cd5513d731af0be1a5ab2a1 Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Wed, 24 Apr 2024 11:49:00 -0400 Subject: [PATCH 1/3] Switch to pulp-ubi image --- compose_files/pulp/docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compose_files/pulp/docker-compose.yml b/compose_files/pulp/docker-compose.yml index 7c3c98a..1cf0f2e 100644 --- a/compose_files/pulp/docker-compose.yml +++ b/compose_files/pulp/docker-compose.yml @@ -21,7 +21,7 @@ services: timeout: 3s migration_service: - image: "quay.io/cloudservices/pulp-rpm-ubi:latest" + image: "quay.io/cloudservices/pulp-ubi:latest" depends_on: postgres: condition: service_healthy @@ -32,7 +32,7 @@ services: - "pulp:/var/lib/pulp" set_init_password_service: - image: "quay.io/cloudservices/pulp-rpm-ubi:latest" + image: "quay.io/cloudservices/pulp-ubi:latest" command: set_init_password.sh depends_on: migration_service: @@ -53,7 +53,7 @@ services: test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] pulp_api: - image: "quay.io/cloudservices/pulp-rpm-ubi:latest" + image: "quay.io/cloudservices/pulp-ubi:latest" deploy: replicas: 1 command: [ 'pulp-api' ] @@ -75,7 +75,7 @@ services: restart: always pulp_content: - image: "quay.io/cloudservices/pulp-rpm-ubi:latest" + image: "quay.io/cloudservices/pulp-ubi:latest" deploy: replicas: 1 command: [ 'pulp-content' ] @@ -111,7 +111,7 @@ services: restart: always pulp_worker: - image: "quay.io/cloudservices/pulp-rpm-ubi:latest" + image: "quay.io/cloudservices/pulp-ubi:latest" deploy: replicas: 1 command: [ 'pulp-worker' ] From 6060fc2b69f73735d08b47c7f2e85124f92f22f8 Mon Sep 17 00:00:00 2001 From: Andrew Dewar Date: Wed, 24 Apr 2024 16:02:22 +0100 Subject: [PATCH 2/3] Fixes 4015: Force order by issued-date desc --- pkg/tangy/rpm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tangy/rpm.go b/pkg/tangy/rpm.go index 6863055..78f8534 100644 --- a/pkg/tangy/rpm.go +++ b/pkg/tangy/rpm.go @@ -310,7 +310,7 @@ func (t *tangyImpl) RpmRepositoryVersionErrataList(ctx context.Context, hrefs [] args["limit"] = pageOpts.Limit args["offset"] = pageOpts.Offset rows, err := conn.Query(ctx, queryOpen+innerUnion+filterQuery+ - " ORDER BY re.id ASC, re.title ASC, re.issued_date ASC, re.type ASC, re.severity ASC LIMIT @limit OFFSET @offset", + " ORDER BY re.issued_date DESC, re.title ASC, re.type ASC, re.severity ASC LIMIT @limit OFFSET @offset", args) if err != nil { return nil, 0, err From 803f9d24aaff6cd5ff86b04e3ab0de66d84cff26 Mon Sep 17 00:00:00 2001 From: Andrew Dewar Date: Wed, 24 Apr 2024 18:35:22 +0100 Subject: [PATCH 3/3] Fix tests --- internal/test/integration/rpm_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/test/integration/rpm_test.go b/internal/test/integration/rpm_test.go index 6e0702b..79bb1fa 100644 --- a/internal/test/integration/rpm_test.go +++ b/internal/test/integration/rpm_test.go @@ -257,21 +257,21 @@ func (r *RpmSuite) TestRpmRepositoryVersionErrataListFilter() { singleList, total, err := r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Search: ""}, tangy.PageOptions{}) require.NoError(r.T(), err) assert.NotEmpty(r.T(), singleList) - assert.Equal(r.T(), total, 5) + assert.Equal(r.T(), total, 6) // test limit singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{}, tangy.PageOptions{Limit: 1}) require.NoError(r.T(), err) assert.NotEmpty(r.T(), singleList) assert.Equal(r.T(), len(singleList), 1) - assert.Equal(r.T(), total, 5) + assert.Equal(r.T(), total, 6) // test offset singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{}, tangy.PageOptions{Offset: 3}) require.NoError(r.T(), err) assert.NotEmpty(r.T(), singleList) - assert.Equal(r.T(), len(singleList), 2) - assert.Equal(r.T(), total, 5) + assert.Equal(r.T(), len(singleList), 3) + assert.Equal(r.T(), total, 6) // id filter partial singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Search: "0055"}, tangy.PageOptions{}) @@ -283,13 +283,13 @@ func (r *RpmSuite) TestRpmRepositoryVersionErrataListFilter() { singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Type: []string{"security"}}, tangy.PageOptions{}) require.NoError(r.T(), err) assert.NotEmpty(r.T(), singleList) - assert.Equal(r.T(), total, 3) + assert.Equal(r.T(), total, 4) // multiple types filter singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Type: []string{"security", "enhancement"}}, tangy.PageOptions{}) require.NoError(r.T(), err) assert.NotEmpty(r.T(), singleList) - assert.Equal(r.T(), total, 4) + assert.Equal(r.T(), total, 5) // type filter partial (empty) emptyList, total, err := r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Type: []string{"secu"}}, tangy.PageOptions{}) @@ -298,19 +298,19 @@ func (r *RpmSuite) TestRpmRepositoryVersionErrataListFilter() { assert.Equal(r.T(), total, 0) // severity filter - singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"low"}}, tangy.PageOptions{}) + singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"Low"}}, tangy.PageOptions{}) require.NoError(r.T(), err) assert.NotEmpty(r.T(), singleList) assert.Equal(r.T(), total, 1) // multiple severities filter - singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"low", "Unknown"}}, tangy.PageOptions{}) + singleList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"Low", "Unknown"}}, tangy.PageOptions{}) require.NoError(r.T(), err) assert.NotEmpty(r.T(), singleList) - assert.Equal(r.T(), total, 5) + assert.Equal(r.T(), total, 3) // severity filter partial (empty) - emptyList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"lo"}}, tangy.PageOptions{}) + emptyList, total, err = r.tangy.RpmRepositoryVersionErrataList(context.Background(), []string{*firstVersionHref}, tangy.ErrataListFilters{Severity: []string{"Lo"}}, tangy.PageOptions{}) require.NoError(r.T(), err) assert.Empty(r.T(), emptyList) assert.Equal(r.T(), total, 0)