Skip to content

Commit

Permalink
feat(cli): DRE-120 Lazily check for HSM/private key auth (#386)
Browse files Browse the repository at this point in the history 
* feat(cli): DRE-120 Lazily check for HSM/private key auth

* bazel repin

* clippy

* Accept 2GB remote bazel cache
  • Loading branch information
@sasa-tomic
sasa-tomic committed May 17, 2024
1 parent e54b12a commit cb7be54
Show file tree
Hide file tree
Showing 12 changed files with 378 additions and 272 deletions.
125 changes: 110 additions & 15 deletions Cargo.Bazel.lock
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "b76ca6e07b594e6c690a4f7a63269eecaae962d8a2bcb5976e90b3420b116d04",
"checksum": "38e601eb669ca743471679190b688ed52ed71acd4fc22b1b8535725ad2eccf0f",
"crates": {
"actix-codec 0.5.2": {
"name": "actix-codec",
Expand Down Expand Up @@ -11748,6 +11748,10 @@
"id": "ic-canister-client 0.9.0",
"target": "ic_canister_client"
},
{
"id": "ic-canister-client-sender 0.9.0",
"target": "ic_canister_client_sender"
},
{
"id": "ic-interfaces-registry 0.9.0",
"target": "ic_interfaces_registry"
Expand Down Expand Up @@ -11829,7 +11833,7 @@
"target": "reqwest"
},
{
"id": "self_update 0.39.0",
"id": "self_update 0.40.0",
"target": "self_update"
},
{
Expand Down Expand Up @@ -16870,7 +16874,7 @@
"target": "pin_project_lite"
},
{
"id": "socket2 0.4.10",
"id": "socket2 0.5.6",
"target": "socket2"
},
{
Expand Down Expand Up @@ -37844,6 +37848,7 @@
"crate_features": {
"common": [
"__tls",
"blocking",
"charset",
"default",
"default-tls",
Expand All @@ -37852,7 +37857,95 @@
"json",
"macos-system-configuration"
],
"selects": {}
"selects": {
"aarch64-apple-darwin": [
"futures-channel"
],
"aarch64-apple-ios": [
"futures-channel"
],
"aarch64-apple-ios-sim": [
"futures-channel"
],
"aarch64-fuchsia": [
"futures-channel"
],
"aarch64-linux-android": [
"futures-channel"
],
"aarch64-pc-windows-msvc": [
"futures-channel"
],
"aarch64-unknown-linux-gnu": [
"futures-channel"
],
"arm-unknown-linux-gnueabi": [
"futures-channel"
],
"armv7-linux-androideabi": [
"futures-channel"
],
"armv7-unknown-linux-gnueabi": [
"futures-channel"
],
"i686-apple-darwin": [
"futures-channel"
],
"i686-linux-android": [
"futures-channel"
],
"i686-pc-windows-msvc": [
"futures-channel"
],
"i686-unknown-freebsd": [
"futures-channel"
],
"i686-unknown-linux-gnu": [
"futures-channel"
],
"powerpc-unknown-linux-gnu": [
"futures-channel"
],
"riscv32imc-unknown-none-elf": [
"futures-channel"
],
"riscv64gc-unknown-none-elf": [
"futures-channel"
],
"s390x-unknown-linux-gnu": [
"futures-channel"
],
"thumbv7em-none-eabi": [
"futures-channel"
],
"thumbv8m.main-none-eabi": [
"futures-channel"
],
"x86_64-apple-darwin": [
"futures-channel"
],
"x86_64-apple-ios": [
"futures-channel"
],
"x86_64-fuchsia": [
"futures-channel"
],
"x86_64-linux-android": [
"futures-channel"
],
"x86_64-pc-windows-msvc": [
"futures-channel"
],
"x86_64-unknown-freebsd": [
"futures-channel"
],
"x86_64-unknown-linux-gnu": [
"futures-channel"
],
"x86_64-unknown-none": [
"futures-channel"
]
}
},
"deps": {
"common": [
Expand Down Expand Up @@ -37907,6 +38000,10 @@
"id": "encoding_rs 0.8.33",
"target": "encoding_rs"
},
{
"id": "futures-channel 0.3.30",
"target": "futures_channel"
},
{
"id": "h2 0.4.2",
"target": "h2"
Expand Down Expand Up @@ -40084,13 +40181,13 @@
},
"license": "Apache-2.0"
},
"self_update 0.39.0": {
"self_update 0.40.0": {
"name": "self_update",
"version": "0.39.0",
"version": "0.40.0",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/self_update/0.39.0/download",
"sha256": "1a34ad8e4a86884ab42e9b8690e9343abdcfe5fa38a0318cfe1565ba9ad437b4"
"url": "https://static.crates.io/crates/self_update/0.40.0/download",
"sha256": "4e4997484b55df069a4773d822715695b2cc27b23829eca2a4b41690e948bdeb"
}
},
"targets": [
Expand Down Expand Up @@ -40129,7 +40226,7 @@
"deps": {
"common": [
{
"id": "hyper 0.14.28",
"id": "hyper 1.3.1",
"target": "hyper"
},
{
Expand All @@ -40149,15 +40246,15 @@
"target": "regex"
},
{
"id": "reqwest 0.11.26",
"id": "reqwest 0.12.4",
"target": "reqwest"
},
{
"id": "self-replace 1.3.7",
"target": "self_replace"
},
{
"id": "self_update 0.39.0",
"id": "self_update 0.40.0",
"target": "build_script_build"
},
{
Expand All @@ -40184,7 +40281,7 @@
"selects": {}
},
"edition": "2018",
"version": "0.39.0"
"version": "0.40.0"
},
"build_script_attrs": {
"data_glob": [
Expand Down Expand Up @@ -47669,9 +47766,7 @@
"winbase",
"wincon",
"winerror",
"winnt",
"ws2ipdef",
"ws2tcpip"
"winnt"
],
"selects": {}
},
Expand Down
12 changes: 7 additions & 5 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/bazel-cache-s3-start.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ docker run --detach --name=bazel-remote -u $(id -u):$(id -g) \
-v ~/.cache/bazel-remote:/data -v $HOME/.aws:/aws-config \
-p 9090:8080 -p 9092:9092 \
quay.io/bazel-remote/bazel-remote \
--max_size 1 \
--max_size 2 \
--s3.auth_method=aws_credentials_file --s3.aws_profile=wasabi --s3.aws_shared_credentials_file=/aws-config/credentials --s3.bucket=dre-ci-cache --s3.endpoint=s3.eu-central-2.wasabisys.com
15 changes: 8 additions & 7 deletions rs/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ clap = { workspace = true }
clap-num = { workspace = true }
colored = { workspace = true }
cryptoki = { workspace = true }
cycles-minting-canister = { workspace = true }
decentralization = { workspace = true }
dialoguer = { workspace = true }
dirs = { workspace = true }
Expand All @@ -29,17 +30,21 @@ futures = { workspace = true }
futures-util = { workspace = true }
ic-base-types = { workspace = true }
ic-canister-client = { workspace = true }
ic-canister-client-sender = { workspace = true }
ic-canisters = { workspace = true }
ic-interfaces-registry = { workspace = true }
ic-management-backend = { workspace = true }
ic-management-types = { workspace = true }
ic-nervous-system-clients = { workspace = true }
ic-nns-constants = { workspace = true }
ic-nns-governance = { workspace = true }
ic-nervous-system-root = { workspace = true }
ic-nns-common = { workspace = true }
ic-nns-governance = { workspace = true }
ic-protobuf = { workspace = true }
ic-registry-keys = { workspace = true }
ic-registry-local-registry = { workspace = true }
ic-registry-subnet-type = { workspace = true }
ic-sns-wasm = { workspace = true }
ic-sys = { workspace = true }
itertools = { workspace = true }
keyring = { workspace = true }
Expand All @@ -49,6 +54,7 @@ prost = { workspace = true }
regex = { workspace = true }
registry-canister = { workspace = true }
reqwest = { workspace = true }
self_update = { version = "0.40.0", features = ["archive-tar"] }
serde = { workspace = true }
serde_json = { workspace = true }
sha2 = { workspace = true }
Expand All @@ -57,14 +63,9 @@ spinners = { workspace = true }
strum = { workspace = true }
tabled = { workspace = true }
tabular = { workspace = true }
tempfile = "3.10.0"
tokio = { workspace = true }
url = { workspace = true }
tempfile = "3.10.0"
self_update = { version = "0.39.0", features = [ "archive-tar" ]}
ic-nervous-system-root = { workspace = true }
ic-nervous-system-clients = { workspace = true }
cycles-minting-canister = { workspace = true }
ic-sns-wasm = { workspace = true }

[dev-dependencies]
wiremock = { workspace = true }
Expand Down

0 comments on commit cb7be54

Please sign in to comment.