ci: add rust buck tests

.github/labeler.yml

@@ -18,6 +18,16 @@ pay:
   - pnpm-lock.yaml
 
 core:
-  - core/**/*
+  - core/api/*
+  - core/api-cron/*
+  - core/api-exporter/*
+  - core/api-trigger/*
+  - core/api-ws-server/*
   - flake.lock
   - pnpm-lock.yaml
+
+api-keys:
+  - third-party/rust/*
+  - core/api-keys/*
+  - flake.lock
+  - Cargo.lock

.github/workflows/buck2-test.yaml

@@ -23,7 +23,7 @@ jobs:
           ${{ toJSON(github.event.pull_request.labels.*.name) }}
           EOF
 
-          DEFAULT_LABELS=("dashboard" "consent" "pay" "core")
+          DEFAULT_LABELS=("dashboard" "consent" "pay" "core", "api-keys")
           LABELS=($(jq -r '.[]' < labels.json))
           if [ ${#LABELS[@]} -eq 0 ]; then
               LABELS=("${DEFAULT_LABELS[@]}")
@@ -32,10 +32,13 @@ jobs:
           for LABEL in "${LABELS[@]}"; do
             case "$LABEL" in
               dashboard|consent|pay)
-                ARGS+=" //apps/$LABEL:test-unit"
+                ARGS+=" //apps/$LABEL:test"
                 ;;
               core)
-                ARGS+=" //core/api:test-unit"
+                ARGS+=" //core/api:test"
+                ;;
+              api-keys)
+                ARGS+=" //core/$LABEL:test"
                 ;;
             esac
           done

BUCK

@@ -12,3 +12,8 @@ pnpm_workspace(
   ],
   visibility = ["PUBLIC"],
 )
+
+export_file(
+    name = "rustfmt.toml",
+    visibility = ["PUBLIC"],
+)

apps/consent/BUCK

@@ -86,7 +86,7 @@ eslint(
 )
 
 test_suite(
-    name = "test-unit",
+    name = "test",
     tests = [
         ":audit",
         ":lint",

apps/dashboard/BUCK

@@ -81,7 +81,7 @@ eslint(
 )
 
 test_suite(
-    name = "test-unit",
+    name = "test",
     tests = [
         ":audit",
         ":lint",

apps/pay/BUCK

@@ -86,7 +86,7 @@ eslint(
 )
 
 test_suite(
-    name = "test-unit",
+    name = "test",
     tests = [
         ":audit",
         ":lint",

ci/apps/app-template.lib.yml

@@ -27,7 +27,7 @@ plan:
       - get: #@ app_src_resource_name(app)
         trigger: true
       - { get: pipeline-tasks }
-  - task: buck-test-unit
+  - task: buck-test
     config:
       platform: linux
       image_resource: #@ task_image_config()
@@ -36,7 +36,7 @@ plan:
         - name: #@ app_src_resource_name(app)
           path: repo
       params:
-        BUCK_TARGET: #@ "//apps/" + app + ":test-unit"
+        BUCK_TARGET: #@ "//apps/" + app + ":test"
         BUCK_CMD: test
       run:
         path: pipeline-tasks/ci/apps/tasks/buck-task.sh

ci/core/pipeline.yml

@@ -1,6 +1,7 @@
 #@ load("@ytt:data", "data")
 
 #@ load("template.lib.yml",
+#@   "component_src_resource",
 #@   "component_src_resource_name",
 #@   "core_bundle_src_resource",
 #@   "buck_test_name",
@@ -26,6 +27,8 @@ source:
   repository: #@ release_pipeline_image()
 #@ end
 
+#@ components = ["api-keys"]
+
 groups:
 - name: core-bundle
   jobs:
@@ -41,8 +44,17 @@ groups:
   - quickstart
   - release-core-bundle
   - bump-core-bundle-images-in-chart
+#@ for component in components:
+- name: #@ component
+  jobs:
+  - #@ buck_test_name(component)
+#@ end
 
 jobs:
+#@ for component in components:
+- #@ buck_test(component)
+#@ end
+
 - #@ buck_test("api")
 #@ for component in core_bundle_components:
 - #@ build_edge_image(component)
@@ -246,6 +258,11 @@ jobs:
 
 resources:
 - #@ core_bundle_src_resource()
+
+#@ for component in components:
+- #@ component_src_resource(component)
+#@ end
+
 - name: repo-out
   type: git
   source:

ci/core/template.lib.yml

@@ -26,7 +26,7 @@ plan:
       - get: #@ component_src_resource_name(component)
         trigger: true
       - { get: pipeline-tasks }
-  - task: buck-test-unit
+  - task: buck-test
     config:
       platform: linux
       image_resource: #@ task_image_config()
@@ -35,7 +35,7 @@ plan:
         - name: #@ component_src_resource_name(component)
           path: repo
       params:
-        BUCK_TARGET: #@ "//core/" + component + ":test-unit"
+        BUCK_TARGET: #@ "//core/" + component + ":test"
         BUCK_CMD: test
       run:
         path: pipeline-tasks/ci/apps/tasks/buck-task.sh
@@ -155,6 +155,27 @@ source:
 webhook_token: ((webhook.secret))
 #@ end
 
+#@ def component_src_resource(component):
+name: #@ component_src_resource_name(component)
+type: git
+source:
+  paths:
+  - #@ "core/" + component
+  - #@ "core/" + component + "/*"
+  - #@ "core/" + component + "/**/*"
+  - flake.nix
+  - flake.lock
+  - toolchains/
+  - toolchains/*
+  - toolchains/**/*
+  - third-party/rust/**/*
+  - Cargo.lock
+  fetch_tags: true
+  uri: #@ data.values.git_uri
+  branch: #@ data.values.git_branch
+  private_key: #@ data.values.github_private_key
+#@ end
+
 #@ def edge_image_resource_name(component):
 #@   return component + "-edge-image"
 #@ end

