From 6df77d317d1b72f0f4d6291d340aac2002a61ad9 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 27 Oct 2021 15:56:06 +0300 Subject: [PATCH 01/13] update automerge --- .github/workflows/.dependabot-automerge.yml.swp | Bin 0 -> 12288 bytes .github/workflows/dependabot-automerge.yml | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/.dependabot-automerge.yml.swp diff --git a/.github/workflows/.dependabot-automerge.yml.swp b/.github/workflows/.dependabot-automerge.yml.swp new file mode 100644 index 0000000000000000000000000000000000000000..204acc3d9f1ced4964dc2cbee048a9effbd4d47f GIT binary patch literal 12288 zcmeI2y>1gh5XU#r5s&_t>4YWgC$3y4l&Ancr?>c{+>F)*tg*?lQx1k+IJY zMq=g7TjqUZYydj8pa=QVX=CE&#zLLu_j2OsZ5q8N1F&AEA`2qe_mU_uy8L#6IFbsS zK0xZZy$JeQ#~W(1-;MRqdZA3E3PneQBQns5G(G8#lK8a9v_=Go0AsW4#`4l)PU2eQ zD!+WGMNo(U5g-CYfCvx)B0vO)01^0)2tYc+USYjws+zA<^UNP}^+*#DAOb{y2oM1x zKm>>Y5g-CYfCvx)BJd9q5Fuk9&M`JWi^=2v|C8VUKQA!$1N9yC1@#_vggQhGP$4Qn z?V>hNH&JI%zs@uE74;GI4)q$}+<^ zERNeoKF_2Dw+~6&&P;r4r&I&KevQeL&wG8I8ea4|bEoKg#;JU4%#~pp^^T}pgbcI- z5h*)wL8jJCB#2OeaCHW0hWVC_)KUc_M~Ot*1>WpwchZsVYSU|8uak0k?&I?{B|5R> zdFOQ%zpD+uTlZvR&9+X2^RjFQ^uEL@8c2(uz{SVoY2HI@^`6$9S!sPf?e_M%5`sPk zEz7t)SaR`G$BIH9`IKvwagy_~>`r(TT*`nIvMOI!1b|houJYzI{tkAW?=~^v;_Y}U z*3no~*2xrPPAmWq6PKnNe72`M)@NwUj{*-K>lvB|BwF$-;8a(jHmA}gk+qRl Date: Wed, 27 Oct 2021 15:56:36 +0300 Subject: [PATCH 02/13] fixup Signed-off-by: Vasiliy Tolstov --- .github/workflows/.dependabot-automerge.yml.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .github/workflows/.dependabot-automerge.yml.swp diff --git a/.github/workflows/.dependabot-automerge.yml.swp b/.github/workflows/.dependabot-automerge.yml.swp deleted file mode 100644 index 204acc3d9f1ced4964dc2cbee048a9effbd4d47f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2y>1gh5XU#r5s&_t>4YWgC$3y4l&Ancr?>c{+>F)*tg*?lQx1k+IJY zMq=g7TjqUZYydj8pa=QVX=CE&#zLLu_j2OsZ5q8N1F&AEA`2qe_mU_uy8L#6IFbsS zK0xZZy$JeQ#~W(1-;MRqdZA3E3PneQBQns5G(G8#lK8a9v_=Go0AsW4#`4l)PU2eQ zD!+WGMNo(U5g-CYfCvx)B0vO)01^0)2tYc+USYjws+zA<^UNP}^+*#DAOb{y2oM1x zKm>>Y5g-CYfCvx)BJd9q5Fuk9&M`JWi^=2v|C8VUKQA!$1N9yC1@#_vggQhGP$4Qn z?V>hNH&JI%zs@uE74;GI4)q$}+<^ zERNeoKF_2Dw+~6&&P;r4r&I&KevQeL&wG8I8ea4|bEoKg#;JU4%#~pp^^T}pgbcI- z5h*)wL8jJCB#2OeaCHW0hWVC_)KUc_M~Ot*1>WpwchZsVYSU|8uak0k?&I?{B|5R> zdFOQ%zpD+uTlZvR&9+X2^RjFQ^uEL@8c2(uz{SVoY2HI@^`6$9S!sPf?e_M%5`sPk zEz7t)SaR`G$BIH9`IKvwagy_~>`r(TT*`nIvMOI!1b|houJYzI{tkAW?=~^v;_Y}U z*3no~*2xrPPAmWq6PKnNe72`M)@NwUj{*-K>lvB|BwF$-;8a(jHmA}gk+qRl Date: Wed, 27 Oct 2021 16:07:12 +0300 Subject: [PATCH 03/13] fixup Signed-off-by: Vasiliy Tolstov --- .github/workflows/dependabot-automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index 69e4c39..5239c7e 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -11,7 +11,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} + // if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: metadata id: metadata From f02efaf18c767272d47681cf750021ea6c555f75 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 27 Oct 2021 16:08:18 +0300 Subject: [PATCH 04/13] fixup Signed-off-by: Vasiliy Tolstov --- .github/workflows/dependabot-automerge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index 5239c7e..de6f39a 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -11,7 +11,6 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - // if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: metadata id: metadata From 5f0e4915f624e79f5ba2887f464b262889e0bd4c Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 27 Oct 2021 16:18:11 +0300 Subject: [PATCH 05/13] fixup Signed-off-by: Vasiliy Tolstov --- .github/workflows/dependabot-automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index de6f39a..69e4c39 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -11,6 +11,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: metadata id: metadata From a360ef0e8f428bb85ee29e4287890e2644a1f6c4 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 27 Oct 2021 16:25:28 +0300 Subject: [PATCH 06/13] fixup Signed-off-by: Vasiliy Tolstov --- .github/workflows/codeql-analysis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1227e50..797ba69 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,7 +9,7 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: "codeql" on: workflow_run: @@ -26,7 +26,7 @@ on: jobs: analyze: - name: Analyze + name: analyze runs-on: ubuntu-latest permissions: actions: read @@ -42,9 +42,12 @@ jobs: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - - name: Checkout repository + - name: checkout uses: actions/checkout@v2 - + - name: setup + uses: actions/setup-go@v2 + with: + go-version: 1.16 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v1 @@ -57,7 +60,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild + - name: autobuild uses: github/codeql-action/autobuild@v1 # ℹ️ Command-line programs to run using the OS shell. @@ -71,5 +74,5 @@ jobs: # make bootstrap # make release - - name: Perform CodeQL Analysis + - name: analyze uses: github/codeql-action/analyze@v1 From 2bba395ba3692682f87765ff812190c2888019c7 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 27 Oct 2021 16:28:34 +0300 Subject: [PATCH 07/13] fixup Signed-off-by: Vasiliy Tolstov --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 797ba69..b50aad2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -49,7 +49,7 @@ jobs: with: go-version: 1.16 # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL + - name: init uses: github/codeql-action/init@v1 with: languages: ${{ matrix.language }} From 83cc922771c3a44e610be067b081cc25711312a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Oct 2021 13:29:38 +0000 Subject: [PATCH 08/13] Bump go.unistack.org/micro/v3 from 3.8.5 to 3.8.6 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.5 to 3.8.6. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.5...v3.8.6) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e60c56a..07159d7 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.unistack.org/micro-client-http/v3 go 1.16 -require go.unistack.org/micro/v3 v3.8.5 +require go.unistack.org/micro/v3 v3.8.6 diff --git a/go.sum b/go.sum index 9cb93f2..53dc681 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= -go.unistack.org/micro/v3 v3.8.5 h1:DIYWRsQF+NPhKZP45sCtNsUhaRw6u2+Ps7U+pKU7i3s= -go.unistack.org/micro/v3 v3.8.5/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= +go.unistack.org/micro/v3 v3.8.6 h1:nU6dpNRF7iF8dtcTTfzdPan8RkhiDuTsfMrXBmpzG/g= +go.unistack.org/micro/v3 v3.8.6/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 2800d4c78bcb12ccc7170ab2dce500ef1fff101d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Oct 2021 18:21:01 +0000 Subject: [PATCH 09/13] Bump go.unistack.org/micro/v3 from 3.8.6 to 3.8.7 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.6 to 3.8.7. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.6...v3.8.7) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 07159d7..5209b0e 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.unistack.org/micro-client-http/v3 go 1.16 -require go.unistack.org/micro/v3 v3.8.6 +require go.unistack.org/micro/v3 v3.8.7 diff --git a/go.sum b/go.sum index 53dc681..e0dfc27 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= -go.unistack.org/micro/v3 v3.8.6 h1:nU6dpNRF7iF8dtcTTfzdPan8RkhiDuTsfMrXBmpzG/g= -go.unistack.org/micro/v3 v3.8.6/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= +go.unistack.org/micro/v3 v3.8.7 h1:k1zOpJ3uS8MxdhK8annRsa5J/LW7MpqPjwYuekW61wE= +go.unistack.org/micro/v3 v3.8.7/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 0f80c9f7baee3ef5d9136f6ea4b33c93d44cecd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 18:21:19 +0000 Subject: [PATCH 10/13] Bump go.unistack.org/micro/v3 from 3.8.7 to 3.8.9 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.7 to 3.8.9. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.7...v3.8.9) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5209b0e..90813e7 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.unistack.org/micro-client-http/v3 go 1.16 -require go.unistack.org/micro/v3 v3.8.7 +require go.unistack.org/micro/v3 v3.8.9 diff --git a/go.sum b/go.sum index e0dfc27..1b6448c 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= -go.unistack.org/micro/v3 v3.8.7 h1:k1zOpJ3uS8MxdhK8annRsa5J/LW7MpqPjwYuekW61wE= -go.unistack.org/micro/v3 v3.8.7/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= +go.unistack.org/micro/v3 v3.8.9 h1:F+HAQSHI86F8Xx5D6XKvvuN0TtOuVvJM+OBV8aYTg0Y= +go.unistack.org/micro/v3 v3.8.9/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 2b47343e07348ea34b1aa18a6b1abd05a488b83d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 18:16:11 +0000 Subject: [PATCH 11/13] Bump go.unistack.org/micro/v3 from 3.8.9 to 3.8.10 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.9 to 3.8.10. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.9...v3.8.10) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 90813e7..0bfb062 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.unistack.org/micro-client-http/v3 go 1.16 -require go.unistack.org/micro/v3 v3.8.9 +require go.unistack.org/micro/v3 v3.8.10 diff --git a/go.sum b/go.sum index 1b6448c..b8e34c1 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= -go.unistack.org/micro/v3 v3.8.9 h1:F+HAQSHI86F8Xx5D6XKvvuN0TtOuVvJM+OBV8aYTg0Y= -go.unistack.org/micro/v3 v3.8.9/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= +go.unistack.org/micro/v3 v3.8.10 h1:ZMKGGalqkZc677S5BmSPTAMZAE4q3u2FuqCrCd1TO7g= +go.unistack.org/micro/v3 v3.8.10/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From d85e3fdce2ddb418a941604d687a0639f3395b42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 18:17:26 +0000 Subject: [PATCH 12/13] Bump go.unistack.org/micro/v3 from 3.8.10 to 3.8.11 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.10 to 3.8.11. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.10...v3.8.11) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0bfb062..86c582a 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.unistack.org/micro-client-http/v3 go 1.16 -require go.unistack.org/micro/v3 v3.8.10 +require go.unistack.org/micro/v3 v3.8.11 diff --git a/go.sum b/go.sum index b8e34c1..a5907df 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= -go.unistack.org/micro/v3 v3.8.10 h1:ZMKGGalqkZc677S5BmSPTAMZAE4q3u2FuqCrCd1TO7g= -go.unistack.org/micro/v3 v3.8.10/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= +go.unistack.org/micro/v3 v3.8.11 h1:Wv1YopcYNcsN3bW8Mv8v6AF99s0uKBtWQ1M/Ag8QLec= +go.unistack.org/micro/v3 v3.8.11/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 757c458f60df26a34e729a1794950465a47e8020 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Thu, 16 Dec 2021 15:37:49 +0300 Subject: [PATCH 13/13] fix for latest micro Signed-off-by: Vasiliy Tolstov --- go.mod | 2 +- go.sum | 4 ++-- message.go | 14 +++++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 86c582a..b28507f 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.unistack.org/micro-client-http/v3 go 1.16 -require go.unistack.org/micro/v3 v3.8.11 +require go.unistack.org/micro/v3 v3.8.12 diff --git a/go.sum b/go.sum index a5907df..02d3ec6 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA= go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8= -go.unistack.org/micro/v3 v3.8.11 h1:Wv1YopcYNcsN3bW8Mv8v6AF99s0uKBtWQ1M/Ag8QLec= -go.unistack.org/micro/v3 v3.8.11/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= +go.unistack.org/micro/v3 v3.8.12 h1:ACaHE8ZIHFXqEGPSRvXzND4hcqCSQf04WkzOFY6Y1gQ= +go.unistack.org/micro/v3 v3.8.12/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA= golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/message.go b/message.go index ef69d9f..5b7f95a 100644 --- a/message.go +++ b/message.go @@ -2,24 +2,28 @@ package http import ( "go.unistack.org/micro/v3/client" + "go.unistack.org/micro/v3/metadata" ) type httpMessage struct { payload interface{} topic string contentType string + opts client.MessageOptions } func newHTTPMessage(topic string, payload interface{}, contentType string, opts ...client.MessageOption) client.Message { options := client.NewMessageOptions(opts...) - if len(options.ContentType) == 0 { - options.ContentType = contentType + + if len(options.ContentType) > 0 { + contentType = options.ContentType } return &httpMessage{ payload: payload, topic: topic, - contentType: options.ContentType, + contentType: contentType, + opts: options, } } @@ -34,3 +38,7 @@ func (h *httpMessage) Topic() string { func (h *httpMessage) Payload() interface{} { return h.payload } + +func (h *httpMessage) Metadata() metadata.Metadata { + return h.opts.Metadata +}