Deprecate standalone gentoken binary

Author: barthalion

Cargo.lock

@@ -7,8 +7,8 @@ default-run = "flat-manager"
 edition = "2021"
 
 [workspace]
-members = ["common", "client", "gentoken"]
-default-members = [".", "common", "client", "gentoken"]
+members = ["common", "client"]
+default-members = [".", "common", "client"]
 
 [lib]
 name = "flatmanager"

Cargo.toml

@@ -22,7 +22,6 @@ RUN chmod +x /usr/local/bin/catatonit
 
 COPY --from=builder /src/target/release/flat-manager /usr/local/bin/flat-manager
 COPY --from=builder /flat-manager-hooks/target/release/flathub-hooks /usr/local/bin/flathub-hooks
-COPY --from=builder /src/target/release/gentoken /usr/local/bin/gentoken
 COPY --from=builder /src/target/release/flat-manager-client  /usr/local/bin/flat-manager-client
 
 ENV RUST_BACKTRACE=1

Dockerfile

@@ -142,7 +142,7 @@ your token for sharing with others (for example sending the above
 upload-only token to a builder), but you can also generate a
 token with the gentoken command:
 
-    echo -n "secret" | base64 | cargo run --bin gentoken -- --base64 --secret-file - --name testtoken
+    echo -n "secret" | base64 | cargo run --bin flat-manager-client -- gentoken --base64 --secret-file - --name testtoken
 
 The above matches the default secret, so can be used for testing.
 
@@ -157,7 +157,7 @@ For a production setup, you will also want to generate a token
 for `delta-generator`. This can be done by following the above
 command with these arguments:
 
-    echo -n "secret" | base64 | cargo run --bin gentoken -- --base64 --secret-file - --name delta-generator --sub delta --scope generate
+    echo -n "secret" | base64 | cargo run --bin flat-manager-client -- gentoken --base64 --secret-file - --name delta-generator --sub delta --scope generate
 
 ## Running
 
@@ -180,7 +180,7 @@ the repository, but for testing we can just do it in a subdirectory:
 
 Then we can upload it to the repository by doing (assuming the default secret):
 
-    export REPO_TOKEN=$(echo -n "secret" | base64 | cargo run --bin gentoken -- --base64 --secret-file - --name test)
+    export REPO_TOKEN=$(echo -n "secret" | base64 | cargo run --bin flat-manager-client -- gentoken --base64 --secret-file - --name test)
     ./flat-manager-client push --commit $(./flat-manager-client create http://127.0.0.1:8080 stable) test-build/local-repo
 
 This will create a new "build", upload the build to it and then "commit" the build.

README.md

@@ -20,3 +20,4 @@ serde_derive = "1.0"
 serde_json = "1.0"
 thiserror = "2"
 tokio = { version = "1.18", features = ["time", "macros", "rt", "rt-multi-thread"] }
+jwt = { version = "10.3.0", package = "jsonwebtoken", features = ["aws_lc_rs"] }

client/Cargo.toml

@@ -4,7 +4,7 @@ use jwt::{encode, EncodingKey, Header};
 use std::fs;
 use std::io::{self, Read};
 
-use crate::tokens::{Claims, ClaimsScope};
+use flat_manager_common::tokens::{Claims, ClaimsScope};
 
 fn default_duration() -> i64 {
     Duration::days(365).num_seconds()

common/src/gentoken.rs client/src/gentoken.rscommon/src/gentoken.rs renamed to client/src/gentoken.rs

@@ -4,7 +4,9 @@ use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
 use chrono::DateTime;
 use clap::{Args, Parser, Subcommand};
 use client::{ApiClient, ClientError, JobPoller};
-use flat_manager_common::gentoken::{run_gentoken, GentokenArgs};
+mod gentoken;
+
+use gentoken::{run_gentoken, GentokenArgs};
 use log::LevelFilter;
 use serde::Deserialize;
 use serde_json::{json, Value};

client/src/main.rs

@@ -6,10 +6,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 base64 = "0.22"
-chrono = { version = "0.4", features = ["serde"] }
-clap = { version = "4.5.60", features = ["derive"] }
 hex = "0.4"
-jwt = { package = "jsonwebtoken", version = "10.3.0", features = ["aws_lc_rs"] }
 libostree = { package = "ostree", version = "0.20.5", features = ["v2021_5"] }
 serde = "1.0"
 serde_derive = "1.0"

common/Cargo.toml

@@ -1,3 +1,2 @@
-pub mod gentoken;
 pub mod ostree;
 pub mod tokens;