spiretf/dispenser
1
0
Fork 0
mirror of https://codeberg.org/spire/dispenser.git synced 2026-06-03 10:04:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

updates

Browse source
This commit is contained in:
Robin Appelman 2024-06-13 22:30:52 +02:00
commit 52ca1c8df5
8 changed files with 675 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.github/workflows/ci.yml vendored
View file

@ -1,4 +1,4 @@
on: [push, pull_request] on: [ push, pull_request ]
name: CI name: CI
@ -6,8 +6,8 @@ jobs:
check: check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v20 - uses: cachix/install-nix-action@v27
- uses: icewind1991/attic-action@v1 - uses: icewind1991/attic-action@v1
with: with:
name: ci name: ci
@ -19,8 +19,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: check needs: check
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v20 - uses: cachix/install-nix-action@v27
- uses: icewind1991/attic-action@v1 - uses: icewind1991/attic-action@v1
with: with:
name: ci name: ci
@ -38,8 +38,8 @@ jobs:
- x86_64-unknown-linux-gnu - x86_64-unknown-linux-gnu
- x86_64-unknown-linux-musl - x86_64-unknown-linux-musl
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v20 - uses: cachix/install-nix-action@v27
- uses: icewind1991/attic-action@v1 - uses: icewind1991/attic-action@v1
with: with:
name: ci name: ci
@ -55,8 +55,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: check needs: check
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v20 - uses: cachix/install-nix-action@v27
- uses: icewind1991/attic-action@v1 - uses: icewind1991/attic-action@v1
with: with:
name: ci name: ci
@ -68,8 +68,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: build-nixpkgs needs: build-nixpkgs
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v20 - uses: cachix/install-nix-action@v27
- uses: icewind1991/attic-action@v1 - uses: icewind1991/attic-action@v1
with: with:
name: ci name: ci

6
.github/workflows/release.yml vendored
View file

@ -2,7 +2,7 @@ name: Release
on: on:
release: release:
types: [created] types: [ created ]
jobs: jobs:
@ -10,8 +10,8 @@ jobs:
name: Build release binaries name: Build release binaries
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v20 - uses: cachix/install-nix-action@v27
- uses: icewind1991/attic-action@v1 - uses: icewind1991/attic-action@v1
with: with:
name: ci name: ci

1163
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

22
Cargo.toml
View file

@ -5,16 +5,16 @@ authors = ["Robin Appelman <robin@icewind.nl>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
async-trait = "0.1.77" async-trait = "0.1.80"
chrono = { version = "0.4.34", features = ["serde"] } chrono = { version = "0.4.38", features = ["serde"] }
thiserror = "1.0.57" thiserror = "1.0.61"
reqwest = { version = "0.11.24", default-features = false, features = ["json", "rustls-tls"] } reqwest = { version = "0.12.4", default-features = false, features = ["json", "rustls-tls"] }
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.203", features = ["derive"] }
toml = "0.8.10" toml = "0.8.14"
tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "signal"] } tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread", "signal"] }
camino = "1.1.6" camino = "1.1.7"
petname = "1.1.3" petname = "2.0.2"
thrussh = "0.34.0" # 0.35.1 broke password auth? thrussh = "0.34.1" # 0.35.1 broke password auth?
thrussh-keys = "0.22.1" thrussh-keys = "0.22.1"
futures-util = "0.3.30" futures-util = "0.3.30"
pretty_env_logger = "0.5.0" pretty_env_logger = "0.5.0"
@ -22,7 +22,7 @@ cron = "0.12.1"
rcon = { version = "0.6.0", features = ["rt-tokio"] } rcon = { version = "0.6.0", features = ["rt-tokio"] }
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = "0.3.18" tracing-subscriber = "0.3.18"
clap = { version = "4.5.1", features = ["derive"] } clap = { version = "4.5.7", features = ["derive"] }
main_error = "0.1.2" main_error = "0.1.2"
secretfile = "0.1.0" secretfile = "0.1.0"

26
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1698420672, "lastModified": 1717067539,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9", "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,16 +22,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705095711, "lastModified": 1718308668,
"narHash": "sha256-//p6ObTf4udW43XmPevAvb7+SrcmFxNtYQv1rmM/3bE=", "narHash": "sha256-bIiBteaAwucl3iXUX6MtnUV2c7VBBIJgcSUEa35zvuk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2932c4c3af0d213b318c25ec6b4e28db68657086", "rev": "171d55c5959ef046f1fc05f9b68faa844c457f5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "release-23.11", "ref": "release-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -53,11 +53,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705025860, "lastModified": 1718245100,
"narHash": "sha256-9vcqo5CJLOHU63S7pVlP0u4OhgJxrXebQR4vqMPXLRg=", "narHash": "sha256-ETm3A2nUVEUwVQ30fj3ePK4rqsSbSnY4uP4LYrFrDNE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d458975da373a37422577886566fce8201bc1254", "rev": "4cbc2810d1dfb5960791be92df6a5f842a79bdfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +86,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1710146030,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -3,7 +3,7 @@
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
naersk.url = "github:nix-community/naersk"; naersk.url = "github:nix-community/naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs"; naersk.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.url = "nixpkgs/release-23.11"; nixpkgs.url = "nixpkgs/release-24.05";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
rust-overlay.inputs.flake-utils.follows = "utils"; rust-overlay.inputs.flake-utils.follows = "utils";

2
src/cloud/digitalocean.rs
View file

@ -89,7 +89,7 @@ impl Cloud for DigitalOcean {
region: self.region.as_str(), region: self.region.as_str(),
size: self.plan.as_str(), size: self.plan.as_str(),
tags: &["spire"], tags: &["spire"],
name: petname(2, "-"), name: petname(2, "-").expect("failed to generate name"),
image: "docker-20-04", image: "docker-20-04",
ssh_keys: key_ids, ssh_keys: key_ids,
ipv6: true, ipv6: true,

2
src/cloud/vultr.rs
View file

@ -68,7 +68,7 @@ impl Cloud for Vultr {
region: self.region.as_str(), region: self.region.as_str(),
plan: self.plan.as_str(), plan: self.plan.as_str(),
tag: "spire", tag: "spire",
label: petname(2, "-"), label: petname(2, "-").expect("failed to generate name"),
image_id: self.get_app_image_id("docker").await?, image_id: self.get_app_image_id("docker").await?,
sshkey_id: key_ids, sshkey_id: key_ids,
enable_ipv6: true, enable_ipv6: true,