core/api-keys/BUCK

@@ -1,4 +1,5 @@
 load("@toolchains//rover:macros.bzl", "sdl", "diff_check", "dev_update_file")
+load("@toolchains//rust:macros.bzl", "rustfmt_check", "clippy_check")
 
 sdl(
   name = "sdl",
@@ -74,3 +75,64 @@ rust_library(
         "SQLX_OFFLINE": "true",
     }
 )
+
+rust_test(
+    name = "test-unit",
+    edition = "2021",
+    srcs = glob([
+      "src/**/*.rs",
+      ".sqlx/*",
+      "migrations/*",
+      "api-keys.yml"
+    ]),
+    crate_root = "src/lib.rs",
+    deps = [
+        "//lib/tracing-rs:tracing",
+        "//third-party/rust:tokio",
+        "//third-party/rust:anyhow",
+        "//third-party/rust:async-graphql",
+        "//third-party/rust:async-graphql-axum",
+        "//third-party/rust:axum",
+        "//third-party/rust:jsonwebtoken",
+        "//third-party/rust:clap",
+        "//third-party/rust:reqwest",
+        "//third-party/rust:serde",
+        "//third-party/rust:serde_yaml",
+        "//third-party/rust:serde_json",
+        "//third-party/rust:thiserror",
+        "//third-party/rust:chrono",
+        "//third-party/rust:sqlx",
+        "//third-party/rust:rand",
+        "//third-party/rust:uuid",
+        "//third-party/rust:serde_with",
+    ],
+    env = {
+        "CARGO_MANIFEST_DIR": ".",
+        "SQLX_OFFLINE": "true",
+    }
+)
+
+rustfmt_check(
+    name = "check-format-rust",
+    srcs = glob([
+      "src/**/*.rs",
+      ".sqlx/*",
+      "migrations/*",
+      "api-keys.yml"
+    ]),
+    crate_root = "src/lib.rs",
+)
+
+clippy_check(
+    name = "check-lint-rust-lib",
+    clippy_txt_dep = ":lib-api-keys[clippy.txt]",
+)
+
+test_suite(
+    name = "test",
+    tests = [
+        ":check-format-rust",
+        ":check-lint-rust-lib",
+        ":test-unit"
+    ],
+)

