From 9c822349074ca9f0786eaa2edc2dd20d95e8ee3e Mon Sep 17 00:00:00 2001 From: egs33 Date: Wed, 8 Mar 2023 12:36:18 +0900 Subject: [PATCH 1/5] Bump deps --- deps.edn | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/deps.edn b/deps.edn index 48239ad..eef084b 100644 --- a/deps.edn +++ b/deps.edn @@ -1,22 +1,22 @@ {:paths ["src"] - :deps {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/core.async {:mvn/version "1.3.610"} - org.clojure/tools.logging {:mvn/version "1.1.0"} - camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.2"} - com.cognitect.aws/api {:mvn/version "0.8.484"} - com.cognitect.aws/endpoints {:mvn/version "1.1.11.926"} - com.cognitect.aws/sqs {:mvn/version "810.2.817.0"}} + :deps {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/core.async {:mvn/version "1.6.673"} + org.clojure/tools.logging {:mvn/version "1.2.4"} + camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"} + com.cognitect.aws/api {:mvn/version "0.8.652"} + com.cognitect.aws/endpoints {:mvn/version "1.1.12.415"} + com.cognitect.aws/sqs {:mvn/version "822.2.1109.0"}} :aliases {:dev {:extra-paths ["test" "dev-resources"] :extra-deps {aero/aero {:mvn/version "1.1.6"} - spootnik/unilog {:mvn/version "0.7.27"} - lambdaisland/kaocha {:mvn/version "1.60.977"}}} + spootnik/unilog {:mvn/version "0.7.31"} + lambdaisland/kaocha {:mvn/version "1.80.1274"}}} :test {:main-opts ["-m" "kaocha.runner"]} :outdated {:deps {com.github.liquidz/antq {:mvn/version "RELEASE"}} :main-opts ["-m" "antq.core"]} - :build {:deps {com.github.liquidz/build.edn {:git/tag "0.3.90" :git/sha "e3a3e31"}} + :build {:deps {com.github.liquidz/build.edn {:git/tag "0.9.203" :git/sha "b276908"}} :ns-default build-edn.main}}} From d57f25c550fc735b4a4d9356ecd88d8ec289c092 Mon Sep 17 00:00:00 2001 From: egs33 Date: Wed, 8 Mar 2023 12:40:37 +0900 Subject: [PATCH 2/5] Fix for changing aws-api --- src/gluttony/record/consumer.clj | 2 +- src/gluttony/sqs.clj | 4 ++-- test/gluttony/sqs_test.clj | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gluttony/record/consumer.clj b/src/gluttony/record/consumer.clj index 9333813..62961cb 100644 --- a/src/gluttony/record/consumer.clj +++ b/src/gluttony/record/consumer.clj @@ -9,7 +9,7 @@ [gluttony.record.message :as r.msg] [gluttony.sqs :as sqs]) (:import - (cognitect.aws.client + (cognitect.aws.client.impl Client))) (defn- start-receivers diff --git a/src/gluttony/sqs.clj b/src/gluttony/sqs.clj index 009918c..b717a25 100644 --- a/src/gluttony/sqs.clj +++ b/src/gluttony/sqs.clj @@ -4,13 +4,13 @@ [camel-snake-kebab.core :as csk] [camel-snake-kebab.extras :as cske] [clojure.core.async :as a] - [cognitect.aws.client.api.async :as aws-async])) + [cognitect.aws.client.api :as aws])) (defn- invoke-async [client op-map] (let [op-map (update op-map :request #(cske/transform-keys csk/->PascalCaseKeyword %))] (a/go - (when-let [res (a/kebab-case-keyword res))))) (defn receive-message diff --git a/test/gluttony/sqs_test.clj b/test/gluttony/sqs_test.clj index 8ba7a7d..6f02642 100644 --- a/test/gluttony/sqs_test.clj +++ b/test/gluttony/sqs_test.clj @@ -28,7 +28,9 @@ "KmsMasterKeyId" "KmsDataKeyReusePeriodSeconds" "DeduplicationScope" - "FifoThroughputLimit"]]] + "FifoThroughputLimit" + "RedriveAllowPolicy" + "SqsManagedSseEnabled"]]] :MaxNumberOfMessages 'integer :MessageAttributeNames [:seq-of 'string] :QueueUrl 'string @@ -69,8 +71,7 @@ :request {:QueueUrl 'string :ReceiptHandle 'string} :required [:QueueUrl - :ReceiptHandle] - :response nil} + :ReceiptHandle]} (-> (aws/ops client) :DeleteMessage (dissoc :documentation)))))) @@ -83,8 +84,7 @@ :VisibilityTimeout 'integer} :required [:QueueUrl :ReceiptHandle - :VisibilityTimeout] - :response nil} + :VisibilityTimeout]} (-> (aws/ops client) :ChangeMessageVisibility (dissoc :documentation)))))) From b64a6fde3d8126d7d4c23712deaf5a2761aa6977 Mon Sep 17 00:00:00 2001 From: egs33 Date: Wed, 8 Mar 2023 12:40:47 +0900 Subject: [PATCH 3/5] Bump clj-kondo in CI --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index da08557..86d0107 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -33,7 +33,7 @@ jobs: - uses: DeLaGuardo/setup-clj-kondo@master with: - version: '2022.04.25' + version: '2023.02.17' - name: Show versions run: | From 9a2ec4f64de8f9a65397142f04a3db7592b874c2 Mon Sep 17 00:00:00 2001 From: egs33 Date: Wed, 8 Mar 2023 14:17:58 +0900 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c70a0d..e1bb4e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log ## [Unreleased] +### Changed +* Bump library versions. ## 0.5.99 ### Added From 91a55ace2ee0ef6088e8a28af9bfe36e851bd4a9 Mon Sep 17 00:00:00 2001 From: egs33 Date: Wed, 8 Mar 2023 14:57:18 +0900 Subject: [PATCH 5/5] Use ncipollo/release-action in release action action/create-release is archived --- .github/workflows/release.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b63195d..3b48b2b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,15 +43,11 @@ jobs: CLOJARS_USERNAME: ${{secrets.CLOJARS_USERNAME}} - name: Create tag and release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: ncipollo/release-action@v1 with: - tag_name: ${{ steps.deploy.outputs.version }} - release_name: ${{ steps.deploy.outputs.version }} - body: released - draft: false - prerelease: false + tag: ${{ steps.deploy.outputs.version }} + skipIfReleaseExists: true + generateReleaseNotes: true - name: Update documents run: |