diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 81b5e0b..9f88558 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,11 @@ updates: - package-ecosystem: "gomod" directory: "/" target-branch: "develop" + cooldown: + default-days: 7 + exclude: + - "github.com/essentialkaos/*" + - "golang.org/x/*" schedule: interval: "daily" timezone: "Etc/UTC" @@ -22,6 +27,8 @@ updates: - package-ecosystem: "github-actions" directory: "/" target-branch: "develop" + cooldown: + default-days: 7 schedule: interval: "daily" timezone: "Etc/UTC" diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml index 0562768..242b419 100644 --- a/.github/workflows/cd-release.yml +++ b/.github/workflows/cd-release.yml @@ -28,18 +28,18 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 0 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4.6.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4.6.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -133,7 +133,7 @@ jobs: - name: Build and push Docker images (Docker) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: push: true context: . @@ -146,7 +146,7 @@ jobs: - name: Build and push Docker images (GHCR) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: push: true context: . diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index c88a8da..94f792c 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -40,10 +40,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4.6.0 env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} if: ${{ env.DOCKERHUB_USERNAME != '' }} @@ -52,7 +52,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4.6.0 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5d47db..e2f664c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: ${{ matrix.go }} @@ -40,10 +40,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 'stable' @@ -64,10 +64,10 @@ jobs: steps: - name: Code checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4.6.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -86,7 +86,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Check dockerfiles with Hadolint uses: essentialkaos/hadolint-action@v1 @@ -101,7 +101,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Check spelling uses: crate-ci/typos@master diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1ea3e52..3b9a516 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,14 +20,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 2 - name: Initialize CodeQL - uses: github/codeql-action/init@v4 + uses: github/codeql-action/init@v4.37.9 with: languages: go - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 + uses: github/codeql-action/analyze@v4.37.9 diff --git a/README.md b/README.md index a2a3433..7c8a3aa 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@

- GoReportCard - Codacy badge - GitHub Actions CI Status - GitHub Actions CodeQL Status + Codacy badge + GitHub Actions CI Status + GitHub Actions CodeQL Status