core/api-keys/src/app/mod.rs

@@ -32,7 +32,7 @@ impl ApiKeysApp {
         &self,
         key: &str,
     ) -> Result<(IdentityApiKeyId, String, bool), ApplicationError> {
-        Ok(self.identities.find_subject_by_key(&key).await?)
+        Ok(self.identities.find_subject_by_key(key).await?)
     }
 
     #[tracing::instrument(name = "app.create_api_key_for_subject", skip_all)]

core/api-keys/src/graphql/schema.rs

@@ -17,9 +17,9 @@ impl From<DateTime<Utc>> for Timestamp {
     }
 }
 
-impl Into<DateTime<Utc>> for Timestamp {
-    fn into(self) -> DateTime<Utc> {
-        self.0
+impl From<Timestamp> for DateTime<Utc> {
+    fn from(Timestamp(dt): Timestamp) -> Self {
+        dt
     }
 }
 

core/api-keys/src/identity/mod.rs

@@ -210,7 +210,7 @@ impl Identities {
 
         match record {
             Some(record) => Ok(IdentityApiKey {
-                id: IdentityApiKeyId::from(key_id),
+                id: key_id,
                 name: record.name,
                 identity_id: IdentityId::from(record.identity_id),
                 created_at: record.created_at,

core/api-keys/src/scope.rs

@@ -2,13 +2,13 @@ pub const READ_SCOPE: &str = "read";
 pub const WRITE_SCOPE: &str = "write";
 
 pub fn read_only_scope() -> String {
-    format!("{READ_SCOPE}")
+    READ_SCOPE.to_string()
 }
 
 pub fn read_write_scope() -> String {
     format!("{READ_SCOPE} {WRITE_SCOPE}")
 }
 
 pub fn is_read_only(scope: &String) -> bool {
-    !(scope.as_str().split(" ").any(|s| s == WRITE_SCOPE) || scope.is_empty())
+    !(scope.as_str().split(' ').any(|s| s == WRITE_SCOPE) || scope.is_empty())
 }

core/api/BUCK

@@ -201,7 +201,7 @@ jest_test(
 )
 
 test_suite(
-    name = "test-unit",
+    name = "test",
     tests = [
         ":audit",
         ":check-lint",

rustfmt.toml

@@ -0,0 +1,2 @@
+edition = "2021"
+newline_style = "Unix"

toolchains/BUCK

@@ -47,3 +47,10 @@ rover_toolchain(
   name = "rover",
   visibility = ["PUBLIC"],
 )
+
+load("@toolchains//rust:toolchain.bzl", "galoy_rust_toolchain")
+
+galoy_rust_toolchain(
+  name = "galoy_rust",
+  visibility = ["PUBLIC"],
+)

toolchains/rust/BUCK

@@ -0,0 +1,14 @@
+export_file(
+  name = "clippy_output.py",
+  visibility = ["PUBLIC"],
+)
+
+export_file(
+  name = "crate_context.py",
+  visibility = ["PUBLIC"],
+)
+
+export_file(
+  name = "rustfmt_check.py",
+  visibility = ["PUBLIC"],
+)

toolchains/rust/clippy_output.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+"""
+Prints output of a Clippy compilation and exits non-zero if appropriate.
+"""
+import argparse
+import os
+import sys
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        "clippy_txt",
+        help="The file from a Clippy compilation with its output")
+
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = parse_args()
+
+    # If output is empty, there are no errors/warnings and we can exit `0`
+    if os.path.getsize(args.clippy_txt) == 0:
+        return 0
+
+    # Otherwise print output and exit non-zero
+    with open(args.clippy_txt, encoding="utf-8") as f:
+        print(f.read())
+
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
+