swagger_json

bencherdev · Nov 17, 2023 · 90160be · 90160be
1 parent 519c731
commit 90160be
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 37 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/docker/run.sh b/docker/run.sh
@@ -2,7 +2,5 @@
 
 KIND=${1:-local}
 
-cd docker
-docker compose -f builder.docker-compose.yml build
-docker compose -f $KIND.docker-compose.yml up --build
-cd -
+docker compose -f docker/builder.docker-compose.yml build
+docker compose -f docker/$KIND.docker-compose.yml up --build
diff --git a/lib/bencher_client/build.rs b/lib/bencher_client/build.rs
@@ -1,7 +1,7 @@
 #![allow(let_underscore_drop, clippy::unwrap_used)]
 
 fn main() {
-    let src = "../../services/console/src/content/api/swagger.json";
+    let src = "../bencher_valid/swagger.json";
     println!("cargo:rerun-if-changed={src}");
     let file = std::fs::File::open(src).unwrap();
     let spec = serde_json::from_reader(file).unwrap();

diff --git a/...ices/console/src/content/api/swagger.json → lib/bencher_valid/swagger.json b/...ices/console/src/content/api/swagger.json → lib/bencher_valid/swagger.json
diff --git a/scripts/tag.sh b/scripts/tag.sh
@@ -21,10 +21,10 @@ cd -
 
 git add Cargo.toml
 git add Cargo.lock
+git add ./lib/bencher_valid/swagger.json
 git add ./services/action/dist/index.js
 git add ./services/console/package.json
 git add ./services/console/package-lock.json
-git add ./services/console/src/content/api/swagger.json
 git add ./services/console/src/content/reference/changelog.mdx
 git add ./services/console/src/types/bencher.ts
 

diff --git a/services/action/src/main.ts b/services/action/src/main.ts
@@ -2,7 +2,7 @@ import * as core from "@actions/core";
 import * as toolCache from "@actions/tool-cache";
 import { chmod } from "fs/promises";
 
-import swagger from "../../console/src/content/api/swagger.json";
+import swagger from "../../../lib/bencher_valid/swagger.json";
 
 const run = async () => {
 	const cli_version = core.getInput("version");

diff --git a/services/api/builder.Dockerfile b/services/api/builder.Dockerfile
@@ -8,9 +8,6 @@ ARG MOLD_VERSION
 RUN curl -L --retry 10 --silent --show-error https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-$(uname -m)-linux.tar.gz | tar -C /usr/local --strip-components=1 -xzf -
 RUN "$(realpath /usr/bin/ld)" != /usr/local/bin/mold && sudo ln -sf /usr/local/bin/mold "$(realpath /usr/bin/ld)"; true
 
-WORKDIR /usr/src
-COPY Cargo.toml Cargo.toml
-
 WORKDIR /usr/src/.cargo
 COPY .cargo/config.toml config.toml
 
@@ -29,18 +26,17 @@ COPY plus/bencher_billing bencher_billing
 COPY plus/bencher_license bencher_license
 
 WORKDIR /usr/src
+COPY Cargo.toml Cargo.toml
+COPY Cargo.lock Cargo.lock
 RUN cargo init xtask
 
 WORKDIR /usr/src/services
 RUN cargo init cli
 
-WORKDIR /usr/src/services/console/src/content/api
-COPY services/console/src/content/api/swagger.json swagger.json
-
 WORKDIR /usr/src/services/api
+COPY services/api/migrations migrations
 COPY services/api/src src
 COPY services/api/Cargo.toml Cargo.toml
-COPY services/api/migrations migrations
 COPY services/api/diesel.toml diesel.toml
 
 RUN cargo build --release
diff --git a/services/api/builder.Dockerfile.dockerignore b/services/api/builder.Dockerfile.dockerignore
@@ -0,0 +1,13 @@
+# Ignore all
+*
+
+# Except
+!.cargo/
+!lib/
+!plus/
+!Cargo.toml
+!Cargo.lock
+!services/api/migrations/
+!services/api/src/
+!services/api/Cargo.toml
+!services/api/diesel.toml
diff --git a/services/api/litestream.Dockerfile.dockerignore b/services/api/litestream.Dockerfile.dockerignore
@@ -0,0 +1,5 @@
+# Ignore all
+*
+
+# Except
+!entrypoint.sh
diff --git a/services/api/local.Dockerfile.dockerignore b/services/api/local.Dockerfile.dockerignore
@@ -0,0 +1,2 @@
+# Ignore all
+*
diff --git a/services/api/src/lib.rs b/services/api/src/lib.rs
@@ -17,8 +17,8 @@ pub const API_VERSION: &str = env!("CARGO_PKG_VERSION");
 // So if the `SWAGGER_PATH` below is ever updated
 // also update `./git/hooks/pre-push` accordingly.
 #[cfg(feature = "swagger")]
-pub const SWAGGER_PATH: &str = "../console/src/content/api/swagger.json";
-pub const SWAGGER_SPEC_STR: &str = include_str!("../../console/src/content/api/swagger.json");
+pub const SWAGGER_PATH: &str = "./swagger.json";
+pub const SWAGGER_SPEC_STR: &str = include_str!("../swagger.json");
 #[allow(clippy::expect_used)]
 pub static SWAGGER_SPEC: Lazy<JsonSpec> = Lazy::new(|| {
     JsonSpec(

diff --git a/services/console/Dockerfile.dockerignore b/services/console/Dockerfile.dockerignore
@@ -0,0 +1,2 @@
+# Ignore all
+*
diff --git a/services/console/biome.json b/services/console/biome.json
@@ -1,13 +1,7 @@
 {
 	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
 	"files": {
-		"ignore": [
-			"./astro/",
-			"./netlify/",
-			"./dist/",
-			"./src/content/api/swagger.json",
-			"./src/types/bencher.ts"
-		]
+		"ignore": ["./astro/", "./netlify/", "./dist/", "./src/types/bencher.ts"]
 	},
 	"linter": {
 		"enabled": true,

diff --git a/services/console/builder.Dockerfile b/services/console/builder.Dockerfile
@@ -10,22 +10,31 @@ RUN "$(realpath /usr/bin/ld)" != /usr/local/bin/mold && sudo ln -sf /usr/local/b
 
 RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
-WORKDIR /usr/src
-COPY Cargo.toml Cargo.toml
-RUN cargo init xtask
-
 WORKDIR /usr/src/.cargo
 COPY .cargo/config.toml config.toml
 
+WORKDIR /usr/src/lib
+RUN cargo init --lib bencher_adapter
+RUN cargo init --lib bencher_boundary
+RUN cargo init --lib bencher_json
+RUN cargo init --lib bencher_logger
+RUN cargo init --lib bencher_plot
+RUN cargo init --lib bencher_rbac
+RUN cargo init --lib bencher_token
+COPY lib/bencher_valid bencher_valid
+
+WORKDIR /usr/src/plus
+RUN cargo init --lib bencher_billing
+RUN cargo init --lib bencher_license
+
 WORKDIR /usr/src/services
 RUN cargo init api
 RUN cargo init cli
 
-WORKDIR /usr/src/plus
-RUN cargo init bencher_plus --lib
-
-WORKDIR /usr/src/lib
-COPY lib/bencher_valid bencher_valid
+WORKDIR /usr/src
+COPY Cargo.toml Cargo.toml
+COPY Cargo.lock Cargo.lock
+RUN cargo init xtask
 
 WORKDIR /usr/src/lib/bencher_valid
 RUN wasm-pack build --target web --no-default-features --features plus,wasm

diff --git a/services/console/builder.Dockerfile.dockerignore b/services/console/builder.Dockerfile.dockerignore
@@ -0,0 +1,16 @@
+# Ignore all
+*
+
+# Except
+!.cargo/
+!lib/bencher_valid/
+!Cargo.toml
+!Cargo.lock
+!services/console/package-lock.json
+!services/console/package.json
+!services/console/public
+!services/console/src
+!services/console/astro.config.mjs
+!services/console/site.js
+!services/console/tsconfig.json
+!services/console/.env.runtime
diff --git a/services/console/src/util/ext.ts b/services/console/src/util/ext.ts
@@ -1,4 +1,4 @@
-import swagger from "../content/api/swagger.json";
+import swagger from "../../../../lib/bencher_valid/swagger.json";
 import { apiHost } from "./http";
 
 export const BENCHER_SITE_URL = "https://bencher.dev";

diff --git a/xtask/src/task/swagger.rs b/xtask/src/task/swagger.rs
@@ -2,7 +2,7 @@ use std::process::Command;
 
 use crate::parser::CliSwagger;
 
-const SWAGGER_PATH: &str = "./services/console/src/content/api/swagger.json";
+const SWAGGER_PATH: &str = "./lib/bencher_valid/swagger.json";
 
 #[derive(Debug)]
 pub struct Swagger {}