From b08fc408d8122483f1859fa8ac9acc68c6a61f55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:09:09 +0000 Subject: [PATCH 1/5] chore(deps): bump ring from 0.17.8 to 0.17.13 in /tasky Bumps [ring](https://github.com/briansmith/ring) from 0.17.8 to 0.17.13. - [Changelog](https://github.com/briansmith/ring/blob/main/RELEASES.md) - [Commits](https://github.com/briansmith/ring/commits) --- updated-dependencies: - dependency-name: ring dependency-type: indirect ... Signed-off-by: dependabot[bot] --- tasky/Cargo.lock | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/tasky/Cargo.lock b/tasky/Cargo.lock index 20cb8f8..fc9272a 100644 --- a/tasky/Cargo.lock +++ b/tasky/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -594,9 +594,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.21" +version = "1.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" dependencies = [ "jobserver", "libc", @@ -2102,15 +2102,14 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.8" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee" dependencies = [ "cc", "cfg-if", "getrandom", "libc", - "spin", "untrusted", "windows-sys 0.52.0", ] @@ -2450,12 +2449,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "stringprep" version = "0.1.5" From 8303bca04b7aa0183416411cd35304e1c030901f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Mar 2025 01:08:22 +0000 Subject: [PATCH 2/5] chore(deps): bump golang.org/x/net from 0.28.0 to 0.36.0 in /usernator Bumps [golang.org/x/net](https://github.com/golang/net) from 0.28.0 to 0.36.0. - [Commits](https://github.com/golang/net/compare/v0.28.0...v0.36.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] --- usernator/go.mod | 11 ++++++----- usernator/go.sum | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/usernator/go.mod b/usernator/go.mod index 584eed0..f704200 100644 --- a/usernator/go.mod +++ b/usernator/go.mod @@ -1,12 +1,13 @@ module usernator go 1.21.4 +toolchain go1.23.7 require ( github.com/gofiber/fiber/v2 v2.52.5 github.com/lib/pq v1.10.9 github.com/sethvargo/go-envconfig v1.1.0 - golang.org/x/crypto v0.31.0 + golang.org/x/crypto v0.35.0 google.golang.org/grpc v1.67.0 google.golang.org/protobuf v1.34.2 gorm.io/driver/postgres v1.5.9 @@ -30,9 +31,9 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.51.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/net v0.36.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect ) diff --git a/usernator/go.sum b/usernator/go.sum index baf1862..a8ffcd9 100644 --- a/usernator/go.sum +++ b/usernator/go.sum @@ -49,18 +49,18 @@ github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1S github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= +golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= +golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= +golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= From 3ef3c8f76609d993e5f17e32710900ae28e47199 Mon Sep 17 00:00:00 2001 From: Mathis Burger <57145815+MathisBurger@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:02:35 +0100 Subject: [PATCH 3/5] Update Dockerfile --- usernator/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usernator/Dockerfile b/usernator/Dockerfile index 2b702ae..a8f70a3 100644 --- a/usernator/Dockerfile +++ b/usernator/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine AS build +FROM golang:1.23-alpine AS build WORKDIR /app COPY . . RUN go mod tidy @@ -9,4 +9,4 @@ COPY --from=build /app/bin/usernator ./usernator RUN chmod +x ./usernator EXPOSE 3000 EXPOSE 3001 -CMD ./usernator \ No newline at end of file +CMD ./usernator From bd3cd1d0e707e3176e657a723091e65964419690 Mon Sep 17 00:00:00 2001 From: Mathis Burger <57145815+MathisBurger@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:57:18 +0100 Subject: [PATCH 4/5] fix(ci): Tried to fix go linter for usernator --- .github/workflows/test.yml | 6 ++++++ tasky/src/handler/solution.rs | 4 ++-- tasky/src/models/group.rs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b7d6d71..73fb0b7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,6 +11,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Install Go + uses: actions/setup-go@v2 + with: + go-version: 1.23 + - name: Go mod tidy + run: go mod tidy - name: Run lint uses: golangci/golangci-lint-action@v6 with: diff --git a/tasky/src/handler/solution.rs b/tasky/src/handler/solution.rs index fc0d408..a6c4763 100644 --- a/tasky/src/handler/solution.rs +++ b/tasky/src/handler/solution.rs @@ -201,7 +201,7 @@ fn compare_answers(question: &QuestionCatalogueElement, answer: Value) -> bool { if !match_question_type(question.answer_type.clone(), answer.clone()) { return false; } - return match question.answer_type { + match question.answer_type { AnswerType::Number => question.answer.as_number().unwrap() == answer.as_number().unwrap(), AnswerType::String => question.answer.as_str().unwrap() == answer.as_str().unwrap(), AnswerType::StrContains => answer @@ -209,5 +209,5 @@ fn compare_answers(question: &QuestionCatalogueElement, answer: Value) -> bool { .unwrap() .contains(question.answer.as_str().unwrap()), AnswerType::Boolean => question.answer.as_bool().unwrap() == answer.as_bool().unwrap(), - }; + } } diff --git a/tasky/src/models/group.rs b/tasky/src/models/group.rs index c6a0a2b..f7be0f2 100644 --- a/tasky/src/models/group.rs +++ b/tasky/src/models/group.rs @@ -64,7 +64,7 @@ impl GroupRepository { if result.is_empty() { return None; } - return Some(result.first().unwrap().clone()); + Some(result.first().unwrap().clone()) } /// Inserts a group into the database From d0a0d3be6122bb5379c4bd76ed0a2f6773e6c282 Mon Sep 17 00:00:00 2001 From: Mathis Burger <57145815+MathisBurger@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:58:57 +0100 Subject: [PATCH 5/5] fix(ci): Fixed cd error --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73fb0b7..25f604f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,9 @@ jobs: with: go-version: 1.23 - name: Go mod tidy - run: go mod tidy + run: | + cd usernator + go mod tidy - name: Run lint uses: golangci/golangci-lint-action@v6 with: