Merge pull request #341 from systemaccounting/340-requests-by-account…

…-rust

340 rewrite go requests-by-account service in rust

Cargo.toml

@@ -12,6 +12,7 @@ members = [
 	"services/request-approve",
 	"services/request-by-id",
 	"services/request-create",
+	"services/requests-by-account",
 	"services/rule",
 	"tests",
 ]

crates/types/src/request_response.rs

@@ -38,6 +38,15 @@ pub struct IntraTransactions {
     pub transactions: Transactions,
 }
 
+impl IntraTransactions {
+    pub fn new(auth_account: String, transactions: Transactions) -> Self {
+        Self {
+            auth_account: Some(auth_account),
+            transactions,
+        }
+    }
+}
+
 #[derive(Eq, PartialEq, Debug, Deserialize, Serialize)]
 pub struct RequestApprove {
     pub auth_account: String,
@@ -68,3 +77,9 @@ pub struct QueryById {
     pub account_name: String,
     pub id: String,
 }
+
+#[derive(Debug, Deserialize)]
+pub struct QueryByAccount {
+    pub auth_account: String,
+    pub account_name: String,
+}

docker/dev/requests-by-account.Dockerfile

@@ -1,17 +1,39 @@
-FROM mxfactorial/go-base:v1 as builder
+FROM rust:latest as builder
 
-COPY . .
+WORKDIR /app
 
-WORKDIR /app/services/requests-by-account
+COPY . ./
 
-RUN go build -o requests-by-account ./cmd
+RUN rustup target add x86_64-unknown-linux-musl
+RUN apt update && \
+	apt install -y musl-tools perl make
+RUN update-ca-certificates
 
-FROM golang:alpine
+ENV USER=requests-by-account
+ENV UID=10006
 
-WORKDIR /app
+RUN adduser \
+    --disabled-password \
+    --gecos "" \
+    --home "/nonexistent" \
+    --shell "/sbin/nologin" \
+    --no-create-home \
+    --uid "${UID}" \
+    "${USER}"
+
+RUN USER=root cargo build \
+		--manifest-path=services/requests-by-account/Cargo.toml \
+		--target x86_64-unknown-linux-musl \
+		--release
 
-COPY --from=builder /app/services/requests-by-account/requests-by-account .
+FROM alpine
+
+COPY --from=builder /etc/passwd /etc/passwd
+COPY --from=builder /etc/group /etc/group
+COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/requests-by-account /usr/local/bin
 
 EXPOSE 10006
 
-CMD ["/app/requests-by-account"]
+USER requests-by-account:requests-by-account
+
+CMD [ "/usr/local/bin/requests-by-account" ]

project.yaml

@@ -467,13 +467,13 @@ services:
         - PGDATABASE
         - READINESS_CHECK_PATH
   requests-by-account:
-    runtime: go1.x
+    runtime: rust1.x
     min_code_cov: null
     type: app
     local_dev: true
     params: []
     deploy: true
-    build_src_path: cmd
+    build_src_path: null
     dependents: []
     env_var:
       set:

services/requests-by-account/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "requests-by-account"
+version = "0.1.0"
+edition = "2021"
+rust-version.workspace = true
+
+[dependencies]
+axum = "0.7.4"
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
+shutdown = { path = "../../crates/shutdown" }
+pg = { path = "../../crates/pg" }
+service = { path = "../../crates/service" }
+types = { path = "../../crates/types" }
+
+[target.x86_64-unknown-linux-musl.dependencies]
+openssl = { version = "0.10", features = ["vendored"] }

services/requests-by-account/makefile

@@ -1,6 +1,6 @@
 RELATIVE_PROJECT_ROOT_PATH=$(shell REL_PATH="."; while [ $$(ls "$$REL_PATH" | grep project.yaml | wc -l | xargs) -eq 0 ]; do REL_PATH="$$REL_PATH./.."; done; printf '%s' "$$REL_PATH")
 include $(RELATIVE_PROJECT_ROOT_PATH)/make/shared.mk
-include $(RELATIVE_PROJECT_ROOT_PATH)/make/go.mk
+include $(RELATIVE_PROJECT_ROOT_PATH)/make/rust.mk
 
 REQUESTS_BY_ACCOUNT_PORT=$(shell yq '.services["$(APP_NAME)"].env_var.set.REQUESTS_BY_ACCOUNT_PORT.default' $(PROJECT_CONF))
 REQUESTS_BY_ACCOUNT_URL=$(HOST):$(REQUESTS_BY_ACCOUNT_PORT)
@@ -10,14 +10,21 @@ TEST_ACCOUNT=JacobWebb
 TEST_AUTH_ACCOUNT=$(TEST_ACCOUNT)
 TEST_EVENT='{"auth_account":"$(TEST_AUTH_ACCOUNT)","account_name":"$(TEST_ACCOUNT)"}'
 
-run:
-	@$(DOCKER_ENV_VARS) \
-		RETURN_RECORD_LIMIT=$(RETURN_RECORD_LIMIT) \
-		TEST_EVENT=$(TEST_EVENT) \
-		go run ./cmd/main.go
+start:
+	@$(MAKE) get-secrets ENV=local
+	nohup cargo watch --env-file $(ENV_FILE) -w src -w $(RELATIVE_PROJECT_ROOT_PATH)/crates -x run >> $(NOHUP_LOG) &
+
+start-alone:
+	rm -f $(NOHUP_LOG)
+	$(MAKE) -C $(MIGRATIONS_DIR) run
+	$(MAKE) start
+	tail -F $(NOHUP_LOG)
+
+stop:
+	$(MAKE) -C $(RELATIVE_PROJECT_ROOT_PATH) stop
 
 invoke-local:
-	@curl -s -d $(TEST_EVENT) $(REQUESTS_BY_ACCOUNT_URL) | yq -o=json
+	@curl -s -H 'Content-Type: application/json' -d $(TEST_EVENT) $(REQUESTS_BY_ACCOUNT_URL) | yq -o=json
 
 demo:
 	@printf "*** request to %s at %s\n" $(SUB_PATH) $(REQUESTS_BY_ACCOUNT_URL)