@@ -25,7 +24,7 @@ #### From source -To build the SSLScan Client from scratch, make sure you have a working Go [1.23+](https://github.com/essentialkaos/.github/blob/master/GO-VERSION-SUPPORT.md) workspace ([instructions](https://go.dev/doc/install)), then: +To build the SSLScan Client from scratch, make sure you have a working Go [1.25+](https://github.com/essentialkaos/.github/blob/master/GO-VERSION-SUPPORT.md) workspace ([instructions](https://go.dev/doc/install)), then: ``` go install github.com/essentialkaos/sslcli/v3@latest @@ -90,8 +89,8 @@ sslcli --update=quiet | Branch | Status | |------------|--------| -| `master` | [![CI](https://kaos.sh/w/sslcli/ci-push.svg?branch=master)](https://kaos.sh/w/sslcli/ci-push?query=branch:master) | -| `develop` | [![CI](https://kaos.sh/w/sslcli/ci-push.svg?branch=develop)](https://kaos.sh/w/sslcli/ci-push?query=branch:develop) | +| `master` | [![CI](https://github.com/essentialkaos/sslcli/actions/workflows/ci-push.yml/badge.svg?branch=master)](https://kaos.sh/w/sslcli/ci-push?query=branch:master) | +| `develop` | [![CI](https://github.com/essentialkaos/sslcli/actions/workflows/ci-push.yml/badge.svg?branch=develop)](https://kaos.sh/w/sslcli/ci-push?query=branch:develop) | ### Contributing diff --git a/cli/cli.go b/cli/cli.go index dabebd0..df9e459 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -15,24 +15,24 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/pager" - "github.com/essentialkaos/ek/v13/req" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/support" - "github.com/essentialkaos/ek/v13/support/deps" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/tty" - "github.com/essentialkaos/ek/v13/timeutil" - "github.com/essentialkaos/ek/v13/usage" - "github.com/essentialkaos/ek/v13/usage/completion/bash" - "github.com/essentialkaos/ek/v13/usage/completion/fish" - "github.com/essentialkaos/ek/v13/usage/completion/zsh" - "github.com/essentialkaos/ek/v13/usage/man" - "github.com/essentialkaos/ek/v13/usage/update" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/pager" + "github.com/essentialkaos/ek/v14/req" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/support" + "github.com/essentialkaos/ek/v14/support/deps" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/tty" + "github.com/essentialkaos/ek/v14/timeutil" + "github.com/essentialkaos/ek/v14/usage" + "github.com/essentialkaos/ek/v14/usage/completion/bash" + "github.com/essentialkaos/ek/v14/usage/completion/fish" + "github.com/essentialkaos/ek/v14/usage/completion/zsh" + "github.com/essentialkaos/ek/v14/usage/man" + "github.com/essentialkaos/ek/v14/usage/update" sslscan "github.com/essentialkaos/sslscan/v14" ) @@ -41,7 +41,7 @@ import ( const ( APP = "SSLScan Client" - VER = "3.1.0" + VER = "3.2.0" DESC = "Command-line client for the SSL Labs API" ) @@ -164,7 +164,7 @@ func Run(gitRev string, gomod []byte) { if !errs.IsEmpty() { terminal.Error("Options parsing errors:") - terminal.Error(errs.Error(" - ")) + terminal.Error(errs.ErrorWithPrefix(" - ")) os.Exit(1) } diff --git a/cli/details.go b/cli/details.go index 69c77e9..2d18521 100644 --- a/cli/details.go +++ b/cli/details.go @@ -9,17 +9,17 @@ package cli import ( "fmt" + "net/http" "slices" "strings" "time" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/httputil" - "github.com/essentialkaos/ek/v13/pluralize" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/timeutil" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/pluralize" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/timeutil" sslscan "github.com/essentialkaos/sslscan/v14" ) @@ -1194,7 +1194,7 @@ func printTestInfo(info *sslscan.EndpointInfo) { fmtc.Printfn( " %-24s {s}|{!} %d {s-}(%s){!}", "HTTP status code", details.HTTPStatusCode, - httputil.GetDescByCode(details.HTTPStatusCode), + http.StatusText(details.HTTPStatusCode), ) } } diff --git a/cli/with_selfupdate.go b/cli/with_selfupdate.go index e4f0dc2..01beff8 100644 --- a/cli/with_selfupdate.go +++ b/cli/with_selfupdate.go @@ -12,12 +12,12 @@ package cli import ( "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/selfupdate" - "github.com/essentialkaos/ek/v13/selfupdate/interactive" - storage "github.com/essentialkaos/ek/v13/selfupdate/storage/basic" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/selfupdate" + "github.com/essentialkaos/ek/v14/selfupdate/interactive" + storage "github.com/essentialkaos/ek/v14/selfupdate/storage/basic" + "github.com/essentialkaos/ek/v14/terminal" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/common/sslcli.spec b/common/sslcli.spec index c7cecc6..b1d7961 100644 --- a/common/sslcli.spec +++ b/common/sslcli.spec @@ -10,7 +10,7 @@ Summary: Pretty awesome command-line client for public SSLLabs API Name: sslcli -Version: 3.1.0 +Version: 3.2.0 Release: 0%{?dist} Group: Applications/System License: Apache License, Version 2.0 @@ -22,7 +22,7 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: golang >= 1.24 +BuildRequires: golang >= 1.25 Provides: %{name} = %{version}-%{release} @@ -103,6 +103,10 @@ fi ################################################################################ %changelog +* Wed May 06 2026 Anton Novojilov - 3.2.0-0 +- Migrated to ek.v14 +- Dependencies update + * Tue Jan 20 2026 Anton Novojilov - 3.1.0-0 - Dependencies update diff --git a/go.mod b/go.mod index 6743f84..0c8e44f 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/essentialkaos/sslcli/v3 -go 1.24.11 +go 1.25.10 require ( - github.com/essentialkaos/ek/v13 v13.38.3 - github.com/essentialkaos/sslscan/v14 v14.1.4 + github.com/essentialkaos/ek/v14 v14.4.2 + github.com/essentialkaos/sslscan/v14 v14.2.0 ) require ( github.com/essentialkaos/depsy v1.3.1 // indirect - golang.org/x/sys v0.40.0 // indirect + golang.org/x/sys v0.47.0 // indirect ) diff --git a/go.sum b/go.sum index d20285b..eabff1e 100644 --- a/go.sum +++ b/go.sum @@ -2,15 +2,15 @@ github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1 github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M= github.com/essentialkaos/depsy v1.3.1 h1:00k9QcMsdPM4IzDaEFHsTHBD/zoM0oxtB5+dMUwbQa8= github.com/essentialkaos/depsy v1.3.1/go.mod h1:B5+7Jhv2a2RacOAxIKU2OeJp9QfZjwIpEEPI5X7auWM= -github.com/essentialkaos/ek/v13 v13.38.3 h1:gQVNC6RdSBBYFhmtN9QOCZbshm+ib0PO2b9O0C7JMWc= -github.com/essentialkaos/ek/v13 v13.38.3/go.mod h1:qS5hOA6BaVYCS+nstm6l502Ehkb8i5PaN5nd40fbUg0= -github.com/essentialkaos/sslscan/v14 v14.1.4 h1:gtVs4OyiA7yyy7og3meVL9WTlo5C21d8WR2TkV3RGEo= -github.com/essentialkaos/sslscan/v14 v14.1.4/go.mod h1:MD8HhNo9gDH/ko9vHTyzapAOixEZraYyjmSgulPr/ac= +github.com/essentialkaos/ek/v14 v14.4.2 h1:ZT7aSZ6DIM7RIvJB1z5U6OenPOuhDV8bGp5pKq8K5nM= +github.com/essentialkaos/ek/v14 v14.4.2/go.mod h1:mWYB8YRnwtvMK858kLtuM0c++E7Xb1yWW63HD5od5uY= +github.com/essentialkaos/sslscan/v14 v14.2.0 h1:65OT+0kotjZG2NAN27XMrqV89Y8IRe1g3NZvFyzGtHk= +github.com/essentialkaos/sslscan/v14 v14.2.0/go.mod h1:HGGaVtIHN3tPx8eo/LNauxwGMf6QrzSkT3ZwSlE/fFI= 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= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= -github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +github.com/rogpeppe/go-internal v1.15.0 h1:D0RCU5rMAp+SpgkiNdrjfJ+LX4J1M32V2NeCY7EJ6hc= +github.com/rogpeppe/go-internal v1.15.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=