Improve repository structure (#506)

Signed-off-by: RealHinome <[email protected]>
Gravitalia · Aug 2, 2024 · 38be5ca · 38be5ca
1 parent e6408b4
commit 38be5ca
Show file tree

Hide file tree

Showing 81 changed files with 19 additions and 127 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.deepsource.toml b/.deepsource.toml
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -30,10 +30,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-bazel-
     - name: Build Autha
-      run: bazel build //autha --strip=always --compilation_mode opt
+      run: bazel build //api/autha --strip=always --compilation_mode opt
       shell: bash
     - name: Run tests
-      run: bazel test //autha:autha_test --strip=always --compilation_mode opt
+      run: bazel test //api/autha:autha_test --strip=always --compilation_mode opt
       shell: bash
     - name: Login to GitHub Container Registry
       if: ${{ github.ref == 'refs/heads/master' }}
@@ -44,5 +44,5 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Push to docker.io
       if: ${{ github.ref == 'refs/heads/master' }}
-      run: bazel run //autha:push --strip=always --compilation_mode opt
+      run: bazel run //api/autha:push --strip=always --compilation_mode opt
       shell: bash
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -2,7 +2,7 @@
 
 module(
     name = "autha",
-    version = "3.0",
+    version = "3.1",
 )
 
 bazel_dep(name = "platforms", version = "0.0.8")
@@ -38,14 +38,14 @@ crate = use_extension(
 )
 crate.from_cargo(
     name = "crate_index",
-    cargo_lockfile = "//:Cargo.lock",
+    cargo_lockfile = "//api:Cargo.lock",
     manifests = [
-        "//:Cargo.toml",
-        "//autha-limits:Cargo.toml",
-        "//autha:Cargo.toml",
-        "//crypto:Cargo.toml",
-        "//db:Cargo.toml",
-        "//image_processor:Cargo.toml",
+        "//api:Cargo.toml",
+        "//api/autha-limits:Cargo.toml",
+        "//api/autha:Cargo.toml",
+        "//api/crypto:Cargo.toml",
+        "//api/db:Cargo.toml",
+        "//api/image_processor:Cargo.toml",
     ],
 )
 use_repo(crate, "crate_index")

diff --git a/.rustfmt.toml → api/.rustfmt.toml b/.rustfmt.toml → api/.rustfmt.toml
diff --git a/api/BUILD.bazel b/api/BUILD.bazel
@@ -0,0 +1 @@
+
diff --git a/Cargo.lock → api/Cargo.lock b/Cargo.lock → api/Cargo.lock
diff --git a/Cargo.toml → api/Cargo.toml b/Cargo.toml → api/Cargo.toml
diff --git a/autha-limits/BUILD.bazel → api/autha-limits/BUILD.bazel b/autha-limits/BUILD.bazel → api/autha-limits/BUILD.bazel
diff --git a/autha-limits/Cargo.toml → api/autha-limits/Cargo.toml b/autha-limits/Cargo.toml → api/autha-limits/Cargo.toml
diff --git a/autha-limits/src/lib.rs → api/autha-limits/src/lib.rs b/autha-limits/src/lib.rs → api/autha-limits/src/lib.rs
diff --git a/autha-limits/src/warp.rs → api/autha-limits/src/warp.rs b/autha-limits/src/warp.rs → api/autha-limits/src/warp.rs
diff --git a/autha/BUILD.bazel → api/autha/BUILD.bazel b/autha/BUILD.bazel → api/autha/BUILD.bazel
@@ -14,10 +14,10 @@ proto_library(
 )
 
 CUSTOM_CRATES = [
-    "//autha-limits",
-    "//crypto",
-    "//db",
-    "//image_processor",
+    "//api/autha-limits",
+    "//api/crypto",
+    "//api/db",
+    "//api/image_processor",
     ":proto_build_script",
 ]
 
@@ -106,6 +106,6 @@ oci_push(
     repository = "ghcr.io/gravitalia/autha",
     remote_tags = [
         "latest",
-        "3.0.0",
+        "3.1.0",
     ]
 )
diff --git a/autha/Cargo.toml → api/autha/Cargo.toml b/autha/Cargo.toml → api/autha/Cargo.toml
diff --git a/autha/build.rs → api/autha/build.rs b/autha/build.rs → api/autha/build.rs
diff --git a/autha/proto/remini.proto → api/autha/proto/remini.proto b/autha/proto/remini.proto → api/autha/proto/remini.proto
diff --git a/autha/src/helpers/config.rs → api/autha/src/helpers/config.rs b/autha/src/helpers/config.rs → api/autha/src/helpers/config.rs
diff --git a/autha/src/helpers/machine_learning.rs → api/autha/src/helpers/machine_learning.rs b/autha/src/helpers/machine_learning.rs → api/autha/src/helpers/machine_learning.rs
diff --git a/autha/src/helpers/mod.rs → api/autha/src/helpers/mod.rs b/autha/src/helpers/mod.rs → api/autha/src/helpers/mod.rs
diff --git a/autha/src/helpers/queries.rs → api/autha/src/helpers/queries.rs b/autha/src/helpers/queries.rs → api/autha/src/helpers/queries.rs
diff --git a/autha/src/helpers/request.rs → api/autha/src/helpers/request.rs b/autha/src/helpers/request.rs → api/autha/src/helpers/request.rs
diff --git a/autha/src/helpers/token.rs → api/autha/src/helpers/token.rs b/autha/src/helpers/token.rs → api/autha/src/helpers/token.rs
diff --git a/autha/src/main.rs → api/autha/src/main.rs b/autha/src/main.rs → api/autha/src/main.rs
diff --git a/autha/src/model/body.rs → api/autha/src/model/body.rs b/autha/src/model/body.rs → api/autha/src/model/body.rs
diff --git a/autha/src/model/broker.rs → api/autha/src/model/broker.rs b/autha/src/model/broker.rs → api/autha/src/model/broker.rs
diff --git a/autha/src/model/config.rs → api/autha/src/model/config.rs b/autha/src/model/config.rs → api/autha/src/model/config.rs
diff --git a/autha/src/model/error.rs → api/autha/src/model/error.rs b/autha/src/model/error.rs → api/autha/src/model/error.rs
diff --git a/autha/src/model/mod.rs → api/autha/src/model/mod.rs b/autha/src/model/mod.rs → api/autha/src/model/mod.rs
diff --git a/autha/src/model/query.rs → api/autha/src/model/query.rs b/autha/src/model/query.rs → api/autha/src/model/query.rs
diff --git a/autha/src/model/response.rs → api/autha/src/model/response.rs b/autha/src/model/response.rs → api/autha/src/model/response.rs
diff --git a/autha/src/model/user.rs → api/autha/src/model/user.rs b/autha/src/model/user.rs → api/autha/src/model/user.rs
diff --git a/autha/src/router/create.rs → api/autha/src/router/create.rs b/autha/src/router/create.rs → api/autha/src/router/create.rs
diff --git a/autha/src/router/login.rs → api/autha/src/router/login.rs b/autha/src/router/login.rs → api/autha/src/router/login.rs
diff --git a/autha/src/router/mod.rs → api/autha/src/router/mod.rs b/autha/src/router/mod.rs → api/autha/src/router/mod.rs
diff --git a/autha/src/router/oauth/authorization_code.rs → ...ha/src/router/oauth/authorization_code.rs b/autha/src/router/oauth/authorization_code.rs → ...ha/src/router/oauth/authorization_code.rs
diff --git a/autha/src/router/oauth/client_credentials.rs → ...ha/src/router/oauth/client_credentials.rs b/autha/src/router/oauth/client_credentials.rs → ...ha/src/router/oauth/client_credentials.rs
diff --git a/autha/src/router/oauth/mod.rs → api/autha/src/router/oauth/mod.rs b/autha/src/router/oauth/mod.rs → api/autha/src/router/oauth/mod.rs
diff --git a/autha/src/router/oauth/refresh.rs → api/autha/src/router/oauth/refresh.rs b/autha/src/router/oauth/refresh.rs → api/autha/src/router/oauth/refresh.rs
diff --git a/autha/src/router/oauth/revoke.rs → api/autha/src/router/oauth/revoke.rs b/autha/src/router/oauth/revoke.rs → api/autha/src/router/oauth/revoke.rs
diff --git a/autha/src/router/users.rs → api/autha/src/router/users.rs b/autha/src/router/users.rs → api/autha/src/router/users.rs
diff --git a/autha/src/telemetry/metrics.rs → api/autha/src/telemetry/metrics.rs b/autha/src/telemetry/metrics.rs → api/autha/src/telemetry/metrics.rs
diff --git a/autha/src/telemetry/mod.rs → api/autha/src/telemetry/mod.rs b/autha/src/telemetry/mod.rs → api/autha/src/telemetry/mod.rs
diff --git a/autha/src/telemetry/tracing.rs → api/autha/src/telemetry/tracing.rs b/autha/src/telemetry/tracing.rs → api/autha/src/telemetry/tracing.rs
diff --git a/crypto/BUILD.bazel → api/crypto/BUILD.bazel b/crypto/BUILD.bazel → api/crypto/BUILD.bazel
diff --git a/crypto/Cargo.toml → api/crypto/Cargo.toml b/crypto/Cargo.toml → api/crypto/Cargo.toml
diff --git a/crypto/benches/encryption_benchmark.rs → api/crypto/benches/encryption_benchmark.rs b/crypto/benches/encryption_benchmark.rs → api/crypto/benches/encryption_benchmark.rs
diff --git a/crypto/benches/hash_benchmark.rs → api/crypto/benches/hash_benchmark.rs b/crypto/benches/hash_benchmark.rs → api/crypto/benches/hash_benchmark.rs
diff --git a/crypto/benches/random_benchmark.rs → api/crypto/benches/random_benchmark.rs b/crypto/benches/random_benchmark.rs → api/crypto/benches/random_benchmark.rs
diff --git a/crypto/src/decrypt.rs → api/crypto/src/decrypt.rs b/crypto/src/decrypt.rs → api/crypto/src/decrypt.rs
diff --git a/crypto/src/encrypt.rs → api/crypto/src/encrypt.rs b/crypto/src/encrypt.rs → api/crypto/src/encrypt.rs
diff --git a/crypto/src/hash/argon2.rs → api/crypto/src/hash/argon2.rs b/crypto/src/hash/argon2.rs → api/crypto/src/hash/argon2.rs
diff --git a/crypto/src/hash/mod.rs → api/crypto/src/hash/mod.rs b/crypto/src/hash/mod.rs → api/crypto/src/hash/mod.rs
diff --git a/crypto/src/hash/sha.rs → api/crypto/src/hash/sha.rs b/crypto/src/hash/sha.rs → api/crypto/src/hash/sha.rs
diff --git a/crypto/src/lib.rs → api/crypto/src/lib.rs b/crypto/src/lib.rs → api/crypto/src/lib.rs
diff --git a/db/BUILD.bazel → api/db/BUILD.bazel b/db/BUILD.bazel → api/db/BUILD.bazel
diff --git a/db/Cargo.toml → api/db/Cargo.toml b/db/Cargo.toml → api/db/Cargo.toml
diff --git a/db/src/broker/kafka/mod.rs → api/db/src/broker/kafka/mod.rs b/db/src/broker/kafka/mod.rs → api/db/src/broker/kafka/mod.rs
diff --git a/db/src/broker/kafka/pool.rs → api/db/src/broker/kafka/pool.rs b/db/src/broker/kafka/pool.rs → api/db/src/broker/kafka/pool.rs
diff --git a/db/src/broker/mod.rs → api/db/src/broker/mod.rs b/db/src/broker/mod.rs → api/db/src/broker/mod.rs
diff --git a/db/src/broker/rabbitmq/mod.rs → api/db/src/broker/rabbitmq/mod.rs b/db/src/broker/rabbitmq/mod.rs → api/db/src/broker/rabbitmq/mod.rs
diff --git a/db/src/broker/rabbitmq/pool.rs → api/db/src/broker/rabbitmq/pool.rs b/db/src/broker/rabbitmq/pool.rs → api/db/src/broker/rabbitmq/pool.rs
diff --git a/db/src/lib.rs → api/db/src/lib.rs b/db/src/lib.rs → api/db/src/lib.rs
diff --git a/db/src/memcache/mod.rs → api/db/src/memcache/mod.rs b/db/src/memcache/mod.rs → api/db/src/memcache/mod.rs
diff --git a/db/src/memcache/pool.rs → api/db/src/memcache/pool.rs b/db/src/memcache/pool.rs → api/db/src/memcache/pool.rs
diff --git a/db/src/scylla.rs → api/db/src/scylla.rs b/db/src/scylla.rs → api/db/src/scylla.rs
diff --git a/image_processor/BUILD.bazel → api/image_processor/BUILD.bazel b/image_processor/BUILD.bazel → api/image_processor/BUILD.bazel
@@ -7,7 +7,7 @@ rust_library(
     name = "image_processor",
     srcs = glob(["src/**/*.rs"]),
     aliases = aliases(),
-    deps = ["//crypto"] + all_crate_deps(
+    deps = ["//api/crypto"] + all_crate_deps(
         normal = True,
     ),
     proc_macro_deps = all_crate_deps(

diff --git a/image_processor/Cargo.toml → api/image_processor/Cargo.toml b/image_processor/Cargo.toml → api/image_processor/Cargo.toml
diff --git a/image_processor/README.md → api/image_processor/README.md b/image_processor/README.md → api/image_processor/README.md
diff --git a/image_processor/benches/image.jpg → api/image_processor/benches/image.jpg b/image_processor/benches/image.jpg → api/image_processor/benches/image.jpg
diff --git a/image_processor/benches/image_benchmark.rs → ...mage_processor/benches/image_benchmark.rs b/image_processor/benches/image_benchmark.rs → ...mage_processor/benches/image_benchmark.rs
diff --git a/image_processor/src/host/cloudinary.rs → api/image_processor/src/host/cloudinary.rs b/image_processor/src/host/cloudinary.rs → api/image_processor/src/host/cloudinary.rs
diff --git a/image_processor/src/host/mod.rs → api/image_processor/src/host/mod.rs b/image_processor/src/host/mod.rs → api/image_processor/src/host/mod.rs
diff --git a/image_processor/src/lib.rs → api/image_processor/src/lib.rs b/image_processor/src/lib.rs → api/image_processor/src/lib.rs
diff --git a/image_processor/src/resizer.rs → api/image_processor/src/resizer.rs b/image_processor/src/resizer.rs → api/image_processor/src/resizer.rs
diff --git a/config.yaml → docker/config.yaml b/config.yaml → docker/config.yaml
diff --git a/docker-compose.yml → docker/docker-compose.yml b/docker-compose.yml → docker/docker-compose.yml
diff --git a/docs/quick_start.md b/docs/quick_start.md
@@ -34,7 +34,7 @@ database:
     pool_size: 3
 ```
 
-You can see more paramters on [/config.yaml](https://github.com/Gravitalia/Autha/blob/master/config.yaml).
+You can see more paramters on [/config.yaml](https://github.com/Gravitalia/Autha/blob/master/docker/config.yaml).
 
 2. Create a `docker-compose.yaml` file.
    Write

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
diff --git a/container.tf → infra/container.tf b/container.tf → infra/container.tf
diff --git a/variables.tf → infra/variables.tf b/variables.tf → infra/variables.tf