diff --git a/.agola/config.yml b/.agola/config.yml deleted file mode 100644 index b60b0e8..0000000 --- a/.agola/config.yml +++ /dev/null @@ -1,76 +0,0 @@ -version: v0 -runs: - - name: Renovate deps - when: - branch: main - tasks: - - name: Run renovate - runtime: - containers: - - image: docker.io/renovate/renovate - environment: - RENOVATE_PLATFORM: gitea - RENOVATE_AUTODISCOVER: 'false' - RENOVATE_ENDPOINT: https://code.icb4dc0.de/api/v1 - LOG_LEVEL: info - RENOVATE_TOKEN: - from_variable: gitea-token - GITHUB_COM_TOKEN: - from_variable: github-token - steps: - - run: - name: Run bot - command: renovate prskr/nurse - - name: Test and lint - tasks: - - name: Checkout code - runtime: - type: pod - containers: - - image: docker.io/alpine/git - steps: - - clone: - - save_to_workspace: - contents: - - source_dir: . - dest_dir: . - paths: - - '**' - - name: Test - runtime: - type: pod - containers: - - image: docker.io/golang:1.19-bullseye - environment: - DOCKER_HOST: tcp://127.0.0.1:2375 - - image: code.icb4dc0.de/prskr/ci-images/dind:latest - privileged: true - steps: - - restore_workspace: - dest_dir: . - - run: - name: Install Go tools - command: go install gotest.tools/gotestsum@latest - - run: - name: run all tests - command: gotestsum -f pkgname-and-test-fails -- -race -shuffle=on ./... - depends: - - Checkout code - - - name: Lint code - runtime: - type: pod - arch: amd64 - containers: - - image: docker.io/golangci/golangci-lint - environment: - GO111MODULE: "on" - CGO_ENABLED: "0" - steps: - - restore_workspace: - dest_dir: . - - run: - name: Run golangci-lint - command: golangci-lint run -v - depends: - - Checkout code diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml deleted file mode 100644 index 50cdb65..0000000 --- a/.github/workflows/go.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Go - -on: - push: - branches: - - main - pull_request: - -permissions: - contents: read - pull-requests: read - -jobs: - build: - name: Build - runs-on: ubuntu-latest - steps: - - - name: Set up Go 1.18 - uses: actions/setup-go@v3 - with: - go-version: '^1.18' - id: go - - - name: Check out code into the Go module directory - uses: actions/checkout@v3 - with: - lfs: true - - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - only-new-issues: true - skip-go-installation: true - - - run: go test ./... - - - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v3 - with: - version: latest - args: release --rm-dist - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/go.mod b/go.mod index 230bc4f..dceec18 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module code.icb4dc0.de/prskr/nurse go 1.19 require ( - code.gitea.io/sdk/gitea v0.15.1 github.com/PaesslerAG/jsonpath v0.1.1 github.com/alecthomas/participle/v2 v2.0.0-beta.5 github.com/go-redis/redis/v8 v8.11.5 @@ -40,7 +39,6 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/hashicorp/go-version v1.2.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect github.com/magiconair/properties v1.8.6 // indirect diff --git a/go.sum b/go.sum index 22db5b1..4f87922 100644 --- a/go.sum +++ b/go.sum @@ -38,9 +38,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= -code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= -code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -411,7 +408,6 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= @@ -547,8 +543,6 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -962,14 +956,10 @@ go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1113,8 +1103,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc= -golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1290,7 +1278,6 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/magefiles/common.go b/magefiles/common.go index 64d32f9..f9a20f3 100644 --- a/magefiles/common.go +++ b/magefiles/common.go @@ -6,8 +6,6 @@ import ( "path/filepath" "strings" - "code.gitea.io/sdk/gitea" - "github.com/magefile/mage/sh" "go.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/exp/slices" @@ -20,8 +18,6 @@ var ( GeneratedMockFiles []string WorkingDir string OutDir string - GitCommit string - GiteaClient *gitea.Client dirsToIgnore = []string{ ".git", "magefiles", @@ -32,12 +28,6 @@ var ( ) func init() { - if currentCommit, err := sh.Output("git", "rev-parse", "HEAD"); err != nil { - panic(err) - } else { - GitCommit = currentCommit - } - if wd, err := os.Getwd(); err != nil { panic(err) } else { @@ -58,13 +48,7 @@ func init() { panic(err) } - if giteaToken := os.Getenv("GITEA_TOKEN"); giteaToken != "" { - if client, err := gitea.NewClient("https://code.icb4dc0.de", gitea.SetToken(giteaToken)); err == nil { - GiteaClient = client - } - } - - zap.L().Info("Completed initialization", zap.String("commit", GitCommit)) + zap.L().Info("Completed initialization") } func initLogging() error { @@ -109,12 +93,3 @@ func initSourceFiles() error { return nil }) } - -func commitStatusOption(context, description string) gitea.CreateStatusOption { - return gitea.CreateStatusOption{ - Context: context, - Description: description, - State: gitea.StatusPending, - TargetURL: "https://concourse.icb4dc0.de/teams/main/pipelines", - } -} diff --git a/magefiles/lint.go b/magefiles/lint.go index 64b8802..59f4588 100644 --- a/magefiles/lint.go +++ b/magefiles/lint.go @@ -3,10 +3,8 @@ package main import ( "context" - "code.gitea.io/sdk/gitea" "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" - "go.uber.org/multierr" ) func Lint(ctx context.Context) { @@ -14,21 +12,6 @@ func Lint(ctx context.Context) { } func LintGo(ctx context.Context) (err error) { - status := commitStatusOption("concourse-ci/lint/golangci-lint", "Lint Go files") - if err := setCommitStatus(ctx, status); err != nil { - return err - } - - defer func() { - if err == nil { - status.State = gitea.StatusSuccess - } else { - status.State = gitea.StatusFailure - } - - err = multierr.Append(err, setCommitStatus(ctx, status)) - }() - return sh.RunV( "golangci-lint", "run", diff --git a/magefiles/reporting.go b/magefiles/reporting.go deleted file mode 100644 index 5c70830..0000000 --- a/magefiles/reporting.go +++ /dev/null @@ -1,38 +0,0 @@ -package main - -import ( - "context" - "fmt" - "net/http" - - "code.gitea.io/sdk/gitea" -) - -type CommitState string - -func (s CommitState) String() string { - return string(s) -} - -func setCommitStatus(ctx context.Context, notification gitea.CreateStatusOption) error { - if GiteaClient == nil { - return nil - } - - GiteaClient.SetContext(ctx) - - _, resp, err := GiteaClient.CreateStatus("inetmock", "inetmock", GitCommit, notification) - if err != nil { - return err - } - - defer func() { - _ = resp.Close - }() - - if resp.StatusCode >= http.StatusMultipleChoices { - return fmt.Errorf("failed to update commit status - %d - %s", resp.StatusCode, resp.Status) - } - - return nil -}