From 7cda8445e05d9b0545dba0bbf2c17dd90343fdef Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 30 Mar 2022 11:48:24 +0300 Subject: [PATCH] Migrate to go modules + Improve GitHub actions workflows --- .github/dependabot.yml | 30 ++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/codeql.yml | 3 --- Makefile | 31 ++++++++++++++++++------------- README.md | 10 ++-------- action/auxi.go | 2 +- action/backup.go | 4 ++-- action/common.go | 6 +++--- action/fs.go | 10 +++++----- action/http.go | 6 +++--- action/io.go | 6 +++--- action/libs.go | 8 ++++---- action/python.go | 2 +- action/service.go | 4 ++-- action/system.go | 14 +++++++------- action/users.go | 4 ++-- bibop.go | 5 +++-- centos7.docker | 6 +----- cli/cli.go | 28 ++++++++++++++-------------- cli/executor/executor.go | 24 ++++++++++++------------ cli/executor/validators.go | 10 +++++----- go.mod | 18 ++++++++++++++++++ go.sum | 32 ++++++++++++++++++++++++++++++++ output/output_store.go | 2 +- parser/fuzz.go | 3 ++- parser/parser.go | 6 +++--- parser/parser_test.go | 4 ++-- recipe/recipe.go | 4 ++-- recipe/recipe_test.go | 4 ++-- recipe/runtime_variables.go | 10 +++++----- recipe/tokens.go | 2 +- render/render.go | 2 +- render/renderer_json.go | 2 +- render/renderer_quiet.go | 2 +- render/renderer_tap13.go | 2 +- render/renderer_terminal.go | 10 +++++----- render/renderer_xml.go | 2 +- 37 files changed, 204 insertions(+), 130 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 go.mod create mode 100644 go.sum diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..fc513372 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,30 @@ +version: 2 + +updates: + - package-ecosystem: "gomod" + directory: "/" + target-branch: "develop" + schedule: + interval: "daily" + timezone: "Europe/London" + time: "03:00" + labels: + - "PR • MAINTENANCE" + assignees: + - "andyone" + reviewers: + - "andyone" + + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "develop" + schedule: + interval: "daily" + timezone: "Europe/London" + time: "04:00" + labels: + - "PR • MAINTENANCE" + assignees: + - "andyone" + reviewers: + - "andyone" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92ee63ce..011af7fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: - go: [ '1.16.x', '1.17.x' ] + go: [ '1.17.x', '1.18.x' ] steps: - name: Set up Go @@ -35,7 +35,7 @@ jobs: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ${{env.SRC_DIR}} @@ -63,7 +63,7 @@ jobs: run: goveralls -service github -coverprofile cover.out - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '14.x' @@ -91,7 +91,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.16.x' + go-version: '1.17.x' id: go - name: Setup PATH @@ -101,7 +101,7 @@ jobs: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ${{env.SRC_DIR}} @@ -123,7 +123,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Check scripts with Shellcheck uses: essentialkaos/shellcheck-action@v1 @@ -138,7 +138,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Check dockerfiles with Hadolint uses: essentialkaos/hadolint-action@v1 @@ -153,7 +153,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Login to DockerHub uses: docker/login-action@v1 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 24d3a73a..34446621 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,9 +19,6 @@ jobs: with: fetch-depth: 2 - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/Makefile b/Makefile index b4e1dd9b..17a9cb16 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,16 @@ ################################################################################ -# This Makefile generated by GoMakeGen 1.3.2 using next command: -# gomakegen . +# This Makefile generated by GoMakeGen 1.5.1 using next command: +# gomakegen --mod . # # More info: https://kaos.sh/gomakegen ################################################################################ +export GO111MODULE=on + .DEFAULT_GOAL := help -.PHONY = fmt vet all clean git-config deps deps-test test gen-fuzz help +.PHONY = fmt vet all clean deps deps-test test gen-fuzz mod-init mod-update mod-vendor help ################################################################################ @@ -23,16 +25,9 @@ install: ## Install all binaries uninstall: ## Uninstall all binaries rm -f /usr/bin/bibop -git-config: ## Configure git redirects for stable import path services - git config --global http.https://pkg.re.followRedirects true - -deps: git-config ## Download dependencies - go get -d -v github.com/google/goterm/term - go get -d -v pkg.re/buger/jsonparser.v1 - go get -d -v pkg.re/essentialkaos/ek.v12 +deps: mod-update ## Download dependencies -deps-test: git-config ## Download dependencies for tests - go get -d -v pkg.re/essentialkaos/check.v1 +deps-test: deps ## Download dependencies for tests test: ## Run tests go test -covermode=count ./parser ./recipe @@ -41,6 +36,16 @@ gen-fuzz: ## Generate archives for fuzz testing which go-fuzz-build &>/dev/null || go get -u -v github.com/dvyukov/go-fuzz/go-fuzz-build go-fuzz-build -o parser-fuzz.zip github.com/essentialkaos/bibop/parser +mod-init: ## Initialize new module + go mod init + go mod tidy + +mod-update: ## Download modules to local cache + go mod download + +mod-vendor: ## Make vendored copy of dependencies + go mod vendor + fmt: ## Format source code with gofmt find . -name "*.go" -exec gofmt -s -w {} \; @@ -55,6 +60,6 @@ help: ## Show this info @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 1.3.2\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n' ################################################################################ diff --git a/README.md b/README.md index f13eaca2..81812183 100644 --- a/README.md +++ b/README.md @@ -24,16 +24,10 @@ Information about bibop recipe syntax you can find in our [cookbook](COOKBOOK.md #### From source -To build the `bibop` from scratch, make sure you have a working Go 1.16+ workspace ([instructions](https://golang.org/doc/install)), then: +To build the `bibop` from scratch, make sure you have a working Go 1.17+ workspace ([instructions](https://golang.org/doc/install)), then: ``` -go get github.com/essentialkaos/bibop -``` - -If you want to update `bibop` to latest stable release, do: - -``` -go get -u github.com/essentialkaos/bibop +go install github.com/essentialkaos/bibop ``` #### Prebuilt binaries diff --git a/action/auxi.go b/action/auxi.go index 99eef072..5c8247d6 100644 --- a/action/auxi.go +++ b/action/auxi.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/action/backup.go b/action/backup.go index 3309a810..42918de3 100644 --- a/action/backup.go +++ b/action/backup.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -12,7 +12,7 @@ import ( "hash/crc32" "os" - "pkg.re/essentialkaos/ek.v12/fsutil" + "github.com/essentialkaos/ek/v12/fsutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/common.go b/action/common.go index d163fb4b..77ff6f34 100644 --- a/action/common.go +++ b/action/common.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -13,8 +13,8 @@ import ( "syscall" "time" - "pkg.re/essentialkaos/ek.v12/mathutil" - "pkg.re/essentialkaos/ek.v12/timeutil" + "github.com/essentialkaos/ek/v12/mathutil" + "github.com/essentialkaos/ek/v12/timeutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/fs.go b/action/fs.go index e0ed9ee4..b79e83d8 100644 --- a/action/fs.go +++ b/action/fs.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -15,10 +15,10 @@ import ( "path/filepath" "strconv" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/hash" - "pkg.re/essentialkaos/ek.v12/strutil" - "pkg.re/essentialkaos/ek.v12/system" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/hash" + "github.com/essentialkaos/ek/v12/strutil" + "github.com/essentialkaos/ek/v12/system" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/http.go b/action/http.go index 7b9403a6..edad59a5 100644 --- a/action/http.go +++ b/action/http.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -11,9 +11,9 @@ import ( "fmt" "strings" - "pkg.re/essentialkaos/ek.v12/req" + "github.com/essentialkaos/ek/v12/req" - "pkg.re/buger/jsonparser.v1" + "github.com/buger/jsonparser" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/io.go b/action/io.go index ce11bbf1..6b5a7670 100644 --- a/action/io.go +++ b/action/io.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -15,8 +15,8 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v12/mathutil" - "pkg.re/essentialkaos/ek.v12/timeutil" + "github.com/essentialkaos/ek/v12/mathutil" + "github.com/essentialkaos/ek/v12/timeutil" "github.com/essentialkaos/bibop/output" "github.com/essentialkaos/bibop/recipe" diff --git a/action/libs.go b/action/libs.go index 8b50da47..9e71d734 100644 --- a/action/libs.go +++ b/action/libs.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -13,9 +13,9 @@ import ( "path/filepath" "strings" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/sliceutil" - "pkg.re/essentialkaos/ek.v12/strutil" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/sliceutil" + "github.com/essentialkaos/ek/v12/strutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/python.go b/action/python.go index 404592c5..98aab445 100644 --- a/action/python.go +++ b/action/python.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/action/service.go b/action/service.go index 8a653374..4f473b21 100644 --- a/action/service.go +++ b/action/service.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -10,7 +10,7 @@ package action import ( "fmt" - "pkg.re/essentialkaos/ek.v12/initsystem" + "github.com/essentialkaos/ek/v12/initsystem" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/system.go b/action/system.go index d974aac6..eba0dd45 100644 --- a/action/system.go +++ b/action/system.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -17,12 +17,12 @@ import ( "syscall" "time" - "pkg.re/essentialkaos/ek.v12/env" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/mathutil" - "pkg.re/essentialkaos/ek.v12/pid" - "pkg.re/essentialkaos/ek.v12/signal" - "pkg.re/essentialkaos/ek.v12/timeutil" + "github.com/essentialkaos/ek/v12/env" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/mathutil" + "github.com/essentialkaos/ek/v12/pid" + "github.com/essentialkaos/ek/v12/signal" + "github.com/essentialkaos/ek/v12/timeutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/users.go b/action/users.go index ca8e214a..166b7d72 100644 --- a/action/users.go +++ b/action/users.go @@ -2,7 +2,7 @@ package action // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -10,7 +10,7 @@ package action import ( "fmt" - "pkg.re/essentialkaos/ek.v12/system" + "github.com/essentialkaos/ek/v12/system" "github.com/essentialkaos/bibop/recipe" ) diff --git a/bibop.go b/bibop.go index c4b0a258..e61f0ddf 100644 --- a/bibop.go +++ b/bibop.go @@ -1,10 +1,11 @@ -// +build linux, !darwin, !windows +//go:build linux +// +build linux package main // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/centos7.docker b/centos7.docker index 413c95dd..6415fb8e 100644 --- a/centos7.docker +++ b/centos7.docker @@ -12,11 +12,8 @@ COPY . . # hadolint ignore=DL3031,DL3033 RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \ - yum -y update && \ yum -y -q install make golang git upx && \ - yum clean all && \ - make deps && \ - make all && \ + yum clean all && make deps && make all && \ upx bibop ## FINAL IMAGE ################################################################# @@ -38,7 +35,6 @@ COPY --from=builder /go/src/github.com/essentialkaos/bibop/scripts/bibop-entrypo # hadolint ignore=DL3031,DL3033 RUN yum -y -q install https://yum.kaos.st/kaos-repo-latest.el7.noarch.rpm && \ yum -y -q install epel-release && \ - yum -y update && \ yum clean all && \ rm -rf /var/cache/yum diff --git a/cli/cli.go b/cli/cli.go index 35f783a6..a8649e17 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -2,7 +2,7 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -13,18 +13,18 @@ import ( "path/filepath" "strings" - "pkg.re/essentialkaos/ek.v12/fmtc" - "pkg.re/essentialkaos/ek.v12/fmtutil" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/options" - "pkg.re/essentialkaos/ek.v12/req" - "pkg.re/essentialkaos/ek.v12/strutil" - "pkg.re/essentialkaos/ek.v12/usage" - "pkg.re/essentialkaos/ek.v12/usage/completion/bash" - "pkg.re/essentialkaos/ek.v12/usage/completion/fish" - "pkg.re/essentialkaos/ek.v12/usage/completion/zsh" - "pkg.re/essentialkaos/ek.v12/usage/man" - "pkg.re/essentialkaos/ek.v12/usage/update" + "github.com/essentialkaos/ek/v12/fmtc" + "github.com/essentialkaos/ek/v12/fmtutil" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/options" + "github.com/essentialkaos/ek/v12/req" + "github.com/essentialkaos/ek/v12/strutil" + "github.com/essentialkaos/ek/v12/usage" + "github.com/essentialkaos/ek/v12/usage/completion/bash" + "github.com/essentialkaos/ek/v12/usage/completion/fish" + "github.com/essentialkaos/ek/v12/usage/completion/zsh" + "github.com/essentialkaos/ek/v12/usage/man" + "github.com/essentialkaos/ek/v12/usage/update" "github.com/essentialkaos/bibop/cli/executor" "github.com/essentialkaos/bibop/parser" @@ -37,7 +37,7 @@ import ( // Application info const ( APP = "bibop" - VER = "5.1.1" + VER = "5.1.2" DESC = "Utility for testing command-line tools" ) diff --git a/cli/executor/executor.go b/cli/executor/executor.go index 4f14df37..a2e04822 100644 --- a/cli/executor/executor.go +++ b/cli/executor/executor.go @@ -2,7 +2,7 @@ package executor // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -17,17 +17,17 @@ import ( "syscall" "time" - "pkg.re/essentialkaos/ek.v12/errutil" - "pkg.re/essentialkaos/ek.v12/fmtc" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/log" - "pkg.re/essentialkaos/ek.v12/passwd" - "pkg.re/essentialkaos/ek.v12/req" - "pkg.re/essentialkaos/ek.v12/sliceutil" - "pkg.re/essentialkaos/ek.v12/strutil" - "pkg.re/essentialkaos/ek.v12/system" - "pkg.re/essentialkaos/ek.v12/timeutil" - "pkg.re/essentialkaos/ek.v12/tmp" + "github.com/essentialkaos/ek/v12/errutil" + "github.com/essentialkaos/ek/v12/fmtc" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/log" + "github.com/essentialkaos/ek/v12/passwd" + "github.com/essentialkaos/ek/v12/req" + "github.com/essentialkaos/ek/v12/sliceutil" + "github.com/essentialkaos/ek/v12/strutil" + "github.com/essentialkaos/ek/v12/system" + "github.com/essentialkaos/ek/v12/timeutil" + "github.com/essentialkaos/ek/v12/tmp" "github.com/google/goterm/term" diff --git a/cli/executor/validators.go b/cli/executor/validators.go index f1677785..3e9ec41b 100644 --- a/cli/executor/validators.go +++ b/cli/executor/validators.go @@ -2,7 +2,7 @@ package executor // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -13,10 +13,10 @@ import ( "regexp" "strings" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/sliceutil" - "pkg.re/essentialkaos/ek.v12/strutil" - "pkg.re/essentialkaos/ek.v12/system" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/sliceutil" + "github.com/essentialkaos/ek/v12/strutil" + "github.com/essentialkaos/ek/v12/system" "github.com/essentialkaos/bibop/recipe" ) diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..275feb60 --- /dev/null +++ b/go.mod @@ -0,0 +1,18 @@ +module github.com/essentialkaos/bibop + +go 1.17 + +require ( + github.com/buger/jsonparser v1.1.1 + github.com/essentialkaos/check v1.2.1 + github.com/essentialkaos/ek/v12 v12.42.1 + github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 +) + +require ( + github.com/kr/pretty v0.3.0 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect + golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect + golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..35d5a87d --- /dev/null +++ b/go.sum @@ -0,0 +1,32 @@ +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs= +github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8= +github.com/essentialkaos/ek/v12 v12.42.1 h1:h3PPy0XNXUj1IsEid/p9IzaF0o5hZEGOBFh7XZawAyg= +github.com/essentialkaos/ek/v12 v12.42.1/go.mod h1:Cv/tOZshmFg4pMJnBkg4aW/WyYhzzc41qzZIfk5RSi4= +github.com/essentialkaos/go-linenoise/v3 v3.3.5/go.mod h1:g4X3LhT83XT4h7xwrCLclAdMkJvS9qWBQTGNdS6y4vo= +github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 h1:CVuJwN34x4xM2aT4sIKhmeib40NeBPhRihNjQmpJsA4= +github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +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.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s= +golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/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= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= diff --git a/output/output_store.go b/output/output_store.go index 61551c5d..29da05c6 100644 --- a/output/output_store.go +++ b/output/output_store.go @@ -2,7 +2,7 @@ package output // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/parser/fuzz.go b/parser/fuzz.go index b1a192a0..8baa0af7 100644 --- a/parser/fuzz.go +++ b/parser/fuzz.go @@ -1,10 +1,11 @@ +//go:build gofuzz // +build gofuzz package parser // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/parser/parser.go b/parser/parser.go index 015aa2a3..2be53956 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -2,7 +2,7 @@ package parser // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -16,8 +16,8 @@ import ( "strconv" "strings" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/strutil" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/strutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/parser/parser_test.go b/parser/parser_test.go index 5bb075da..d4d1ee51 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -2,7 +2,7 @@ package parser // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -11,7 +11,7 @@ import ( "errors" "testing" - . "pkg.re/essentialkaos/check.v1" + . "github.com/essentialkaos/check" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/recipe/recipe.go b/recipe/recipe.go index f3354c6f..66f71924 100644 --- a/recipe/recipe.go +++ b/recipe/recipe.go @@ -2,7 +2,7 @@ package recipe // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "pkg.re/essentialkaos/ek.v12/strutil" + "github.com/essentialkaos/ek/v12/strutil" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/recipe/recipe_test.go b/recipe/recipe_test.go index d7654fea..76052c00 100644 --- a/recipe/recipe_test.go +++ b/recipe/recipe_test.go @@ -2,7 +2,7 @@ package recipe // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -12,7 +12,7 @@ import ( "os" "testing" - . "pkg.re/essentialkaos/check.v1" + . "github.com/essentialkaos/check" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/recipe/runtime_variables.go b/recipe/runtime_variables.go index caface8f..771a1a48 100644 --- a/recipe/runtime_variables.go +++ b/recipe/runtime_variables.go @@ -2,7 +2,7 @@ package recipe // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -13,10 +13,10 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v12/fsutil" - "pkg.re/essentialkaos/ek.v12/netutil" - "pkg.re/essentialkaos/ek.v12/strutil" - "pkg.re/essentialkaos/ek.v12/system" + "github.com/essentialkaos/ek/v12/fsutil" + "github.com/essentialkaos/ek/v12/netutil" + "github.com/essentialkaos/ek/v12/strutil" + "github.com/essentialkaos/ek/v12/system" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/recipe/tokens.go b/recipe/tokens.go index 3f6530e5..79e782ca 100644 --- a/recipe/tokens.go +++ b/recipe/tokens.go @@ -2,7 +2,7 @@ package recipe // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/render/render.go b/render/render.go index 872b43bd..16c4b889 100644 --- a/render/render.go +++ b/render/render.go @@ -2,7 +2,7 @@ package render // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/render/renderer_json.go b/render/renderer_json.go index 817f53ef..5e0e37a3 100644 --- a/render/renderer_json.go +++ b/render/renderer_json.go @@ -2,7 +2,7 @@ package render // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/render/renderer_quiet.go b/render/renderer_quiet.go index 50147a93..3aa9c661 100644 --- a/render/renderer_quiet.go +++ b/render/renderer_quiet.go @@ -2,7 +2,7 @@ package render // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/render/renderer_tap13.go b/render/renderer_tap13.go index 722d1636..6626dadd 100644 --- a/render/renderer_tap13.go +++ b/render/renderer_tap13.go @@ -2,7 +2,7 @@ package render // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/render/renderer_terminal.go b/render/renderer_terminal.go index 5feb9ff5..c61ff6d3 100644 --- a/render/renderer_terminal.go +++ b/render/renderer_terminal.go @@ -2,7 +2,7 @@ package render // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// // @@ -14,10 +14,10 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v12/fmtc" - "pkg.re/essentialkaos/ek.v12/fmtutil" - "pkg.re/essentialkaos/ek.v12/strutil" - "pkg.re/essentialkaos/ek.v12/terminal/window" + "github.com/essentialkaos/ek/v12/fmtc" + "github.com/essentialkaos/ek/v12/fmtutil" + "github.com/essentialkaos/ek/v12/strutil" + "github.com/essentialkaos/ek/v12/terminal/window" "github.com/essentialkaos/bibop/recipe" ) diff --git a/render/renderer_xml.go b/render/renderer_xml.go index 8d2734ad..e25adf1a 100644 --- a/render/renderer_xml.go +++ b/render/renderer_xml.go @@ -2,7 +2,7 @@ package render // ////////////////////////////////////////////////////////////////////////////////// // // // -// Copyright (c) 2021 ESSENTIAL KAOS // +// Copyright (c) 2022 ESSENTIAL KAOS // // Apache License, Version 2.0 // // // // ////////////////////////////////////////////////////////////////////////////////// //