Skip to content
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

Jump to bottom

feat: support apt colon arch syntax #38

Merged
merged 9 commits into from
May 1, 2024
Merged

feat: support apt colon arch syntax #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3468eae
feat: support apt colon arch syntax
NotBobTheBuilder Apr 24, 2024
ce0e02e
something toward a test but not quite there
NotBobTheBuilder Apr 24, 2024
1ebcbd3
include acme-tiny in examples
NotBobTheBuilder Apr 26, 2024
411b372
package_resolution_test case
NotBobTheBuilder Apr 29, 2024
8eebc08
gcc cases
NotBobTheBuilder Apr 29, 2024
0d4bc02
trailing commas
NotBobTheBuilder Apr 29, 2024
30cc20f
Merge remote-tracking branch 'origin/main' into apt-colon-arch-syntax
NotBobTheBuilder May 1, 2024
bec03f6
remove apt example package dep
NotBobTheBuilder May 1, 2024
7065d2b
@bullseye//:lock again
NotBobTheBuilder May 1, 2024
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
9 changes: 9 additions & 0 deletions apt/private/package_resolution.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ def _parse_dep(raw):

version = (version_and_const[:vconst_i], version_and_const[vconst_i + 1:])

# Depends: python3:any
# is equivalent to
# Depends: python3 [any]
colon_i = raw.find(":")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you add some tests for this here: https://github.com/GoogleContainerTools/rules_distroless/blob/main/apt/tests/package_resolution_test.bzl

if colon_i != -1:
arch_after_colon = raw[colon_i + 1:]
raw = raw[:colon_i]
archs = [arch_after_colon.strip()]

name = raw.strip()
return {"name": name, "version": version, "arch": archs}

Expand Down
40 changes: 40 additions & 0 deletions apt/tests/package_resolution_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,46 @@ def _parse_depends_test(ctx):
package_resolution.parse_depends("libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], autoconf, debhelper (>> 5.0.0), file, libc6 (>= 2.7-1), libpaper1, psutils"),
)

asserts.equals(
env,
[
{"name": "python3", "version": None, "arch": ["any"]},
],
package_resolution.parse_depends("python3:any"),
)

asserts.equals(
env,
[
[
{"name": "gcc-i686-linux-gnu", "version": (">=", "4:10.2"), "arch": None},
{"name": "gcc", "version": None, "arch": ["i386"]},
],
[
{"name": "g++-i686-linux-gnu", "version": (">=", "4:10.2"), "arch": None},
{"name": "g++", "version": None, "arch": ["i386"]},
],
{"name": "dpkg-cross", "version": None, "arch": None},
],
package_resolution.parse_depends("gcc-i686-linux-gnu (>= 4:10.2) | gcc:i386, g++-i686-linux-gnu (>= 4:10.2) | g++:i386, dpkg-cross"),
)

asserts.equals(
env,
[
[
{"name": "gcc-x86-64-linux-gnu", "version": (">=", "4:10.2"), "arch": None},
{"name": "gcc", "version": None, "arch": ["amd64"]},
],
[
{"name": "g++-x86-64-linux-gnu", "version": (">=", "4:10.2"), "arch": None},
{"name": "g++", "version": None, "arch": ["amd64"]},
],
{"name": "dpkg-cross", "version": None, "arch": None},
],
package_resolution.parse_depends("gcc-x86-64-linux-gnu (>= 4:10.2) | gcc:amd64, g++-x86-64-linux-gnu (>= 4:10.2) | g++:amd64, dpkg-cross"),
)

return unittest.end(env)

version_depends_test = unittest.make(_parse_depends_test)
Loading
Loading