From c8af5ccf96590c83ad85aeb38b844cc027105e1c Mon Sep 17 00:00:00 2001
From: Jannis Hochmuth <Jannis.Hochmuth@computational.bio.uni-giessen.de>
Date: Fri, 3 Nov 2023 17:59:48 +0100
Subject: [PATCH 1/3] feat: Update buf config

---
 buf.yaml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/buf.yaml b/buf.yaml
index ec76fe8e..457f214e 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,6 +1,10 @@
 version: v1
+deps:
+  - buf.build/grpc-ecosystem/grpc-gateway
+  - buf.build/googleapis/googleapis
 build:
-  excludes:    
+  excludes:
+    - aruna/api/google
     - aruna/api/protoc-gen-openapiv2
 lint:
   use:
@@ -13,13 +17,9 @@ lint:
     ENUM_VALUE_PREFIX:
       - grpc/gateway/protoc_gen_openapiv2/options/openapiv2.proto
       - grpc/gateway/protoc_gen_openapiv2/options/annotations.proto
-      - api/services/v1/dataset_object_service_models.proto
-      - api/models/v1/common_models.proto
     ENUM_ZERO_VALUE_SUFFIX:
       - grpc/gateway/protoc_gen_openapiv2/options/openapiv2.proto
       - grpc/gateway/protoc_gen_openapiv2/options/annotations.proto
-      - api/services/v1/dataset_object_service_models.proto
-      - api/models/v1/common_models.proto
     PACKAGE_VERSION_SUFFIX:
       - grpc/gateway/protoc_gen_openapiv2/options/openapiv2.proto
       - grpc/gateway/protoc_gen_openapiv2/options/annotations.proto
@@ -31,15 +31,12 @@ lint:
       - google/api/http.proto
       - google/api/httpbody.proto
     FIELD_LOWER_SNAKE_CASE:
-      - api/models/*
+      - aruna/api/storage
     SERVICE_SUFFIX:
-      - api/models/*
+      - aruna/api/storage
     RPC_REQUEST_RESPONSE_UNIQUE:
-      - api/models/*
+      - aruna/api/storage
     RPC_REQUEST_STANDARD_NAME:
-      - api/models/*
+      - aruna/api/storage
     RPC_RESPONSE_STANDARD_NAME:
-      - api/models/*
-deps:
-  - buf.build/grpc-ecosystem/grpc-gateway
-  - buf.build/googleapis/googleapis
\ No newline at end of file
+      - aruna/api/storage

From e452512f4fa0f6d650c4c920a259e9a2815e93c4 Mon Sep 17 00:00:00 2001
From: Jannis Hochmuth <Jannis.Hochmuth@computational.bio.uni-giessen.de>
Date: Fri, 3 Nov 2023 18:05:18 +0100
Subject: [PATCH 2/3] refactor: Combine identical GitHub Actions

---
 ...l-request.yaml => dry-run-rust-build.yaml} |  4 +--
 .github/workflows/push.yaml                   | 31 -------------------
 2 files changed, 2 insertions(+), 33 deletions(-)
 rename .github/workflows/{pull-request.yaml => dry-run-rust-build.yaml} (94%)
 delete mode 100644 .github/workflows/push.yaml

diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/dry-run-rust-build.yaml
similarity index 94%
rename from .github/workflows/pull-request.yaml
rename to .github/workflows/dry-run-rust-build.yaml
index 75107015..199c435c 100644
--- a/.github/workflows/pull-request.yaml
+++ b/.github/workflows/dry-run-rust-build.yaml
@@ -1,5 +1,5 @@
-name: test_build_pull_request
-on: pull_request
+name: dry_run_rust_build
+on: [push, pull_request]
 jobs:
   lint: 
     runs-on: ubuntu-latest
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
deleted file mode 100644
index 5721e778..00000000
--- a/.github/workflows/push.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: test_build_push
-on: push
-jobs:
-  lint: 
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-      - name: Checkout without submodules
-        uses: actions/checkout@v2
-      - name: Setup buf
-        uses: bufbuild/buf-setup-action@v1
-      - name: Lint protofiles with buf
-        uses: bufbuild/buf-lint-action@v1
-  build: # This does not build the whole proto files for production, it tests if rust / tonic
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-      - name: Checkout repository with submodules
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Pull rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Test compiling protofiles with rust
-        uses: actions-rs/cargo@v1
-        with:
-          command: run
\ No newline at end of file

From c75e0b7da01d54f2c2856891ced4e09a36af619e Mon Sep 17 00:00:00 2001
From: Jannis Hochmuth <Jannis.Hochmuth@computational.bio.uni-giessen.de>
Date: Fri, 3 Nov 2023 18:05:39 +0100
Subject: [PATCH 3/3] chore: Update google submodule

---
 aruna/api/google | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aruna/api/google b/aruna/api/google
index a70dd17d..38894df9 160000
--- a/aruna/api/google
+++ b/aruna/api/google
@@ -1 +1 @@
-Subproject commit a70dd17d128746c3ce9f3f116fc6404cfdb92f15
+Subproject commit 38894df9fd8faebe373d15f25da07119582c82f3