Skip to content

respect arch param when sort=semver in [DockerVersion] badge #10905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

respect arch param when sort=semver in [DockerVersion] badge #10905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions services/docker/docker-fixtures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2998,11 +2998,55 @@ const versionDataWithVaryingArchitectures = [
{ name: '2.6', images: [] },
]

const versionDataWithArchSpecificVersions = [
{
name: '3.8-arm64',
images: [
{
digest:
'sha256:3d62c3ceeba113f72efaaf3a35d83081963fa2cd29be76ed1aaa87b59f6f8eae',
architecture: 'arm64',
},
],
},
{
name: '3.8-amd64',
images: [
{
digest:
'sha256:661bdba24d94ee8f1e4002eb3a87d7062244dd2583fb294471e9e00a7bfba45d',
architecture: 'amd64',
},
],
},
{
name: '3.9-arm64',
images: [
{
digest:
'sha256:1c1d100e50a7684afcbdc82929de1bc79bee8adcaafd367c38e5aa7eed4d6e19',
architecture: 'arm64',
},
],
},
{
name: '3.9-amd64',
images: [
{
digest:
'sha256:faf4f034c82d40b66a7285a5e9d305f543a2726961cc6da11206770ef013244e',
architecture: 'amd64',
},
],
},
]

export {
sizeDataNoTagSemVerSort,
versionDataNoTagDateSort,
versionPagedDataNoTagDateSort,
versionDataNoTagSemVerSort,
versionDataWithTag,
versionDataWithVaryingArchitectures,
versionDataWithArchSpecificVersions,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Today in "naming things is hard"

}
9 changes: 8 additions & 1 deletion services/docker/docker-version.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,14 @@ export default class DockerVersion extends BaseJsonService {
const { digest } = imageTag
return { version: getDigestSemVerMatches({ data: pagedData, digest }) }
} else if (!tag && sort === 'semver') {
const matches = data.map(d => d.name)
const matches = data
.filter(d => d.images.some(image => image.architecture === arch))
.map(d => d.name)
if (matches.length === 0) {
throw new InvalidResponse({
prettyMessage: `no images found for arch ${arch}`,
})
}
return { version: latest(matches) }
} else {
version = data.find(d => d.name === tag)
Expand Down
8 changes: 8 additions & 0 deletions services/docker/docker-version.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
versionDataNoTagSemVerSort,
versionDataWithTag,
versionDataWithVaryingArchitectures,
versionDataWithArchSpecificVersions,
} from './docker-fixtures.js'

describe('DockerVersion', function () {
Expand Down Expand Up @@ -65,6 +66,13 @@ describe('DockerVersion', function () {
}).expect({
version: '3.10.4',
})
given({
data: versionDataWithArchSpecificVersions,
sort: 'semver',
arch: 'arm64',
}).expect({
version: '3.9-arm64',
})
})

it('throws InvalidResponse error with latest tag and no amd64 architecture digests', function () {
Expand Down
Loading