luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Move to go 1.17 (#12868) 

Also ensure that the go 1.17 breaking changes to net.ParseCIDR don't make us choke on stored CIDRs that were acceptable to older Go versions.
This commit is contained in:
Nick Cabatoff 2021-10-21 09:32:03 -04:00 committed by GitHub
parent 2519aeec09
commit ff74f49047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 1586 additions and 1284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

494
.circleci/config.yml generated
View File

File diff suppressed because it is too large Load Diff

474
.circleci/config/@build-release.yml
View File

@ -30,20 +30,20 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Layer Cache: copy-source'
- run:
command: LAYER_SPEC_ID=09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a make -C packages*.lock load-builder-cache
command: LAYER_SPEC_ID=09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5 make -C packages*.lock load-builder-cache
name: Load whatever builder cache we have (if any) into the Docker daemon
- run:
command: |2-
@ -75,7 +75,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a-image
make -f packages*.lock/layer.mk 01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079-image
name: Build install-go layer
- run:
command: |2-
@ -91,7 +91,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f-image
make -f packages*.lock/layer.mk 02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2-image
name: Build install-go-tools layer
- run:
command: |2-
@ -107,7 +107,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c-image
make -f packages*.lock/layer.mk 03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53-image
name: Build set-workdir layer
- run:
command: |2-
@ -123,7 +123,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f-image
make -f packages*.lock/layer.mk 04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86-image
name: Build install-yarn layer
- run:
command: |2-
@ -139,7 +139,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5-image
make -f packages*.lock/layer.mk 05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43-image
name: Build make-ui-folder layer
- run:
command: |2-
@ -155,7 +155,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4-image
make -f packages*.lock/layer.mk 06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de-image
name: Build ui-dependencies layer
- run:
command: |2-
@ -171,7 +171,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58-image
make -f packages*.lock/layer.mk 07-build-ui-9a4c8178808477469c37460df34f28cade634794-image
name: Build build-ui layer
- run:
command: |2-
@ -187,7 +187,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 08-go-modules-1934f0273183384d1917c5195fd261463c7684b0-image
make -f packages*.lock/layer.mk 08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b-image
name: Build go-modules layer
- run:
command: |2-
@ -203,7 +203,7 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a-image
make -f packages*.lock/layer.mk 09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5-image
name: Build copy-source layer
- run:
command: |2-
@ -219,12 +219,12 @@ jobs:
echo " attempts to directly clone private repositories."
fi
make -f packages*.lock/layer.mk 09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a-save
make -f packages*.lock/layer.mk 09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5-save
name: Build copy-source layer
- save_cache:
paths:
- .buildcache/archives/09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a.tar.gz
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
- .buildcache/archives/09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5.tar.gz
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
name: 'Save Layer Cache: copy-source'
bundle-releases:
executor: builder
@ -238,52 +238,52 @@ jobs:
command: mkdir -p .buildcache && echo "*" > .buildcache/.gitignore
name: Ignore .buildcache
- restore_cache:
key: package-243d7bbcd8206fabaa6acf5a05263c73fca565d6-{{checksum ".buildcache/cache-keys/package-243d7bbcd8206fabaa6acf5a05263c73fca565d6"}}
key: package-4f0e5368d2877895a597d8fd4598dd6e8c25ca33-{{checksum ".buildcache/cache-keys/package-4f0e5368d2877895a597d8fd4598dd6e8c25ca33"}}
name: Restore package cache
- restore_cache:
key: package-6502227a9faa1841098f942b7e399b5d69bf7c4a-{{checksum ".buildcache/cache-keys/package-6502227a9faa1841098f942b7e399b5d69bf7c4a"}}
key: package-34ae8176a7948f5394e13b1f50a4fef3fa8cfc24-{{checksum ".buildcache/cache-keys/package-34ae8176a7948f5394e13b1f50a4fef3fa8cfc24"}}
name: Restore package cache
- restore_cache:
key: package-a940180151b74a34de0a1c6c8e5c9c663d7a3895-{{checksum ".buildcache/cache-keys/package-a940180151b74a34de0a1c6c8e5c9c663d7a3895"}}
key: package-82f9a5672baa21c81f8cbe723d809aa4eb8cb37f-{{checksum ".buildcache/cache-keys/package-82f9a5672baa21c81f8cbe723d809aa4eb8cb37f"}}
name: Restore package cache
- restore_cache:
key: package-025615a5a47bcef20ea540dce5f1f9e366aa87ed-{{checksum ".buildcache/cache-keys/package-025615a5a47bcef20ea540dce5f1f9e366aa87ed"}}
key: package-3169a9620bf58a58c4754c925224e792d19f229d-{{checksum ".buildcache/cache-keys/package-3169a9620bf58a58c4754c925224e792d19f229d"}}
name: Restore package cache
- restore_cache:
key: package-459ace2ebc9cac14c3a60d0709ab892eab7e1417-{{checksum ".buildcache/cache-keys/package-459ace2ebc9cac14c3a60d0709ab892eab7e1417"}}
key: package-1c9830949ec7c9a729004e4e0d03fc202498b122-{{checksum ".buildcache/cache-keys/package-1c9830949ec7c9a729004e4e0d03fc202498b122"}}
name: Restore package cache
- restore_cache:
key: package-485613b98d330bed9b70c735d757d926e3987e5b-{{checksum ".buildcache/cache-keys/package-485613b98d330bed9b70c735d757d926e3987e5b"}}
key: package-4e8e7583b0c10de35f600c7a32826c79f6f84e64-{{checksum ".buildcache/cache-keys/package-4e8e7583b0c10de35f600c7a32826c79f6f84e64"}}
name: Restore package cache
- restore_cache:
key: package-d2c00bf135b8ed310ee0c99e598604d818f4e927-{{checksum ".buildcache/cache-keys/package-d2c00bf135b8ed310ee0c99e598604d818f4e927"}}
key: package-518bffc4352b6dc5a926ccfc298928e5a2491262-{{checksum ".buildcache/cache-keys/package-518bffc4352b6dc5a926ccfc298928e5a2491262"}}
name: Restore package cache
- restore_cache:
key: package-855847695482b8ba2072143d079ef4e4b00940c5-{{checksum ".buildcache/cache-keys/package-855847695482b8ba2072143d079ef4e4b00940c5"}}
key: package-2cb1d35768c2d22815195653b679a1100f3812fe-{{checksum ".buildcache/cache-keys/package-2cb1d35768c2d22815195653b679a1100f3812fe"}}
name: Restore package cache
- restore_cache:
key: package-587f7d9862fe0ee0d0d970e2c8676f7cbfc64fdc-{{checksum ".buildcache/cache-keys/package-587f7d9862fe0ee0d0d970e2c8676f7cbfc64fdc"}}
key: package-1cde55f7ae4e7bee929e5e0ec0e42a7f1411bf56-{{checksum ".buildcache/cache-keys/package-1cde55f7ae4e7bee929e5e0ec0e42a7f1411bf56"}}
name: Restore package cache
- restore_cache:
key: package-d4416e1eaca20475cbc551f75ff8429bb038714f-{{checksum ".buildcache/cache-keys/package-d4416e1eaca20475cbc551f75ff8429bb038714f"}}
key: package-195bd6a05b1feb6506cb35347d3025832fd7acf3-{{checksum ".buildcache/cache-keys/package-195bd6a05b1feb6506cb35347d3025832fd7acf3"}}
name: Restore package cache
- restore_cache:
key: package-2a7e2dd05e04974d3886b38cb42f1f702ee53d2d-{{checksum ".buildcache/cache-keys/package-2a7e2dd05e04974d3886b38cb42f1f702ee53d2d"}}
key: package-333efb7eb87e0bad1387f1e683cb4434fc99f9af-{{checksum ".buildcache/cache-keys/package-333efb7eb87e0bad1387f1e683cb4434fc99f9af"}}
name: Restore package cache
- restore_cache:
key: package-ba0c8044cb6fbfb2d41bca8aa9c8f4ca0f7157fd-{{checksum ".buildcache/cache-keys/package-ba0c8044cb6fbfb2d41bca8aa9c8f4ca0f7157fd"}}
key: package-454f061138fcbbb161e5360bf8c5773fce25c8db-{{checksum ".buildcache/cache-keys/package-454f061138fcbbb161e5360bf8c5773fce25c8db"}}
name: Restore package cache
- restore_cache:
key: package-e644b92a5a52371fad6d87482bc140ce02e9a4a7-{{checksum ".buildcache/cache-keys/package-e644b92a5a52371fad6d87482bc140ce02e9a4a7"}}
key: package-3f9c6b5987fcd19d637a066d4956e63b42516f38-{{checksum ".buildcache/cache-keys/package-3f9c6b5987fcd19d637a066d4956e63b42516f38"}}
name: Restore package cache
- restore_cache:
key: package-94d37fda1053a350227ee5de6ca3fecc098ac205-{{checksum ".buildcache/cache-keys/package-94d37fda1053a350227ee5de6ca3fecc098ac205"}}
key: package-2b3ca11a3d2b787952020bcde603859093126a40-{{checksum ".buildcache/cache-keys/package-2b3ca11a3d2b787952020bcde603859093126a40"}}
name: Restore package cache
- restore_cache:
key: package-7d549b2628e193e8b60de7d80540ab13748c7cca-{{checksum ".buildcache/cache-keys/package-7d549b2628e193e8b60de7d80540ab13748c7cca"}}
key: package-139ddf51f9efab7a480de28bd4293dbe81f3c881-{{checksum ".buildcache/cache-keys/package-139ddf51f9efab7a480de28bd4293dbe81f3c881"}}
name: Restore package cache
- restore_cache:
key: package-2e4e6d30642cdbeea956f7a5f86cd206cb7f64bf-{{checksum ".buildcache/cache-keys/package-2e4e6d30642cdbeea956f7a5f86cd206cb7f64bf"}}
key: package-df040588ea83a25989b822a0f302850a4c46a6b8-{{checksum ".buildcache/cache-keys/package-df040588ea83a25989b822a0f302850a4c46a6b8"}}
name: Restore package cache
- run:
command: make package-meta-all
@ -295,20 +295,20 @@ jobs:
command: ls -lahR .buildcache
name: List Build Cache
- run:
command: cp packages*.lock/pkgs.yml lockfile-ee2aaa4372d8f170.yml
command: cp packages*.lock/pkgs.yml lockfile-66f6daa0d5685744.yml
name: Update Lockfile Name
- run:
command: tar -czf packages-ee2aaa4372d8f170.tar.gz .buildcache/packages lockfile-ee2aaa4372d8f170.yml
command: tar -czf packages-66f6daa0d5685744.tar.gz .buildcache/packages lockfile-66f6daa0d5685744.yml
name: Create Raw Package Tarball
- run:
command: tar -czf meta-ee2aaa4372d8f170.tar.gz .buildcache/packages/store/*.json lockfile-ee2aaa4372d8f170.yml
command: tar -czf meta-66f6daa0d5685744.tar.gz .buildcache/packages/store/*.json lockfile-66f6daa0d5685744.yml
name: Create Metadata Tarball
- store_artifacts:
path: lockfile-ee2aaa4372d8f170.yml
path: lockfile-66f6daa0d5685744.yml
- store_artifacts:
path: packages-ee2aaa4372d8f170.tar.gz
path: packages-66f6daa0d5685744.tar.gz
- store_artifacts:
path: meta-ee2aaa4372d8f170.tar.gz
path: meta-66f6daa0d5685744.tar.gz
- store_artifacts:
path: .buildcache/packages
darwin_amd64_package:
@ -326,7 +326,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-243d7bbcd8206fabaa6acf5a05263c73fca565d6-{{checksum ".buildcache/cache-keys/package-243d7bbcd8206fabaa6acf5a05263c73fca565d6"}}
key: package-4f0e5368d2877895a597d8fd4598dd6e8c25ca33-{{checksum ".buildcache/cache-keys/package-4f0e5368d2877895a597d8fd4598dd6e8c25ca33"}}
name: Restore package cache
- run:
command: |2
@ -342,16 +342,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -380,10 +380,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-243d7bbcd8206fabaa6acf5a05263c73fca565d6-{{checksum ".buildcache/cache-keys/package-243d7bbcd8206fabaa6acf5a05263c73fca565d6"}}
key: package-4f0e5368d2877895a597d8fd4598dd6e8c25ca33-{{checksum ".buildcache/cache-keys/package-4f0e5368d2877895a597d8fd4598dd6e8c25ca33"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 243d7bbcd8206fabaa6acf5a05263c73fca565d6
PACKAGE_SPEC_ID: 4f0e5368d2877895a597d8fd4598dd6e8c25ca33
darwin_arm64_package:
executor: builder
steps:
@ -399,7 +399,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-6502227a9faa1841098f942b7e399b5d69bf7c4a-{{checksum ".buildcache/cache-keys/package-6502227a9faa1841098f942b7e399b5d69bf7c4a"}}
key: package-34ae8176a7948f5394e13b1f50a4fef3fa8cfc24-{{checksum ".buildcache/cache-keys/package-34ae8176a7948f5394e13b1f50a4fef3fa8cfc24"}}
name: Restore package cache
- run:
command: |2
@ -415,16 +415,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -453,10 +453,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-6502227a9faa1841098f942b7e399b5d69bf7c4a-{{checksum ".buildcache/cache-keys/package-6502227a9faa1841098f942b7e399b5d69bf7c4a"}}
key: package-34ae8176a7948f5394e13b1f50a4fef3fa8cfc24-{{checksum ".buildcache/cache-keys/package-34ae8176a7948f5394e13b1f50a4fef3fa8cfc24"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 6502227a9faa1841098f942b7e399b5d69bf7c4a
PACKAGE_SPEC_ID: 34ae8176a7948f5394e13b1f50a4fef3fa8cfc24
freebsd_386_package:
executor: builder
steps:
@ -472,7 +472,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-a940180151b74a34de0a1c6c8e5c9c663d7a3895-{{checksum ".buildcache/cache-keys/package-a940180151b74a34de0a1c6c8e5c9c663d7a3895"}}
key: package-82f9a5672baa21c81f8cbe723d809aa4eb8cb37f-{{checksum ".buildcache/cache-keys/package-82f9a5672baa21c81f8cbe723d809aa4eb8cb37f"}}
name: Restore package cache
- run:
command: |2
@ -488,16 +488,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -526,10 +526,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-a940180151b74a34de0a1c6c8e5c9c663d7a3895-{{checksum ".buildcache/cache-keys/package-a940180151b74a34de0a1c6c8e5c9c663d7a3895"}}
key: package-82f9a5672baa21c81f8cbe723d809aa4eb8cb37f-{{checksum ".buildcache/cache-keys/package-82f9a5672baa21c81f8cbe723d809aa4eb8cb37f"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: a940180151b74a34de0a1c6c8e5c9c663d7a3895
PACKAGE_SPEC_ID: 82f9a5672baa21c81f8cbe723d809aa4eb8cb37f
freebsd_amd64_package:
executor: builder
steps:
@ -545,7 +545,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-025615a5a47bcef20ea540dce5f1f9e366aa87ed-{{checksum ".buildcache/cache-keys/package-025615a5a47bcef20ea540dce5f1f9e366aa87ed"}}
key: package-3169a9620bf58a58c4754c925224e792d19f229d-{{checksum ".buildcache/cache-keys/package-3169a9620bf58a58c4754c925224e792d19f229d"}}
name: Restore package cache
- run:
command: |2
@ -561,16 +561,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -599,10 +599,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-025615a5a47bcef20ea540dce5f1f9e366aa87ed-{{checksum ".buildcache/cache-keys/package-025615a5a47bcef20ea540dce5f1f9e366aa87ed"}}
key: package-3169a9620bf58a58c4754c925224e792d19f229d-{{checksum ".buildcache/cache-keys/package-3169a9620bf58a58c4754c925224e792d19f229d"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 025615a5a47bcef20ea540dce5f1f9e366aa87ed
PACKAGE_SPEC_ID: 3169a9620bf58a58c4754c925224e792d19f229d
freebsd_arm_package:
executor: builder
steps:
@ -618,7 +618,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-459ace2ebc9cac14c3a60d0709ab892eab7e1417-{{checksum ".buildcache/cache-keys/package-459ace2ebc9cac14c3a60d0709ab892eab7e1417"}}
key: package-1c9830949ec7c9a729004e4e0d03fc202498b122-{{checksum ".buildcache/cache-keys/package-1c9830949ec7c9a729004e4e0d03fc202498b122"}}
name: Restore package cache
- run:
command: |2
@ -634,16 +634,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -672,10 +672,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-459ace2ebc9cac14c3a60d0709ab892eab7e1417-{{checksum ".buildcache/cache-keys/package-459ace2ebc9cac14c3a60d0709ab892eab7e1417"}}
key: package-1c9830949ec7c9a729004e4e0d03fc202498b122-{{checksum ".buildcache/cache-keys/package-1c9830949ec7c9a729004e4e0d03fc202498b122"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 459ace2ebc9cac14c3a60d0709ab892eab7e1417
PACKAGE_SPEC_ID: 1c9830949ec7c9a729004e4e0d03fc202498b122
linux_386_package:
executor: builder
steps:
@ -691,7 +691,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-485613b98d330bed9b70c735d757d926e3987e5b-{{checksum ".buildcache/cache-keys/package-485613b98d330bed9b70c735d757d926e3987e5b"}}
key: package-4e8e7583b0c10de35f600c7a32826c79f6f84e64-{{checksum ".buildcache/cache-keys/package-4e8e7583b0c10de35f600c7a32826c79f6f84e64"}}
name: Restore package cache
- run:
command: |2
@ -707,16 +707,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -745,10 +745,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-485613b98d330bed9b70c735d757d926e3987e5b-{{checksum ".buildcache/cache-keys/package-485613b98d330bed9b70c735d757d926e3987e5b"}}
key: package-4e8e7583b0c10de35f600c7a32826c79f6f84e64-{{checksum ".buildcache/cache-keys/package-4e8e7583b0c10de35f600c7a32826c79f6f84e64"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 485613b98d330bed9b70c735d757d926e3987e5b
PACKAGE_SPEC_ID: 4e8e7583b0c10de35f600c7a32826c79f6f84e64
linux_amd64_package:
executor: builder
steps:
@ -764,7 +764,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-d2c00bf135b8ed310ee0c99e598604d818f4e927-{{checksum ".buildcache/cache-keys/package-d2c00bf135b8ed310ee0c99e598604d818f4e927"}}
key: package-518bffc4352b6dc5a926ccfc298928e5a2491262-{{checksum ".buildcache/cache-keys/package-518bffc4352b6dc5a926ccfc298928e5a2491262"}}
name: Restore package cache
- run:
command: |2
@ -780,16 +780,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -818,10 +818,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-d2c00bf135b8ed310ee0c99e598604d818f4e927-{{checksum ".buildcache/cache-keys/package-d2c00bf135b8ed310ee0c99e598604d818f4e927"}}
key: package-518bffc4352b6dc5a926ccfc298928e5a2491262-{{checksum ".buildcache/cache-keys/package-518bffc4352b6dc5a926ccfc298928e5a2491262"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: d2c00bf135b8ed310ee0c99e598604d818f4e927
PACKAGE_SPEC_ID: 518bffc4352b6dc5a926ccfc298928e5a2491262
linux_arm_package:
executor: builder
steps:
@ -837,7 +837,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-855847695482b8ba2072143d079ef4e4b00940c5-{{checksum ".buildcache/cache-keys/package-855847695482b8ba2072143d079ef4e4b00940c5"}}
key: package-2cb1d35768c2d22815195653b679a1100f3812fe-{{checksum ".buildcache/cache-keys/package-2cb1d35768c2d22815195653b679a1100f3812fe"}}
name: Restore package cache
- run:
command: |2
@ -853,16 +853,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -891,10 +891,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-855847695482b8ba2072143d079ef4e4b00940c5-{{checksum ".buildcache/cache-keys/package-855847695482b8ba2072143d079ef4e4b00940c5"}}
key: package-2cb1d35768c2d22815195653b679a1100f3812fe-{{checksum ".buildcache/cache-keys/package-2cb1d35768c2d22815195653b679a1100f3812fe"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 855847695482b8ba2072143d079ef4e4b00940c5
PACKAGE_SPEC_ID: 2cb1d35768c2d22815195653b679a1100f3812fe
linux_arm64_package:
executor: builder
steps:
@ -910,7 +910,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-587f7d9862fe0ee0d0d970e2c8676f7cbfc64fdc-{{checksum ".buildcache/cache-keys/package-587f7d9862fe0ee0d0d970e2c8676f7cbfc64fdc"}}
key: package-1cde55f7ae4e7bee929e5e0ec0e42a7f1411bf56-{{checksum ".buildcache/cache-keys/package-1cde55f7ae4e7bee929e5e0ec0e42a7f1411bf56"}}
name: Restore package cache
- run:
command: |2
@ -926,16 +926,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -964,10 +964,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-587f7d9862fe0ee0d0d970e2c8676f7cbfc64fdc-{{checksum ".buildcache/cache-keys/package-587f7d9862fe0ee0d0d970e2c8676f7cbfc64fdc"}}
key: package-1cde55f7ae4e7bee929e5e0ec0e42a7f1411bf56-{{checksum ".buildcache/cache-keys/package-1cde55f7ae4e7bee929e5e0ec0e42a7f1411bf56"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 587f7d9862fe0ee0d0d970e2c8676f7cbfc64fdc
PACKAGE_SPEC_ID: 1cde55f7ae4e7bee929e5e0ec0e42a7f1411bf56
netbsd_386_package:
executor: builder
steps:
@ -983,7 +983,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-d4416e1eaca20475cbc551f75ff8429bb038714f-{{checksum ".buildcache/cache-keys/package-d4416e1eaca20475cbc551f75ff8429bb038714f"}}
key: package-195bd6a05b1feb6506cb35347d3025832fd7acf3-{{checksum ".buildcache/cache-keys/package-195bd6a05b1feb6506cb35347d3025832fd7acf3"}}
name: Restore package cache
- run:
command: |2
@ -999,16 +999,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -1037,10 +1037,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-d4416e1eaca20475cbc551f75ff8429bb038714f-{{checksum ".buildcache/cache-keys/package-d4416e1eaca20475cbc551f75ff8429bb038714f"}}
key: package-195bd6a05b1feb6506cb35347d3025832fd7acf3-{{checksum ".buildcache/cache-keys/package-195bd6a05b1feb6506cb35347d3025832fd7acf3"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: d4416e1eaca20475cbc551f75ff8429bb038714f
PACKAGE_SPEC_ID: 195bd6a05b1feb6506cb35347d3025832fd7acf3
netbsd_amd64_package:
executor: builder
steps:
@ -1056,7 +1056,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-2a7e2dd05e04974d3886b38cb42f1f702ee53d2d-{{checksum ".buildcache/cache-keys/package-2a7e2dd05e04974d3886b38cb42f1f702ee53d2d"}}
key: package-333efb7eb87e0bad1387f1e683cb4434fc99f9af-{{checksum ".buildcache/cache-keys/package-333efb7eb87e0bad1387f1e683cb4434fc99f9af"}}
name: Restore package cache
- run:
command: |2
@ -1072,16 +1072,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -1110,10 +1110,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-2a7e2dd05e04974d3886b38cb42f1f702ee53d2d-{{checksum ".buildcache/cache-keys/package-2a7e2dd05e04974d3886b38cb42f1f702ee53d2d"}}
key: package-333efb7eb87e0bad1387f1e683cb4434fc99f9af-{{checksum ".buildcache/cache-keys/package-333efb7eb87e0bad1387f1e683cb4434fc99f9af"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 2a7e2dd05e04974d3886b38cb42f1f702ee53d2d
PACKAGE_SPEC_ID: 333efb7eb87e0bad1387f1e683cb4434fc99f9af
openbsd_386_package:
executor: builder
steps:
@ -1129,7 +1129,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-ba0c8044cb6fbfb2d41bca8aa9c8f4ca0f7157fd-{{checksum ".buildcache/cache-keys/package-ba0c8044cb6fbfb2d41bca8aa9c8f4ca0f7157fd"}}
key: package-454f061138fcbbb161e5360bf8c5773fce25c8db-{{checksum ".buildcache/cache-keys/package-454f061138fcbbb161e5360bf8c5773fce25c8db"}}
name: Restore package cache
- run:
command: |2
@ -1145,16 +1145,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -1183,10 +1183,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-ba0c8044cb6fbfb2d41bca8aa9c8f4ca0f7157fd-{{checksum ".buildcache/cache-keys/package-ba0c8044cb6fbfb2d41bca8aa9c8f4ca0f7157fd"}}
key: package-454f061138fcbbb161e5360bf8c5773fce25c8db-{{checksum ".buildcache/cache-keys/package-454f061138fcbbb161e5360bf8c5773fce25c8db"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: ba0c8044cb6fbfb2d41bca8aa9c8f4ca0f7157fd
PACKAGE_SPEC_ID: 454f061138fcbbb161e5360bf8c5773fce25c8db
openbsd_amd64_package:
executor: builder
steps:
@ -1202,7 +1202,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-e644b92a5a52371fad6d87482bc140ce02e9a4a7-{{checksum ".buildcache/cache-keys/package-e644b92a5a52371fad6d87482bc140ce02e9a4a7"}}
key: package-3f9c6b5987fcd19d637a066d4956e63b42516f38-{{checksum ".buildcache/cache-keys/package-3f9c6b5987fcd19d637a066d4956e63b42516f38"}}
name: Restore package cache
- run:
command: |2
@ -1218,16 +1218,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -1256,10 +1256,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-e644b92a5a52371fad6d87482bc140ce02e9a4a7-{{checksum ".buildcache/cache-keys/package-e644b92a5a52371fad6d87482bc140ce02e9a4a7"}}
key: package-3f9c6b5987fcd19d637a066d4956e63b42516f38-{{checksum ".buildcache/cache-keys/package-3f9c6b5987fcd19d637a066d4956e63b42516f38"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: e644b92a5a52371fad6d87482bc140ce02e9a4a7
PACKAGE_SPEC_ID: 3f9c6b5987fcd19d637a066d4956e63b42516f38
solaris_amd64_package:
executor: builder
steps:
@ -1275,7 +1275,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-94d37fda1053a350227ee5de6ca3fecc098ac205-{{checksum ".buildcache/cache-keys/package-94d37fda1053a350227ee5de6ca3fecc098ac205"}}
key: package-2b3ca11a3d2b787952020bcde603859093126a40-{{checksum ".buildcache/cache-keys/package-2b3ca11a3d2b787952020bcde603859093126a40"}}
name: Restore package cache
- run:
command: |2
@ -1291,16 +1291,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -1329,10 +1329,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-94d37fda1053a350227ee5de6ca3fecc098ac205-{{checksum ".buildcache/cache-keys/package-94d37fda1053a350227ee5de6ca3fecc098ac205"}}
key: package-2b3ca11a3d2b787952020bcde603859093126a40-{{checksum ".buildcache/cache-keys/package-2b3ca11a3d2b787952020bcde603859093126a40"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 94d37fda1053a350227ee5de6ca3fecc098ac205
PACKAGE_SPEC_ID: 2b3ca11a3d2b787952020bcde603859093126a40
windows_386_package:
executor: builder
steps:
@ -1348,7 +1348,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-7d549b2628e193e8b60de7d80540ab13748c7cca-{{checksum ".buildcache/cache-keys/package-7d549b2628e193e8b60de7d80540ab13748c7cca"}}
key: package-139ddf51f9efab7a480de28bd4293dbe81f3c881-{{checksum ".buildcache/cache-keys/package-139ddf51f9efab7a480de28bd4293dbe81f3c881"}}
name: Restore package cache
- run:
command: |2
@ -1364,16 +1364,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -1402,10 +1402,10 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-7d549b2628e193e8b60de7d80540ab13748c7cca-{{checksum ".buildcache/cache-keys/package-7d549b2628e193e8b60de7d80540ab13748c7cca"}}
key: package-139ddf51f9efab7a480de28bd4293dbe81f3c881-{{checksum ".buildcache/cache-keys/package-139ddf51f9efab7a480de28bd4293dbe81f3c881"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 7d549b2628e193e8b60de7d80540ab13748c7cca
PACKAGE_SPEC_ID: 139ddf51f9efab7a480de28bd4293dbe81f3c881
windows_amd64_package:
executor: builder
steps:
@ -1421,7 +1421,7 @@ jobs:
command: make -C packages*.lock write-package-cache-key
name: Write package cache key
- restore_cache:
key: package-2e4e6d30642cdbeea956f7a5f86cd206cb7f64bf-{{checksum ".buildcache/cache-keys/package-2e4e6d30642cdbeea956f7a5f86cd206cb7f64bf"}}
key: package-df040588ea83a25989b822a0f302850a4c46a6b8-{{checksum ".buildcache/cache-keys/package-df040588ea83a25989b822a0f302850a4c46a6b8"}}
name: Restore package cache
- run:
command: |2
@ -1437,16 +1437,16 @@ jobs:
command: make -C packages*.lock write-builder-cache-keys
name: Write builder layer cache keys
- restore_cache:
key: copy-source_33a9_{{checksum ".buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a"}}
key: copy-source_1ab1_{{checksum ".buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5"}}
keys:
- go-modules_1934_{{checksum ".buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0"}}
- build-ui_a2ec_{{checksum ".buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58"}}
- ui-dependencies_8903_{{checksum ".buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4"}}
- make-ui-folder_6250_{{checksum ".buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5"}}
- install-yarn_8d31_{{checksum ".buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f"}}
- set-workdir_aabd_{{checksum ".buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c"}}
- install-go-tools_0ede_{{checksum ".buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f"}}
- install-go_74ad_{{checksum ".buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a"}}
- go-modules_a1e9_{{checksum ".buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b"}}
- build-ui_9a4c_{{checksum ".buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794"}}
- ui-dependencies_ee1b_{{checksum ".buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de"}}
- make-ui-folder_c9af_{{checksum ".buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43"}}
- install-yarn_f8c6_{{checksum ".buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86"}}
- set-workdir_56f0_{{checksum ".buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53"}}
- install-go-tools_f4c1_{{checksum ".buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2"}}
- install-go_877b_{{checksum ".buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079"}}
- base_fc1f_{{checksum ".buildcache/cache-keys/base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f"}}
name: 'Restore Builder Image Cache: copy-source'
- run:
@ -1475,12 +1475,12 @@ jobs:
- save_cache:
paths:
- .buildcache/packages/store
key: package-2e4e6d30642cdbeea956f7a5f86cd206cb7f64bf-{{checksum ".buildcache/cache-keys/package-2e4e6d30642cdbeea956f7a5f86cd206cb7f64bf"}}
key: package-df040588ea83a25989b822a0f302850a4c46a6b8-{{checksum ".buildcache/cache-keys/package-df040588ea83a25989b822a0f302850a4c46a6b8"}}
name: Save package cache
environment:
PACKAGE_SPEC_ID: 2e4e6d30642cdbeea956f7a5f86cd206cb7f64bf
PACKAGE_SPEC_ID: df040588ea83a25989b822a0f302850a4c46a6b8
workflows:
build-ee2aaa4372d8f170:
build-66f6daa0d5685744:
jobs:
- build-common-layers: {}
- darwin_amd64_package:

2
.circleci/config/commands/go_test.yml
View File

@ -14,7 +14,7 @@ parameters:
default: false
go_image:
type: string
default: "docker.mirror.hashicorp.services/circleci/golang:1.16.7-buster"
default: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
use_docker:
type: boolean
default: false

8
.circleci/config/executors/@executors.yml
View File

@ -3,7 +3,7 @@ go-machine:
shell: /usr/bin/env bash -euo pipefail -c
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.16.7 # Pin Go to patch version (ex: 1.2.3)
GO_VERSION: 1.17.2 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
@ -25,7 +25,7 @@ alpine:
docker-env-go-test-remote-docker:
resource_class: medium
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.7-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
@ -33,7 +33,7 @@ docker-env-go-test-remote-docker:
docker-env-go-test:
resource_class: large
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.7-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
@ -41,7 +41,7 @@ docker-env-go-test:
docker-env-go-test-race:
resource_class: xlarge
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.7-buster"
- image: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
environment:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""

2
Makefile
View File

@ -15,7 +15,7 @@ EXTERNAL_TOOLS=\
GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)
GO_VERSION_MIN=1.16.7
GO_VERSION_MIN=1.17.2
GO_CMD?=go
CGO_ENABLED?=0
ifneq ($(FDB_ENABLED), )

2
README.md
View File

@ -72,7 +72,7 @@ Developing Vault
If you wish to work on Vault itself or any of its built-in systems, you'll
first need [Go](https://www.golang.org) installed on your machine. Go version
1.16.7+ is *required*.
1.17.2+ is *required*.
For local dev first make sure Go is properly installed, including setting up a
[GOPATH](https://golang.org/doc/code.html#GOPATH). Ensure that `$GOPATH/bin` is in

5
builtin/credential/approle/path_role.go
View File

@ -11,6 +11,7 @@ import (
"github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/go-secure-stdlib/strutil"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/helper/parseip"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/cidrutil"
"github.com/hashicorp/vault/sdk/helper/consts"
@ -818,6 +819,10 @@ func (b *backend) roleEntry(ctx context.Context, s logical.Storage, roleName str
needsUpgrade = true
}
for i, cidr := range role.SecretIDBoundCIDRs {
role.SecretIDBoundCIDRs[i] = parseip.TrimLeadingZeroesCIDR(cidr)
}
if role.TokenPeriod == 0 && role.Period > 0 {
role.TokenPeriod = role.Period
}

28
builtin/credential/approle/validation.go
View File

@ -9,6 +9,7 @@ import (
"time"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/helper/parseip"
"github.com/hashicorp/vault/sdk/helper/cidrutil"
"github.com/hashicorp/vault/sdk/helper/locksutil"
"github.com/hashicorp/vault/sdk/logical"
@ -110,6 +111,25 @@ func (b *backend) secretIDAccessorLock(secretIDAccessor string) *locksutil.LockE
return locksutil.LockForKey(b.secretIDAccessorLocks, secretIDAccessor)
}
func decodeSecretIDStorageEntry(entry *logical.StorageEntry) (*secretIDStorageEntry, error) {
result := secretIDStorageEntry{}
if err := entry.DecodeJSON(&result); err != nil {
return nil, err
}
cleanup := func(in []string) []string {
var out []string
for _, s := range in {
out = append(out, parseip.TrimLeadingZeroesCIDR(s))
}
return out
}
result.CIDRList = cleanup(result.CIDRList)
result.TokenBoundCIDRs = cleanup(result.TokenBoundCIDRs)
return &result, nil
}
// nonLockedSecretIDStorageEntry fetches the secret ID properties from physical
// storage. The entry will be indexed based on the given HMACs of both role
// name and the secret ID. This method will not acquire secret ID lock to fetch
@ -134,8 +154,8 @@ func (b *backend) nonLockedSecretIDStorageEntry(ctx context.Context, s logical.S
return nil, nil
}
result := secretIDStorageEntry{}
if err := entry.DecodeJSON(&result); err != nil {
result, err := decodeSecretIDStorageEntry(entry)
if err != nil {
return nil, err
}
@ -154,12 +174,12 @@ func (b *backend) nonLockedSecretIDStorageEntry(ctx context.Context, s logical.S
}
if persistNeeded {
if err := b.nonLockedSetSecretIDStorageEntry(ctx, s, roleSecretIDPrefix, roleNameHMAC, secretIDHMAC, &result); err != nil {
if err := b.nonLockedSetSecretIDStorageEntry(ctx, s, roleSecretIDPrefix, roleNameHMAC, secretIDHMAC, result); err != nil {
return nil, fmt.Errorf("failed to upgrade role storage entry %w", err)
}
}
return &result, nil
return result, nil
}
// nonLockedSetSecretIDStorageEntry creates or updates a secret ID entry at the

3
builtin/logical/ssh/util.go
View File

@ -13,10 +13,9 @@ import (
"strings"
"time"
log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/vault/sdk/logical"
log "github.com/hashicorp/go-hclog"
"golang.org/x/crypto/ssh"
)

3
changelog/12868.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
core: build with Go 1.17, and mitigate a breaking change they made that could impact how approle and ssh interpret IPs/CIDRs
```

214
go.mod
View File

@ -1,6 +1,6 @@
module github.com/hashicorp/vault
go 1.16
go 1.17
replace github.com/hashicorp/vault/api => ./api
@ -15,11 +15,9 @@ require (
github.com/Azure/azure-storage-blob-go v0.13.0
github.com/Azure/go-autorest/autorest v0.11.17
github.com/Azure/go-autorest/autorest/adal v0.9.11
github.com/Microsoft/hcsshim v0.8.14 // indirect
github.com/NYTimes/gziphandler v1.1.1
github.com/SAP/go-hdb v0.14.1
github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/aerospike/aerospike-client-go v3.1.1+incompatible
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
@ -29,19 +27,15 @@ require (
github.com/armon/go-radix v1.0.0
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf
github.com/aws/aws-sdk-go v1.37.19
github.com/bitly/go-hostpool v0.1.0 // indirect
github.com/cenkalti/backoff/v3 v3.0.0
github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0
github.com/client9/misspell v0.3.4
github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c
github.com/containerd/containerd v1.4.3 // indirect
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
github.com/denisenkom/go-mssqldb v0.11.0
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
github.com/docker/go-connections v0.4.0
github.com/dsnet/compress v0.0.1 // indirect
github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74
github.com/dustin/go-humanize v1.0.0
github.com/fatih/color v1.13.0
@ -50,7 +44,6 @@ require (
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-errors/errors v1.0.1
github.com/go-ldap/ldap/v3 v3.2.4
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/go-sql-driver/mysql v1.5.0
github.com/go-test/deep v1.0.7
github.com/gocql/gocql v0.0.0-20210401103645-80ab1e13e309
@ -58,7 +51,6 @@ require (
github.com/google/go-cmp v0.5.5
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-metrics-stackdriver v0.2.0
github.com/gorilla/mux v1.7.3 // indirect
github.com/hashicorp/cap v0.1.0
github.com/hashicorp/consul-template v0.27.2-0.20211014231529-4ff55381f1c4
github.com/hashicorp/consul/api v1.11.0
@ -69,7 +61,6 @@ require (
github.com/hashicorp/go-hclog v1.0.0
github.com/hashicorp/go-kms-wrapping v0.6.7
github.com/hashicorp/go-memdb v1.3.2
github.com/hashicorp/go-msgpack v1.1.5 // indirect
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-raftchunking v0.6.3-0.20191002164813-7e9e8525653a
github.com/hashicorp/go-retryablehttp v0.6.7
@ -125,7 +116,6 @@ require (
github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f
github.com/jefferai/jsonx v1.0.0
github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f
github.com/json-iterator/go v1.1.12 // indirect
github.com/keybase/go-crypto v0.0.0-20190403132359-d65b6b94177f
github.com/kr/pretty v0.3.0
github.com/kr/text v0.2.0
@ -133,7 +123,6 @@ require (
github.com/mattn/go-colorable v0.1.11
github.com/mholt/archiver v3.1.1+incompatible
github.com/michaelklishin/rabbit-hole/v2 v2.11.0
github.com/miekg/dns v1.1.40 // indirect
github.com/mitchellh/cli v1.1.2
github.com/mitchellh/copystructure v1.0.0
github.com/mitchellh/go-homedir v1.1.0
@ -143,17 +132,14 @@ require (
github.com/mitchellh/mapstructure v1.4.2
github.com/mitchellh/reflectwalk v1.0.2
github.com/mongodb/go-client-mongodb-atlas v0.1.2
github.com/morikuni/aec v1.0.0 // indirect
github.com/natefinch/atomic v0.0.0-20150920032501-a62ce929ffcc
github.com/ncw/swift v1.0.47
github.com/nwaples/rardecode v1.1.0 // indirect
github.com/oklog/run v1.0.0
github.com/okta/okta-sdk-golang/v2 v2.0.0
github.com/oracle/oci-go-sdk v13.1.0+incompatible
github.com/ory/dockertest v3.3.5+incompatible
github.com/ory/dockertest/v3 v3.6.2
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pkg/errors v0.9.1
github.com/posener/complete v1.2.3
github.com/pquerna/otp v1.2.1-0.20191009055518-468c2dd2b58d
@ -166,13 +152,7 @@ require (
github.com/sasha-s/go-deadlock v0.2.0
github.com/sethvargo/go-limiter v0.7.1
github.com/shirou/gopsutil v3.21.5+incompatible
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/stretchr/testify v1.7.0
github.com/tidwall/pretty v1.0.1 // indirect
github.com/tklauser/go-sysconf v0.3.6 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
go.etcd.io/bbolt v1.3.5
go.etcd.io/etcd/client/pkg/v3 v3.5.0
go.etcd.io/etcd/client/v2 v2.305.0
@ -183,23 +163,207 @@ require (
go.opentelemetry.io/otel/trace v0.20.0
go.uber.org/atomic v1.9.0
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.5
google.golang.org/api v0.29.0
google.golang.org/genproto v0.0.0-20210928142010-c7af6a1a74c9 // indirect
google.golang.org/grpc v1.41.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
google.golang.org/protobuf v1.27.1
gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce
gopkg.in/ory-am/dockertest.v3 v3.3.4
gopkg.in/square/go-jose.v2 v2.5.1
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
layeh.com/radius v0.0.0-20190322222518-890bc1058917
mvdan.cc/gofumpt v0.1.1
)
require (
code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v51.1.0+incompatible // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/azure/auth v0.5.7 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.0 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
github.com/Jeffail/gabs v1.1.1 // indirect
github.com/Masterminds/goutils v1.1.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331 // indirect
github.com/Microsoft/hcsshim v0.8.14 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230 // indirect
github.com/aws/aws-sdk-go-v2 v1.3.2 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.1.5 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0 // indirect
github.com/aws/smithy-go v1.3.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/bitly/go-hostpool v0.1.0 // indirect
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/centrify/cloud-golang-sdk v0.0.0-20190214225812-119110094d0f // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
github.com/circonus-labs/circonusllhist v0.1.3 // indirect
github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381 // indirect
github.com/containerd/containerd v1.4.3 // indirect
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
github.com/coreos/go-oidc/v3 v3.0.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/couchbase/gocb/v2 v2.3.1 // indirect
github.com/couchbase/gocbcore/v10 v10.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 // indirect
github.com/digitalocean/godo v1.7.5 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/evanphx/json-patch/v5 v5.5.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7 // indirect
github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect
github.com/go-ldap/ldif v0.0.0-20200320164324-fd88d9b715b3 // indirect
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/go-yaml/yaml v2.1.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v1.11.0 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gophercloud/gophercloud v0.1.0 // indirect
github.com/gorilla/mux v1.7.3 // indirect
github.com/gorilla/websocket v1.4.1 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/cronexpr v1.1.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-kms-wrapping/entropy v0.1.0 // indirect
github.com/hashicorp/go-msgpack v1.1.5 // indirect
github.com/hashicorp/go-plugin v1.4.3 // indirect
github.com/hashicorp/go-slug v0.4.1 // indirect
github.com/hashicorp/go-tfe v0.12.0 // indirect
github.com/hashicorp/go-version v1.2.1 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/mdns v1.0.1 // indirect
github.com/hashicorp/serf v0.9.5 // indirect
github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/jackc/pgx v3.3.0+incompatible // indirect
github.com/jcmturner/aescts v1.0.1 // indirect
github.com/jcmturner/dnsutils v1.0.1 // indirect
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
github.com/jcmturner/rpc/v2 v2.0.2 // indirect
github.com/jeffchao/backoff v0.0.0-20140404060208-9d7fd7aa17f2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/linode/linodego v0.7.1 // indirect
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/miekg/dns v1.1.40 // indirect
github.com/mitchellh/hashstructure v1.0.0 // indirect
github.com/mitchellh/iochan v1.0.0 // indirect
github.com/mitchellh/pointerstructure v1.0.0 // indirect
github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/mwielbut/pointy v1.1.0 // indirect
github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect
github.com/nwaples/rardecode v1.1.0 // indirect
github.com/okta/okta-sdk-golang v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.0-rc9 // indirect
github.com/openlyinc/pointy v1.1.2 // indirect
github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/cachecontrol v0.0.0-20201205024021-ac21108117ac // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect
github.com/rogpeppe/go-internal v1.6.2 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/snowflakedb/gosnowflake v1.6.1 // indirect
github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d // indirect
github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 // indirect
github.com/tidwall/pretty v1.0.1 // indirect
github.com/tklauser/go-sysconf v0.3.6 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/vmware/govmomi v0.18.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.0.2 // indirect
github.com/xdg-go/stringprep v1.0.2 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
go.mongodb.org/atlas v0.7.1 // indirect
go.opencensus.io v0.22.3 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20210928142010-c7af6a1a74c9 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.42.0 // indirect
gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect
gopkg.in/resty.v1 v1.12.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
k8s.io/api v0.18.2 // indirect
k8s.io/apimachinery v0.18.2 // indirect
k8s.io/client-go v0.18.2 // indirect
k8s.io/klog v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

3
go.sum
View File

@ -1757,10 +1757,13 @@ k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs=
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
layeh.com/radius v0.0.0-20190322222518-890bc1058917 h1:BDXFaFzUt5EIqe/4wrTc4AcYZWP6iC6Ult+jQWLh5eU=
layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod h1:fywZKyu//X7iRzaxLgPWsvc0L26IUpVvE/aeIL2JtIQ=
mvdan.cc/gofumpt v0.1.1 h1:bi/1aS/5W00E2ny5q65w9SnKpWEF/UIOqDYBILpo9rA=

73
helper/parseip/parseip.go Normal file
View File

@ -0,0 +1,73 @@
package parseip
import (
"strings"
"k8s.io/utils/net"
)
// In Go 1.17 the behaviour of net.ParseIP and net.ParseCIDR changed
// (https://golang.org/doc/go1.17#net) so that leading zeros in the input results
// in an error. This package contains helpers that strip leading zeroes so as
// to avoid those errors.
// You should probably not be using anything here unless you've found a new place
// where IPs/CIDRs are read from storage and re-parsed.
// trimLeadingZeroes returns its input trimmed of any leading zeroes.
func trimLeadingZeroes(s string) string {
for i, r := range s {
if r == '0' {
continue
}
return s[i:]
}
return ""
}
// trimLeadingZeroesIPv4 takes an IPv4 string and returns the input
// trimmed of any excess leading zeroes in each octet.
func trimLeadingZeroesIPv4(s string) string {
if len(s) == 0 {
return s
}
pieces := strings.Split(s, ".")
var sb strings.Builder
for i, piece := range pieces {
trimmed := trimLeadingZeroes(piece)
if trimmed == "" && len(piece) > 0 {
sb.WriteByte('0')
} else {
sb.WriteString(trimmed)
}
if i != len(pieces)-1 {
sb.WriteByte('.')
}
}
return sb.String()
}
// trimLeadingZeroesIP does the same work as trimLeadingZeroesIPv4 but also accepts
// an IPv6 address that may contain an IPv4 address representation. Only decimal
// IPv4 addresses get zero-stripped.
func trimLeadingZeroesIP(s string) string {
for i := len(s) - 1; i >= 0; i-- {
if s[i] == ':' && net.ParseIPSloppy(s[i+1:]) != nil {
return s[:i+1] + trimLeadingZeroesIPv4(s[i+1:])
}
}
return trimLeadingZeroesIPv4(s)
}
// TrimLeadingZeroesCIDR does the same thing as trimLeadingZeroesIP but expects
// a CIDR address as input. If the input isn't a valid CIDR address, it is returned
// unchanged.
func TrimLeadingZeroesCIDR(s string) string {
pieces := strings.Split(s, "/")
if len(pieces) != 2 {
return s
}
pieces[0] = trimLeadingZeroesIP(pieces[0])
return strings.Join(pieces, "/")
}

35
helper/parseip/parseip_test.go Normal file
View File

@ -0,0 +1,35 @@
package parseip
import (
"testing"
)
func Test_TrimLeadingZeroes(t *testing.T) {
tests := []struct {
in string
want string
}{
{"127.0.0.1", "127.0.0.1"},
{"010.010.20.5", "10.10.20.5"},
{"1.1.1.010", "1.1.1.10"},
{"64:ff9b::192.00.002.33", "64:ff9b::192.0.2.33"},
{"2001:db8:122:344:c0:2:2100::", "2001:db8:122:344:c0:2:2100::"},
{"2001:db8:122:344::192.0.2.033", "2001:db8:122:344::192.0.2.33"},
}
for _, tt := range tests {
if got := trimLeadingZeroesIP(tt.in); got != tt.want {
t.Errorf("trimLeadingZeroesIP() = %v, want %v", got, tt.want)
}
}
for _, tt := range tests {
// Non-CIDR addresses are ignored.
if got := TrimLeadingZeroesCIDR(tt.in); got != tt.in {
t.Errorf("TrimLeadingZeroesCIDR() = %v, want %v", got, tt.in)
}
want := tt.want + "/32"
if got := TrimLeadingZeroesCIDR(tt.in + "/32"); got != want {
t.Errorf("TrimLeadingZeroesCIDR() = %v, want %v", got, want)
}
}
}

2
http/handler_test.go
View File

@ -885,7 +885,7 @@ func TestHandler_Patch_BadContentTypeHeader(t *testing.T) {
}
}
func kvRequestWithRetry(t *testing.T, req func() (*api.Secret, error)) (*api.Secret, error){
func kvRequestWithRetry(t *testing.T, req func() (*api.Secret, error)) (*api.Secret, error) {
t.Helper()
var err error

144
packages-oss.lock/layers/layers.mk generated
View File

@ -11,83 +11,83 @@ LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_CACHE_KEY_FILE := .buildc
LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_ARCHIVE_FILE := .buildcache/archives/00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f.tar.gz
$(eval $(call LAYER,$(LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_ID),$(LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_TYPE),$(LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_BASE_LAYER),$(LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_SOURCE_INCLUDE),$(LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_SOURCE_EXCLUDE),$(LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_CACHE_KEY_FILE),$(LAYER_00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f_ARCHIVE_FILE)))
LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_ID := 01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a
LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_TYPE := install-go
LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_BASE_LAYER := 00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f
LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_SOURCE_INCLUDE :=
LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_SOURCE_EXCLUDE :=
LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_CACHE_KEY_FILE := .buildcache/cache-keys/install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a
LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_ARCHIVE_FILE := .buildcache/archives/01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a.tar.gz
$(eval $(call LAYER,$(LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_ID),$(LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_TYPE),$(LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_BASE_LAYER),$(LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_SOURCE_INCLUDE),$(LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_SOURCE_EXCLUDE),$(LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_CACHE_KEY_FILE),$(LAYER_01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a_ARCHIVE_FILE)))
LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_ID := 01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079
LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_TYPE := install-go
LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_BASE_LAYER := 00-base-fc1fa0c0d0643b393dfc77cbd78580b60fc4366f
LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_SOURCE_INCLUDE :=
LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_SOURCE_EXCLUDE :=
LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_CACHE_KEY_FILE := .buildcache/cache-keys/install-go-877bac5144c973403bc3944c0a4d0e870fbbb079
LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_ARCHIVE_FILE := .buildcache/archives/01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079.tar.gz
$(eval $(call LAYER,$(LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_ID),$(LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_TYPE),$(LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_BASE_LAYER),$(LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_SOURCE_INCLUDE),$(LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_SOURCE_EXCLUDE),$(LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_CACHE_KEY_FILE),$(LAYER_01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079_ARCHIVE_FILE)))
LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_ID := 02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f
LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_TYPE := install-go-tools
LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_BASE_LAYER := 01-install-go-74ad9990bc7bc4f6c82858d6d5cdec3da3eb4b0a
LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_SOURCE_INCLUDE :=
LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_SOURCE_EXCLUDE :=
LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_CACHE_KEY_FILE := .buildcache/cache-keys/install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f
LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_ARCHIVE_FILE := .buildcache/archives/02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f.tar.gz
$(eval $(call LAYER,$(LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_ID),$(LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_TYPE),$(LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_BASE_LAYER),$(LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_SOURCE_INCLUDE),$(LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_SOURCE_EXCLUDE),$(LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_CACHE_KEY_FILE),$(LAYER_02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f_ARCHIVE_FILE)))
LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_ID := 02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2
LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_TYPE := install-go-tools
LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_BASE_LAYER := 01-install-go-877bac5144c973403bc3944c0a4d0e870fbbb079
LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_SOURCE_INCLUDE :=
LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_SOURCE_EXCLUDE :=
LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_CACHE_KEY_FILE := .buildcache/cache-keys/install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2
LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_ARCHIVE_FILE := .buildcache/archives/02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2.tar.gz
$(eval $(call LAYER,$(LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_ID),$(LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_TYPE),$(LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_BASE_LAYER),$(LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_SOURCE_INCLUDE),$(LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_SOURCE_EXCLUDE),$(LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_CACHE_KEY_FILE),$(LAYER_02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2_ARCHIVE_FILE)))
LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_ID := 03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c
LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_TYPE := set-workdir
LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_BASE_LAYER := 02-install-go-tools-0ede0ffe3d9cce5698f1b1ac51d0248bb766663f
LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_SOURCE_INCLUDE :=
LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_SOURCE_EXCLUDE :=
LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_CACHE_KEY_FILE := .buildcache/cache-keys/set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c
LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_ARCHIVE_FILE := .buildcache/archives/03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c.tar.gz
$(eval $(call LAYER,$(LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_ID),$(LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_TYPE),$(LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_BASE_LAYER),$(LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_SOURCE_INCLUDE),$(LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_SOURCE_EXCLUDE),$(LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_CACHE_KEY_FILE),$(LAYER_03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c_ARCHIVE_FILE)))
LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_ID := 03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53
LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_TYPE := set-workdir
LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_BASE_LAYER := 02-install-go-tools-f4c1518e9671005726e8bf75513528512b36f5a2
LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_SOURCE_INCLUDE :=
LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_SOURCE_EXCLUDE :=
LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_CACHE_KEY_FILE := .buildcache/cache-keys/set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53
LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_ARCHIVE_FILE := .buildcache/archives/03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53.tar.gz
$(eval $(call LAYER,$(LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_ID),$(LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_TYPE),$(LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_BASE_LAYER),$(LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_SOURCE_INCLUDE),$(LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_SOURCE_EXCLUDE),$(LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_CACHE_KEY_FILE),$(LAYER_03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53_ARCHIVE_FILE)))
LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_ID := 04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f
LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_TYPE := install-yarn
LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_BASE_LAYER := 03-set-workdir-aabd98d572488238fbb5a7f0d086e7f7abb0838c
LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_SOURCE_INCLUDE :=
LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_SOURCE_EXCLUDE :=
LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_CACHE_KEY_FILE := .buildcache/cache-keys/install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f
LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_ARCHIVE_FILE := .buildcache/archives/04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f.tar.gz
$(eval $(call LAYER,$(LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_ID),$(LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_TYPE),$(LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_BASE_LAYER),$(LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_SOURCE_INCLUDE),$(LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_SOURCE_EXCLUDE),$(LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_CACHE_KEY_FILE),$(LAYER_04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f_ARCHIVE_FILE)))
LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_ID := 04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86
LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_TYPE := install-yarn
LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_BASE_LAYER := 03-set-workdir-56f07806a01db8130a01fdbad631a2cba3ff7c53
LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_SOURCE_INCLUDE :=
LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_SOURCE_EXCLUDE :=
LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_CACHE_KEY_FILE := .buildcache/cache-keys/install-yarn-f8c6e065673e6047441a051da1a992019ca43a86
LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_ARCHIVE_FILE := .buildcache/archives/04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86.tar.gz
$(eval $(call LAYER,$(LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_ID),$(LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_TYPE),$(LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_BASE_LAYER),$(LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_SOURCE_INCLUDE),$(LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_SOURCE_EXCLUDE),$(LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_CACHE_KEY_FILE),$(LAYER_04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86_ARCHIVE_FILE)))
LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_ID := 05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5
LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_TYPE := make-ui-folder
LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_BASE_LAYER := 04-install-yarn-8d31e5c7e1be77ba9540ff895414a86bc6fd4c3f
LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_SOURCE_INCLUDE :=
LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_SOURCE_EXCLUDE :=
LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_CACHE_KEY_FILE := .buildcache/cache-keys/make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5
LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_ARCHIVE_FILE := .buildcache/archives/05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5.tar.gz
$(eval $(call LAYER,$(LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_ID),$(LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_TYPE),$(LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_BASE_LAYER),$(LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_SOURCE_INCLUDE),$(LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_SOURCE_EXCLUDE),$(LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_CACHE_KEY_FILE),$(LAYER_05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5_ARCHIVE_FILE)))
LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_ID := 05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43
LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_TYPE := make-ui-folder
LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_BASE_LAYER := 04-install-yarn-f8c6e065673e6047441a051da1a992019ca43a86
LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_SOURCE_INCLUDE :=
LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_SOURCE_EXCLUDE :=
LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_CACHE_KEY_FILE := .buildcache/cache-keys/make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43
LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_ARCHIVE_FILE := .buildcache/archives/05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43.tar.gz
$(eval $(call LAYER,$(LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_ID),$(LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_TYPE),$(LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_BASE_LAYER),$(LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_SOURCE_INCLUDE),$(LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_SOURCE_EXCLUDE),$(LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_CACHE_KEY_FILE),$(LAYER_05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43_ARCHIVE_FILE)))
LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_ID := 06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4
LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_TYPE := ui-dependencies
LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_BASE_LAYER := 05-make-ui-folder-6250d169a97d2111bfd9e226257c1e17d0a59ec5
LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_SOURCE_INCLUDE := ui/package.json ui/yarn.lock
LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_SOURCE_EXCLUDE :=
LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_CACHE_KEY_FILE := .buildcache/cache-keys/ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4
LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_ARCHIVE_FILE := .buildcache/archives/06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4.tar.gz
$(eval $(call LAYER,$(LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_ID),$(LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_TYPE),$(LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_BASE_LAYER),$(LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_SOURCE_INCLUDE),$(LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_SOURCE_EXCLUDE),$(LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_CACHE_KEY_FILE),$(LAYER_06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4_ARCHIVE_FILE)))
LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_ID := 06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de
LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_TYPE := ui-dependencies
LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_BASE_LAYER := 05-make-ui-folder-c9af5b6ad4a1e4dffbb201bf29c492e6a838ff43
LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_SOURCE_INCLUDE := ui/package.json ui/yarn.lock
LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_SOURCE_EXCLUDE :=
LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_CACHE_KEY_FILE := .buildcache/cache-keys/ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de
LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_ARCHIVE_FILE := .buildcache/archives/06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de.tar.gz
$(eval $(call LAYER,$(LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_ID),$(LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_TYPE),$(LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_BASE_LAYER),$(LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_SOURCE_INCLUDE),$(LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_SOURCE_EXCLUDE),$(LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_CACHE_KEY_FILE),$(LAYER_06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de_ARCHIVE_FILE)))
LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_ID := 07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58
LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_TYPE := build-ui
LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_BASE_LAYER := 06-ui-dependencies-890388ad4123d2c909ca9a6213295aada455f3f4
LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_SOURCE_INCLUDE := ui/
LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_SOURCE_EXCLUDE :=
LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_CACHE_KEY_FILE := .buildcache/cache-keys/build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58
LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_ARCHIVE_FILE := .buildcache/archives/07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58.tar.gz
$(eval $(call LAYER,$(LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_ID),$(LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_TYPE),$(LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_BASE_LAYER),$(LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_SOURCE_INCLUDE),$(LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_SOURCE_EXCLUDE),$(LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_CACHE_KEY_FILE),$(LAYER_07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58_ARCHIVE_FILE)))
LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_ID := 07-build-ui-9a4c8178808477469c37460df34f28cade634794
LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_TYPE := build-ui
LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_BASE_LAYER := 06-ui-dependencies-ee1bc43cc876b6ac95b30d77c726ccd15ad8e4de
LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_SOURCE_INCLUDE := ui/
LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_SOURCE_EXCLUDE :=
LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_CACHE_KEY_FILE := .buildcache/cache-keys/build-ui-9a4c8178808477469c37460df34f28cade634794
LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_ARCHIVE_FILE := .buildcache/archives/07-build-ui-9a4c8178808477469c37460df34f28cade634794.tar.gz
$(eval $(call LAYER,$(LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_ID),$(LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_TYPE),$(LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_BASE_LAYER),$(LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_SOURCE_INCLUDE),$(LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_SOURCE_EXCLUDE),$(LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_CACHE_KEY_FILE),$(LAYER_07-build-ui-9a4c8178808477469c37460df34f28cade634794_ARCHIVE_FILE)))
LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_ID := 08-go-modules-1934f0273183384d1917c5195fd261463c7684b0
LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_TYPE := go-modules
LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_BASE_LAYER := 07-build-ui-a2ecfcd49343de8b46d714922ed3e9a05b7f5c58
LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_SOURCE_INCLUDE := go.mod go.sum */go.mod */go.sum
LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_SOURCE_EXCLUDE :=
LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-1934f0273183384d1917c5195fd261463c7684b0
LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_ARCHIVE_FILE := .buildcache/archives/08-go-modules-1934f0273183384d1917c5195fd261463c7684b0.tar.gz
$(eval $(call LAYER,$(LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_ID),$(LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_TYPE),$(LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_BASE_LAYER),$(LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_SOURCE_INCLUDE),$(LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_SOURCE_EXCLUDE),$(LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_CACHE_KEY_FILE),$(LAYER_08-go-modules-1934f0273183384d1917c5195fd261463c7684b0_ARCHIVE_FILE)))
LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_ID := 08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b
LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_TYPE := go-modules
LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_BASE_LAYER := 07-build-ui-9a4c8178808477469c37460df34f28cade634794
LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_SOURCE_INCLUDE := go.mod go.sum */go.mod */go.sum
LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_SOURCE_EXCLUDE :=
LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_CACHE_KEY_FILE := .buildcache/cache-keys/go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b
LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_ARCHIVE_FILE := .buildcache/archives/08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b.tar.gz
$(eval $(call LAYER,$(LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_ID),$(LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_TYPE),$(LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_BASE_LAYER),$(LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_SOURCE_INCLUDE),$(LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_SOURCE_EXCLUDE),$(LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_CACHE_KEY_FILE),$(LAYER_08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b_ARCHIVE_FILE)))
LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_ID := 09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a
LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_TYPE := copy-source
LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_BASE_LAYER := 08-go-modules-1934f0273183384d1917c5195fd261463c7684b0
LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_SOURCE_INCLUDE := *.go
LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_SOURCE_EXCLUDE :=
LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-33a901b679c2d38c836a4418b31b7b90318c483a
LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_ARCHIVE_FILE := .buildcache/archives/09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a.tar.gz
$(eval $(call LAYER,$(LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_ID),$(LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_TYPE),$(LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_BASE_LAYER),$(LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_SOURCE_INCLUDE),$(LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_SOURCE_EXCLUDE),$(LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_CACHE_KEY_FILE),$(LAYER_09-copy-source-33a901b679c2d38c836a4418b31b7b90318c483a_ARCHIVE_FILE)))
LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_ID := 09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5
LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_TYPE := copy-source
LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_BASE_LAYER := 08-go-modules-a1e9cc6c22e8691bbc9a3bb3e91eb05d5e97730b
LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_SOURCE_INCLUDE := *.go
LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_SOURCE_EXCLUDE :=
LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5
LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_ARCHIVE_FILE := .buildcache/archives/09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5.tar.gz
$(eval $(call LAYER,$(LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_ID),$(LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_TYPE),$(LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_BASE_LAYER),$(LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_SOURCE_INCLUDE),$(LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_SOURCE_EXCLUDE),$(LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_CACHE_KEY_FILE),$(LAYER_09-copy-source-1ab15aacac6a43f8c71defb28e9bcdefafcecfc5_ARCHIVE_FILE)))

1370
packages-oss.lock/pkgs.yml generated
View File

File diff suppressed because it is too large Load Diff

2
packages-oss.yml
View File

@ -38,7 +38,7 @@ inputs:
PRODUCT_VERSION: 0.0.0-snapshot
# GO_VERSION is the version of the Go toolchain to use to compile this package.
GO_VERSION: 1.16.7
GO_VERSION: 1.17.2
# YARN_VERSION is the version of Yarn to install for the UI layer.
YARN_VERSION: 1.19.1-1

2
scripts/docker/Dockerfile
View File

@ -1,7 +1,7 @@
# Multi-stage builder to avoid polluting users environment with wrong
# architecture binaries. Since this binary is used in an alpine container,
# we're explicitly compiling for 'linux/amd64'
ARG VERSION=1.16.7
ARG VERSION=1.17.2
FROM golang:${VERSION} AS builder

2
scripts/docker/Dockerfile.ui
View File

@ -3,7 +3,7 @@
# we're explicitly compiling for 'linux/amd64'
FROM debian:buster AS builder
ARG VERSION=1.16.7
ARG VERSION=1.17.2
ARG CGO_ENABLED=0
ARG BUILD_TAGS
ENV JOBS=2

2
vault/diagnose/tls_verification_test.go
View File

@ -78,7 +78,7 @@ func TestTLSTrailingData(t *testing.T) {
if errs == nil || len(errs) != 1 {
t.Fatalf("TLS Config check on fake certificate should fail")
}
if !strings.Contains(errs[0].Error(), "asn1: syntax error: trailing data") {
if !strings.Contains(errs[0].Error(), "x509: trailing data") {
t.Fatalf("Bad error message: %s", errs[0])
}
}