From fce2f59d7505e9768721287fbab70712a3ee9b88 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 13 Dec 2023 10:45:48 +0100 Subject: [PATCH] Fix deps to avoid bringing unwanted libs on kairosctl binary (#502) Signed-off-by: Itxaka --- .github/workflows/test.yml | 7 +++++++ .goreleaser.yaml | 2 ++ cli/kairosctl/main.go | 6 ------ go.sum | 10 ---------- internal/cli/config_test.go | 2 +- internal/cli/{ => token}/rotate.go | 2 +- 6 files changed, 11 insertions(+), 18 deletions(-) rename internal/cli/{ => token}/rotate.go (99%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92d71a97..ff8b4fca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,6 +34,13 @@ jobs: uses: codecov/codecov-action@v3 with: file: ./coverage.out + - name: Generate version + run: echo "VERSION=$(git describe --always --tags --dirty)" >> $GITHUB_ENV + - name: GoReleaser + uses: goreleaser/goreleaser-action@v4 + with: + version: latest + args: --snapshot --clean - uses: actions/upload-artifact@v3 with: name: build.zip diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 39856c88..38dccbdd 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -19,6 +19,7 @@ builds: - CGO_ENABLED=0 goos: - linux + - windows goarch: - amd64 - '386' @@ -32,6 +33,7 @@ source: archives: # Default template uses underscores instead of - - name_template: >- + allow_different_binary_count: true - name_template: "kairos-cli-{{ .Tag }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" id: kairos-id builds: diff --git a/cli/kairosctl/main.go b/cli/kairosctl/main.go index cc545e75..914711a5 100644 --- a/cli/kairosctl/main.go +++ b/cli/kairosctl/main.go @@ -4,9 +4,7 @@ import ( "fmt" "os" - "github.com/kairos-io/kairos-sdk/bus" iCli "github.com/kairos-io/provider-kairos/v2/internal/cli" - "github.com/kairos-io/provider-kairos/v2/internal/provider" "github.com/urfave/cli/v2" ) @@ -19,10 +17,6 @@ func checkErr(err error) { } func main() { - if len(os.Args) >= 2 && bus.IsEventDefined(os.Args[1]) { - checkErr(provider.Start()) - } - checkErr(Start()) } diff --git a/go.sum b/go.sum index c0dd15cf..f99be868 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creachadair/otp v0.4.0 h1:3PBnESxegU3hQ0D447D75lSnTtTVfw6Eny8GviOXcqM= github.com/creachadair/otp v0.4.0/go.mod h1:mDkCUSoWN8zqxFoDMw20Boe6xeDd1jJuy6pNQQ4lCy4= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.20 h1:VIPb/a2s17qNeQgDnkfZC35RScx+blkKF8GV68n80J4= -github.com/creack/pty v1.1.20/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0= github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -449,14 +447,10 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kairos-io/go-nodepair v0.0.0-20230424150716-d8f0757542c3 h1:HlHW1DfV/WcCphzR5uZh+NyECDLb1KlIbzbzVYvFG5Y= -github.com/kairos-io/go-nodepair v0.0.0-20230424150716-d8f0757542c3/go.mod h1:KH11wbkXxTMJrtRLjzycCqmYMoUjGJAz2gduHlQ9r8w= github.com/kairos-io/go-nodepair v0.0.0-20231009015959-d3490b3b686c h1:WrN/o8OskRmdEXiNVYsKv6QZPPkJIX2V7Jvt4cPsCAs= github.com/kairos-io/go-nodepair v0.0.0-20231009015959-d3490b3b686c/go.mod h1:cxk6j3VTn/VUG4NxGTYkMr3GLfs5zt4X19j+tEQSZiI= github.com/kairos-io/kairos-agent/v2 v2.4.5 h1:xEbscaVgao6qD0aHvuytT/pWNy0ase6y8+9LjRSL2gs= github.com/kairos-io/kairos-agent/v2 v2.4.5/go.mod h1:WE1yuwnbDVhqkLnUMdQXuCzJ/3bXFq64FUHzvB3SrEo= -github.com/kairos-io/kairos-sdk v0.0.17 h1:rBdtONkkRoIxtenB6BYb7Sir1Ss2yveSobyC7wC/fYU= -github.com/kairos-io/kairos-sdk v0.0.17/go.mod h1:6Y9RGvKU/B99euFE32OYrabLLsSVjjemCfyRgiEHuKE= github.com/kairos-io/kairos-sdk v0.0.19 h1:iPO9osRGAtZ1RPEOyrfHfhoWMp7qg55p5iD7PgkRdb0= github.com/kairos-io/kairos-sdk v0.0.19/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 h1:qq2nCpSrXrmvDGRxW0ruW9BVEV1CN2a9YDOExdt+U0o= @@ -896,8 +890,6 @@ github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= -github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= -github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -981,8 +973,6 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= diff --git a/internal/cli/config_test.go b/internal/cli/config_test.go index e5d40fc4..936d729c 100644 --- a/internal/cli/config_test.go +++ b/internal/cli/config_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/kairos-io/kairos-agent/v2/pkg/config" - . "github.com/kairos-io/provider-kairos/v2/internal/cli" + . "github.com/kairos-io/provider-kairos/v2/internal/cli/token" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v2" diff --git a/internal/cli/rotate.go b/internal/cli/token/rotate.go similarity index 99% rename from internal/cli/rotate.go rename to internal/cli/token/rotate.go index b5898100..7bfb1ac3 100644 --- a/internal/cli/rotate.go +++ b/internal/cli/token/rotate.go @@ -1,4 +1,4 @@ -package cli +package token import ( "errors"