Merge pull request apptainer#129 from edytuk/sifv2.3.2

Merge sylabs/sif through v2.3.2

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install Lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.43
+          version: v1.44
           skip-pkg-cache: true
           skip-build-cache: true
 

.golangci.yml

@@ -12,12 +12,15 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
+    - containedctx
     - contextcheck
     - deadcode
+    - decorder
     - depguard
     - dogsled
     - dupl
     - errcheck
+    - errchkjson
     - errname
     - errorlint
     - exportloopref
@@ -33,9 +36,11 @@ linters:
     - gosec
     - gosimple
     - govet
+    - grouper
     - ineffassign
     - ireturn
     - lll
+    - maintidx
     - misspell
     - nilnil
     - nolintlint

.goreleaser.yml

@@ -20,8 +20,8 @@ builds:
       - arm
       - arm64
     goarm:
-      - 6
-      - 7
+      - '6'
+      - '7'
     env:
       - CGO_ENABLED=0
     flags: '-trimpath'
@@ -31,7 +31,7 @@ builds:
 
 archives:
   - format: tar.gz
-    wrap_in_directory: true
+    wrap_in_directory: 'true'
     name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
     files:
       - README.md

LICENSE.md

@@ -6,7 +6,7 @@ Copyright (c) Contributors to the Apptainer project, established as
 - For website terms of use, trademark policy, privacy policy and other
   project policies see: [LF_POLICIES](https://lfprojects.org/policies)
 
-Copyright (c) 2018-2021, Sylabs Inc. All rights reserved.
+Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

go.mod

@@ -3,7 +3,7 @@ module github.com/apptainer/sif/v2
 go 1.17
 
 require (
-	github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3
+	github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f
 	github.com/blang/semver/v4 v4.0.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/google/uuid v1.3.0

go.sum

@@ -54,8 +54,8 @@ github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
-github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3 h1:XcF0cTDJeiuZ5NU8w7WUDge0HRwwNRmxj/GGk6KSA6g=
-github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
+github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f h1:J2FzIrXN82q5uyUraeJpLIm7U6PffRwje2ORho5yIik=
+github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
 github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

internal/app/siftool/testdata/TestApp_Dump/Three.golden

@@ -4,12 +4,12 @@ Hash: SHA256
 {"version":1,"header":{"digest":"sha256:635fa0a14a8ef0c0351ed3e985799ed1d4f75ce973dea3cc76c99710795cc3f1"},"objects":[{"relativeId":0,"descriptorDigest":"sha256:3634ad01db0dd5482ecf685267b53d6201690438ca27c3d7ea91c971a1f41f92","objectDigest":"sha256:004dfc8da678c309de28b5386a1e9efd57f536b150c40d29b31506aa0fb17ec2"},{"relativeId":1,"descriptorDigest":"sha256:db74cb63348414def73535c9f0f83e8ad7df61229ed2806f4da8b69d6d7464d6","objectDigest":"sha256:5f78c33274e43fa9de5659265c1d917e25c03722dcb0b8d27db8d5feaa813953"}]}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBCAAnBQJe+oD0CZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AABQ4QgAkWcLNLcghZ96VnJ9+67qbsdwp51rfERCKN0dZLBTHKN5Qjn1BWM/XbPj
-Qnl0F6D6YBId7c/KO0sbb3EHUdpmMEQlouQYFOTHWtdyvwO6spRLBx5EQA7Iv0rF
-jREz/jC7GaREK94u+hXRr94+FH5gEnHUL+Vg7pW/+cGiwLY1ddoL8ELgYhxqxd9J
-sET+vU1E4GJ3TyYFhVFsMsNeW7dQauqjQSJxMLTwXNphxTH19ePbJ2uDE2UJ3fn7
-up5ruugRyEe5qgRICGxRSDp8/INGRvoDUi32T9uLORzS+umRX5YW0b6RWD+5R72V
-0ewbMTJIx2lpfQGPMWROwcF7nkLdWQ==
-=WWGX
+wsBzBAEBCAAnBQJe+oD0CZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AADY9ggAlW/Y+BssNOLcCAiu0dzZCf5BfbzmOUQ+VNajAsZyOIJnW1t19lDYoRNx
+x3YolyyRfEmw9Kf1n6fctDHGPyzRIIOc1/0CVQzNzfKZQO+x0+9qvurILADijY/3
+1DKqhbxoO2a5iASXYHH9yYs3J82N3EKEYyFdDMTcHs4UijUnHvwcTt0smY6JQ9Su
+vssWg+3qltuVjiYOQPgg9XR5i8suXE76poit9Ftp7jOD9eYtVcUEKRZLrVCsDJu9
+77QvejJmgquueYX4pM2EuH9EOFnDV3gl4Cuocsn5OLDgfhYuT1t5Hay1iAPpJqm6
+/EXQY7CECByIj6TCFurfXwc+uYSD9Q==
+=rZoe
 -----END PGP SIGNATURE-----

pkg/integrity/testdata/TestSignAndEncodeJSON/DefaultHash.golden

@@ -4,12 +4,12 @@ Hash: SHA256
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AABw3Af+JOwZe9vRSBAUbuv0akGte0vmiyBAOOJgMgP8G6PtSVMOuyk87hMs9WyB
-Gfgm8st0jkYsCP60lSziNd24cevrqSW+8CnbcWuyhSpl9DBtKnjt/BXc0AturkQA
-/8Yn/9XImSYGrcqjJeCWhVBrJTlPaYu8swbXhvDoHvrVG/t6POO4xYumN3Nf8uoY
-zP8TtK8L1c2H1sY1MbngL/rVaFapdChQw8XCc280JMqnnjixnqSdjaeVPoQJItjG
-m6k2nTUBn7OS9lHYRc9batc38ty13tVSCSd62nvfQILL5YOPqfRtGJzLU0LGMrIO
-aJv5oAPI8SaPaFGuFOPxc7oTckNCIw==
-=FYE/
+wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AACREgf8DNQbgGAyNKBnKtjx5pPBu0XUNNM0tEsaBM4RbWA68W0KzS6XefIeuRs4
+73JQh+YcLUcb3kffyezb3VFn4wUjZmTJEwi6uPldSJYrex4mLSzKDukj7D4ZaAvc
+qk1rFfi/rwFTAPGA10j1UAwfHEcv+dNZc0LdIEcKNxL2SxACMMrs5LjncQcNBKLe
+ATlaMLV4fQ3MKDRdopi7U7tkH3vaF9QyrD2pxI0yCdRyRy0Xlc4i60zbE7wWPGJx
+E3EWFIylZyKzAbZlz4pSUWqts08+wAbWbwg0EPrsLd3ZV5LkO2aFlyqS1/A73sYb
+4QRf6OiFm24EfTVcfbKeiTG/obwv/w==
+=OJk4
 -----END PGP SIGNATURE-----

pkg/integrity/testdata/TestSignAndEncodeJSON/SHA1.golden

@@ -4,12 +4,12 @@ Hash: SHA1
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBAgAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AACnHAf+J7rou/ZbPfY+fodtzyIBTrCKyYv4R37Kiu7DQclLfBDvEiRp8ISo6VqE
-siGSUapkKCyAzgKcSs3W/A2PFdeI+w5qZ4+Vb/SMjtLCBraKdukNVbsXw8JcE9Mb
-mJGFkVvZu5afpNDQqiNAOJnpV4J1+jpnAZAMu7TQs1FmN6/hCwo4GLCtFDwbI8fO
-dPna3k1lNB/M0UDiPMhn2qdF6vMWF1m41aQ5CwvCAsMOFZi+3sBA8yZngXJ29fjL
-Wng0xaFZPfR/3dEFhlMcqCpM4OFpsVTP5b99GPXUEwaZpwPJuGVUSk7Ck8hfbndQ
-pCYg/sAXojQj69Ymc88utJq4GfR7eg==
-=EY0t
+wsBzBAEBAgAnBQJZr0CRCZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AACQnAf/XWNnfBZfoOffU9YBG4JIGbo1fBuO0NbxlP22zpiS9NM2CViTHmpmqe7K
+9d53CXsHrpQB1Oc+h5c5QsWjOl3girXO8du9833lygsFGjK3Q9mc0cfrXoEMOw+N
+B0hMq/JxQVOfdBn0Z5YF6Sfkjkifhm36GpNB8I3QmuIu3kd2nIfa6WLo7h4txKFU
+0ZPxRZ8IWFTTBEhWwSUrR30cOr5PvQfu0oTZ7xxkeUPudmxNXBad6uunyXyBkhmq
+m0fMZyCbPeRc5gvUsAnxSDAKU5Ryj6GIUBpBv7c3AXwfusO4HAaOQi+BZDTjMVBF
+AXJc73L0mvJvX9dOEnmd6D7xylclHQ==
+=BpCt
 -----END PGP SIGNATURE-----

pkg/integrity/testdata/TestSignAndEncodeJSON/SHA224.golden

@@ -4,12 +4,12 @@ Hash: SHA224
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBCwAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AADZhQf8DDXI6Ac4RQwpb6dWEhSOKiKC/voPS1+NGEvFeZ0XE9aqdXgPxQkT5RSJ
-sAG7Hoe8tRRrcagXgcHSGVOnE6tqpL6CITFs6g5MtvlZRxRftpNEHo4xqbUMM1ce
-JPBKrg0u4nCARdq3XCQbuUjVJ2R24XojBjfBXsmNzDsiyekYyllpK/mmWouzQSdC
-IU1sa6/P0JyA0vYzuYPOAqJgFO/cRzXSDEuqW6I07kIbKCHi1joGYb5xVUofJ+2B
-Rt3QnlNrTzMCUxLYE6Rzy0JyzjpjhozY5ldVRkE2NrFkxrgLrItCIMNPjqud7n88
-/DPHuLBdTK6+g6qVMUBLF8QKB5X3yA==
-=Npht
+wsBzBAEBCwAnBQJZr0CRCZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AAAUHAf/dqGFWKI+MUyORdqqKsT0WT9sPMgWVJ7ZRdCIxoWC1bXr0FUmhz07LRhz
+zoCIz5KNeRG3D3jNfPIp5kbWBV1P/xSQtF5tCz40x2efw+Rf2HVdeYnzJkEeaoFJ
+oSNkYjzycSS2V0lOsWf1VylxiLuJR/c/FiyEHz2u+DYUvkpwN+iSDMBMJGwxNskQ
++Wt6X8sUDm/Gf28XjJdPj4fEHrrQZc2XCsuCqUVVt3O4vsTTENVkFh0fPGQhIpZG
+U6nx9DA6mEIxoCQPV7poFES5vpw8gp3dGyqAJuOEimhA0yr5P2cNyBWtYVOlfuvq
+LK0StjUGYMaZ73txBrtuSaeipVYyyQ==
+=xSfK
 -----END PGP SIGNATURE-----

pkg/integrity/testdata/TestSignAndEncodeJSON/SHA256.golden

@@ -4,12 +4,12 @@ Hash: SHA256
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AABw3Af+JOwZe9vRSBAUbuv0akGte0vmiyBAOOJgMgP8G6PtSVMOuyk87hMs9WyB
-Gfgm8st0jkYsCP60lSziNd24cevrqSW+8CnbcWuyhSpl9DBtKnjt/BXc0AturkQA
-/8Yn/9XImSYGrcqjJeCWhVBrJTlPaYu8swbXhvDoHvrVG/t6POO4xYumN3Nf8uoY
-zP8TtK8L1c2H1sY1MbngL/rVaFapdChQw8XCc280JMqnnjixnqSdjaeVPoQJItjG
-m6k2nTUBn7OS9lHYRc9batc38ty13tVSCSd62nvfQILL5YOPqfRtGJzLU0LGMrIO
-aJv5oAPI8SaPaFGuFOPxc7oTckNCIw==
-=FYE/
+wsBzBAEBCAAnBQJZr0CRCZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AACREgf8DNQbgGAyNKBnKtjx5pPBu0XUNNM0tEsaBM4RbWA68W0KzS6XefIeuRs4
+73JQh+YcLUcb3kffyezb3VFn4wUjZmTJEwi6uPldSJYrex4mLSzKDukj7D4ZaAvc
+qk1rFfi/rwFTAPGA10j1UAwfHEcv+dNZc0LdIEcKNxL2SxACMMrs5LjncQcNBKLe
+ATlaMLV4fQ3MKDRdopi7U7tkH3vaF9QyrD2pxI0yCdRyRy0Xlc4i60zbE7wWPGJx
+E3EWFIylZyKzAbZlz4pSUWqts08+wAbWbwg0EPrsLd3ZV5LkO2aFlyqS1/A73sYb
+4QRf6OiFm24EfTVcfbKeiTG/obwv/w==
+=OJk4
 -----END PGP SIGNATURE-----

pkg/integrity/testdata/TestSignAndEncodeJSON/SHA384.golden

@@ -4,12 +4,12 @@ Hash: SHA384
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBCQAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AACoHQgAlRlRxWaxCkiQPFFC8DtsV7GSw6dN4ELFxzMXd6slWhxFOJYnHX2VH1uC
-/9/1Wqzvvrv5uha5Fy3dRQT1Zpa802sJU0GorPxv6LIvOEcJ8UMUj2dTQ4traSSW
-aPb7+Dyvfsosai2it1dFU25+IFScsCk6xaf8l2mSTZxj/0jjx8lxwKUZaEjKTNNf
-uL9U46UmP3w7lN6g+Nk4lz+dqU6lzMCcyJmgekGNl7/1mmOdFxqR/QKgiK5etHzZ
-WxIy1yHpV7FLtwGYA6O7vXpw3uktl8Muoc78pU1E1YMibLfygj+VO5RINMyuYb/4
-uGn6I+LJczqFpgSKcnP7/+yRVTOHQg==
-=SYuD
+wsBzBAEBCQAnBQJZr0CRCZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AAAQhgf/Y0S0pMdClDPi4cn6moxF+mPnt+ADpsLo32zk4YGXR6P0/oxLVz/+5vJw
+W93hSAhRvD1CraNHNxpnC52VHazRusBpELD8pzGk8j+q1gD4tFIo6P1dGIiW9JpH
+GF3rpUuVtA14YnjEfXrUyRGbp2YUK82hnmT+fW5Yi9jWwZjXEA/Jon5KxrBYjVE0
+Ckk+vP5sGXi8KZZq+wSZkecfDVFn1QlPe86RA2hY+TQcykWVT07MLrIUta0TCUKH
+efew+5uJ1mJ3ehnTT6b7vaQjrwmtBmcG3/B9VidfeKqxSOPvlt6u8sOa/Id4W2gM
+PXyrcV6C3sYYvEHWg+X423IfnkpZDg==
+=DKbp
 -----END PGP SIGNATURE-----

pkg/integrity/testdata/TestSignAndEncodeJSON/SHA512.golden

@@ -4,12 +4,12 @@ Hash: SHA512
 {"One":1,"Two":2}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBCgAnBQJZr0CRCZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AADw9QgAl3ZD0vCmvxyPHiz3PuQpgEUM17z6msOtYJ8ZxL+uNe1niTeBYShvPxm1
-6VULiYnBEJ4npkHMKqIXUAnHIN9wUD/FO7/JkEW1ttxZSoQKIiJeL7m/C5E/qEG8
-ikFLlhYproo5lN18xf64h9oi2UaZGlF4jLufWflRNemSm/d5hPpns2gvP47L3jF2
-vDZO7VGi4Q5P6zO2Zg4E4tLBWZkH5PxQls5QC13VCu36zOXmEt2TRLeSQ47Y60du
-Sp+LFuSpnIC9qJmj6OWabfIvOzLyuoZQpcCjDmYOpxSftrF8b0pFXN/tXdbJzWI5
-dH8EBvdCJ15EWL41hgxyOps9uGAVaw==
-=aBQa
+wsBzBAEBCgAnBQJZr0CRCZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AABVJAf+NI6qirjeMV3oJ+55qxJyUy4S3Mdkh5gpkKhzJDhaZbyO712iU+MSFs6s
+/te2tRcQDAY+M1rUkLkPDx517r+aYRIcDG/NyDZc0/TuA4xw0av+LtEbXJysPfkl
+lNFe4p3ClB3YHKG5lx4MJc0/mCG/S3+IIoQ0iChuCAODz2MkfwT0vFfZXgr3flsl
+RXGw9DWrxXrBmBsmulcj+DGxuNGocO+U/HkE/Ofv3u2ZdWT4V2hEa05ynl+4EQRV
+kuDtXbtQfQKqDQtFY2ToLt3lY/aI4cP+6r2LCeP6HqmBoTUwWxV+89hLjP92rjo+
+ybocvOwQ2GPyH/4QJNULBlJybPvKgg==
+=nbAY
 -----END PGP SIGNATURE-----

pkg/siftool/testdata/Test_command_getDump/Three/out.golden

@@ -4,12 +4,12 @@ Hash: SHA256
 {"version":1,"header":{"digest":"sha256:635fa0a14a8ef0c0351ed3e985799ed1d4f75ce973dea3cc76c99710795cc3f1"},"objects":[{"relativeId":0,"descriptorDigest":"sha256:3634ad01db0dd5482ecf685267b53d6201690438ca27c3d7ea91c971a1f41f92","objectDigest":"sha256:004dfc8da678c309de28b5386a1e9efd57f536b150c40d29b31506aa0fb17ec2"},{"relativeId":1,"descriptorDigest":"sha256:db74cb63348414def73535c9f0f83e8ad7df61229ed2806f4da8b69d6d7464d6","objectDigest":"sha256:5f78c33274e43fa9de5659265c1d917e25c03722dcb0b8d27db8d5feaa813953"}]}
 -----BEGIN PGP SIGNATURE-----
 
-wsBzBAEBCAAnBQJe+oD0CZCiDCfuf/e6hBahBBIEXIwLEATQWN5L7aIMJ+5/97qE
-AABQ4QgAkWcLNLcghZ96VnJ9+67qbsdwp51rfERCKN0dZLBTHKN5Qjn1BWM/XbPj
-Qnl0F6D6YBId7c/KO0sbb3EHUdpmMEQlouQYFOTHWtdyvwO6spRLBx5EQA7Iv0rF
-jREz/jC7GaREK94u+hXRr94+FH5gEnHUL+Vg7pW/+cGiwLY1ddoL8ELgYhxqxd9J
-sET+vU1E4GJ3TyYFhVFsMsNeW7dQauqjQSJxMLTwXNphxTH19ePbJ2uDE2UJ3fn7
-up5ruugRyEe5qgRICGxRSDp8/INGRvoDUi32T9uLORzS+umRX5YW0b6RWD+5R72V
-0ewbMTJIx2lpfQGPMWROwcF7nkLdWQ==
-=WWGX
+wsBzBAEBCAAnBQJe+oD0CZCiDCfuf/e6hBYhBBIEXIwLEATQWN5L7aIMJ+5/97qE
+AADY9ggAlW/Y+BssNOLcCAiu0dzZCf5BfbzmOUQ+VNajAsZyOIJnW1t19lDYoRNx
+x3YolyyRfEmw9Kf1n6fctDHGPyzRIIOc1/0CVQzNzfKZQO+x0+9qvurILADijY/3
+1DKqhbxoO2a5iASXYHH9yYs3J82N3EKEYyFdDMTcHs4UijUnHvwcTt0smY6JQ9Su
+vssWg+3qltuVjiYOQPgg9XR5i8suXE76poit9Ftp7jOD9eYtVcUEKRZLrVCsDJu9
+77QvejJmgquueYX4pM2EuH9EOFnDV3gl4Cuocsn5OLDgfhYuT1t5Hay1iAPpJqm6
+/EXQY7CECByIj6TCFurfXwc+uYSD9Q==
+=rZoe
 -----END PGP SIGNATURE-----