From 0c7e766f9334a7f243d448acf4918dacae9649e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 16:46:45 +0000 Subject: [PATCH] build(deps): bump golangci/golangci-lint-action from 3 to 4 (#268) --- .github/workflows/tests.yml | 2 +- CHANGELOG.md | 7 +++++++ docker-compose.yml | 2 +- go.mod | 16 ++++++++-------- go.sum | 16 ++++++++++++++++ test/hurl/404.hurl | 2 +- test/hurl/code_502_default.hurl | 2 +- test/hurl/code_502_json.hurl | 4 ++-- test/hurl/code_502_xml.hurl | 4 ++-- test/hurl/healthz.hurl | 8 ++++---- test/hurl/index.hurl | 6 +++--- test/hurl/metrics.hurl | 16 +++++++++------- test/hurl/proxy_headers.hurl | 2 +- test/hurl/readme.md | 4 ++-- test/hurl/version.hurl | 2 +- test/hurl/x_code.hurl | 6 +++--- 16 files changed, 62 insertions(+), 37 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 65738c8..935a732 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: # Docs: - uses: gacts/setup-go-with-cache@v1 with: {go-version-file: go.mod} - - uses: golangci/golangci-lint-action@v3 + - uses: golangci/golangci-lint-action@v4 with: {skip-pkg-cache: true, skip-build-cache: true} validate-config-file: diff --git a/CHANGELOG.md b/CHANGELOG.md index 902e2ef..52f43ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver]. +## v2.27.0 + +### Changed + +- Go updated from `1.21` up to `1.22` +- Go dependencies updated + ## v2.26.0 ### Added diff --git a/docker-compose.yml b/docker-compose.yml index bc46ade..692b961 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: security_opt: [no-new-privileges:true] hurl: - image: orangeopensource/hurl:1.8.0 + image: ghcr.io/orange-opensource/hurl:4.2.0 volumes: - .:/src:ro working_dir: /src diff --git a/go.mod b/go.mod index cb65741..6f94469 100644 --- a/go.mod +++ b/go.mod @@ -23,19 +23,19 @@ require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/klauspost/compress v1.17.6 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/procfs v0.13.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/savsgio/gotils v0.0.0-20240303185622-093b76447511 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - go.uber.org/multierr v1.10.0 // indirect - golang.org/x/sys v0.17.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/sys v0.18.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.sum b/go.sum index adc0ce1..bd2f994 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fasthttp/router v1.5.0 h1:3Qbbo27HAPzwbpRzgiV5V9+2faPkPt3eNuRaDV6LYDA= @@ -20,6 +22,8 @@ github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d h1:cVtBfNW5XTH github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d/go.mod h1:P2viExyCEfeWGU259JnaQ34Inuec4R38JCyBx2edgD0= github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -41,8 +45,12 @@ github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZ github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= +github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= +github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -59,20 +67,28 @@ github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7g github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= 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.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/test/hurl/404.hurl b/test/hurl/404.hurl index fe8e0a1..7d80230 100644 --- a/test/hurl/404.hurl +++ b/test/hurl/404.hurl @@ -1,6 +1,6 @@ GET http://{{ host }}:{{ port }}/not-found -HTTP/* 404 +HTTP 404 [Asserts] header "Content-Type" contains "text/html" diff --git a/test/hurl/code_502_default.hurl b/test/hurl/code_502_default.hurl index 47d4ca5..0a62cd5 100644 --- a/test/hurl/code_502_default.hurl +++ b/test/hurl/code_502_default.hurl @@ -1,6 +1,6 @@ GET http://{{ host }}:{{ port }}/502.html -HTTP/* 200 +HTTP 200 [Asserts] header "Content-Type" contains "text/html" diff --git a/test/hurl/code_502_json.hurl b/test/hurl/code_502_json.hurl index d9a9130..6e4b1b9 100644 --- a/test/hurl/code_502_json.hurl +++ b/test/hurl/code_502_json.hurl @@ -10,7 +10,7 @@ X-Request-ID: ccc X-Forwarded-For: ddd Host: eee -HTTP/* 200 +HTTP 200 [Asserts] header "Content-Type" contains "application/json" @@ -33,7 +33,7 @@ jsonpath "$.details.timestamp" isInteger GET http://{{ host }}:{{ port }}/502.html X-Format: text/json -HTTP/* 200 +HTTP 200 [Asserts] header "Content-Type" contains "application/json" diff --git a/test/hurl/code_502_xml.hurl b/test/hurl/code_502_xml.hurl index de4a4fb..41442ba 100644 --- a/test/hurl/code_502_xml.hurl +++ b/test/hurl/code_502_xml.hurl @@ -10,7 +10,7 @@ X-Request-ID: ccc X-Forwarded-For: ddd Host: eee -HTTP/* 200 +HTTP 200 [Asserts] header "Content-Type" contains "application/xml" @@ -32,7 +32,7 @@ xpath "string(//error/details/timestamp)" exists GET http://{{ host }}:{{ port }}/502.html X-Format: text/xml -HTTP/* 200 +HTTP 200 [Asserts] header "Content-Type" contains "application/xml" diff --git a/test/hurl/healthz.hurl b/test/hurl/healthz.hurl index efaa220..c5f73b8 100644 --- a/test/hurl/healthz.hurl +++ b/test/hurl/healthz.hurl @@ -1,12 +1,12 @@ GET http://{{ host }}:{{ port }}/healthz -HTTP/* 200 +HTTP 200 -```OK``` +`OK` # Next endpoint marked as deprecated GET http://{{ host }}:{{ port }}/health/live -HTTP/* 200 +HTTP 200 -```OK``` +`OK` diff --git a/test/hurl/index.hurl b/test/hurl/index.hurl index a32a092..e67328b 100644 --- a/test/hurl/index.hurl +++ b/test/hurl/index.hurl @@ -1,7 +1,7 @@ # HTML content GET http://{{ host }}:{{ port }}/ -HTTP/* 404 +HTTP 404 [Asserts] header "Content-Type" contains "text/html" @@ -12,7 +12,7 @@ body contains "Not Found" GET http://{{ host }}:{{ port }}/ Content-Type: text/json -HTTP/* 404 +HTTP 404 [Asserts] header "Content-Type" contains "application/json" @@ -25,7 +25,7 @@ jsonpath "$.message" == "Not Found" GET http://{{ host }}:{{ port }}/ Content-Type: application/xml -HTTP/* 404 +HTTP 404 [Asserts] header "Content-Type" contains "application/xml" diff --git a/test/hurl/metrics.hurl b/test/hurl/metrics.hurl index 27c8c25..a3a599b 100644 --- a/test/hurl/metrics.hurl +++ b/test/hurl/metrics.hurl @@ -1,8 +1,10 @@ -GET http://{{ host }}:{{ port }}/metrics +# disabled until https://github.com/Orange-OpenSource/hurl/issues/2540 is not fixed -HTTP/* 200 - -[Asserts] -header "Content-Type" contains "text/plain" -body contains "http_requests_duration_millisecond" -body contains "http_requests_total_count" +#GET http://{{ host }}:{{ port }}/metrics +# +#HTTP 200 +# +#[Asserts] +#header "Content-Type" contains "text/plain" +#body contains "http_requests_duration_millisecond" +#body contains "http_requests_total_count" diff --git a/test/hurl/proxy_headers.hurl b/test/hurl/proxy_headers.hurl index 42c2251..34714aa 100644 --- a/test/hurl/proxy_headers.hurl +++ b/test/hurl/proxy_headers.hurl @@ -4,7 +4,7 @@ bar: BAR Baz_blah: baz Baz NonEx: skip -HTTP/* 200 +HTTP 200 [Asserts] header "X-Foo" == "foo" diff --git a/test/hurl/readme.md b/test/hurl/readme.md index 0d5e25e..8838348 100644 --- a/test/hurl/readme.md +++ b/test/hurl/readme.md @@ -10,7 +10,7 @@ It can perform requests, capture values and evaluate queries on headers and body # Get home: GET https://example.net -HTTP/1.1 200 +HTTP 200 [Captures] csrf_token: xpath "string(//meta[@name='_csrf_token']/@content)" @@ -18,7 +18,7 @@ csrf_token: xpath "string(//meta[@name='_csrf_token']/@content)" POST https://example.net/login?user=toto&password=1234 X-CSRF-TOKEN: {{csrf_token}} -HTTP/1.1 302 +HTTP 302 ``` ### Links: diff --git a/test/hurl/version.hurl b/test/hurl/version.hurl index cf45fac..f50a9ee 100644 --- a/test/hurl/version.hurl +++ b/test/hurl/version.hurl @@ -1,6 +1,6 @@ GET http://{{ host }}:{{ port }}/version -HTTP/* 200 +HTTP 200 [Asserts] header "Content-Type" == "application/json" diff --git a/test/hurl/x_code.hurl b/test/hurl/x_code.hurl index a0f0133..c8904e4 100644 --- a/test/hurl/x_code.hurl +++ b/test/hurl/x_code.hurl @@ -2,7 +2,7 @@ GET http://{{ host }}:{{ port }}/ X-Code: 410 -HTTP/* 410 +HTTP 410 [Asserts] header "Content-Type" contains "text/html" @@ -15,7 +15,7 @@ GET http://{{ host }}:{{ port }}/ X-Code: 410 X-Format: text/html;q=0.9,application/xhtml+xml;q=0.9,application/json,image/avif,image/webp,*/*;q=0.8 -HTTP/* 410 +HTTP 410 [Asserts] header "Content-Type" contains "application/json" @@ -28,7 +28,7 @@ jsonpath "$.message" == "Gone" GET http://{{ host }}:{{ port }}/502.html X-Code: 410 -HTTP/* 200 +HTTP 200 [Asserts] header "Content-Type" contains "text/html"