diff --git a/.gitignore b/.gitignore index bdaaaa30d002eadd4186a5dd067f64101162c5ae..2df65224e347b7d94c61db238220b38118c5a538 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # tooling **/build-tools/ artifacts/ +gl-codeclimate.json # containerlab clab-gosdn*/ diff --git a/.gitlab/ci/.renovate.yml b/.gitlab/ci/.renovate.yml index f31e4693d24b5fc868635eb07b11f029ed1567f9..7d25e4d76adc68aa31b3b3098f0b519e626b68de 100644 --- a/.gitlab/ci/.renovate.yml +++ b/.gitlab/ci/.renovate.yml @@ -1,7 +1,7 @@ renovate: stage: tools - image: renovate/renovate:37.382.3 + image: renovate/renovate:37.387.3 variables: LOG_LEVEL: debug diff --git a/.golangci.yml b/.golangci.yml index 30f446c5c6bb7faa65696b12964edc27ebfa6160..67e271bd5a40205ccd6bad8db07cfcc7b441bd4c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,21 +5,7 @@ run: concurrency: 8 timeout: 20m issues-exit-code: 1 - # directories to be ignored by linters - skip-dirs: - - api/ - - artifacts/ - - controller/test - - controller/mocks - - models/ - - forks/ - - plugins/examples/ - - clab-gosdn_csbi_arista_base/ - # ignore csbi, since we do not maintain it at the moment - - csbi/ skip-dirs-default: true - skip-files: - - http.go modules-download-mode: readonly # output settings -> code-climate for GitLab @@ -37,6 +23,20 @@ issues: exclude-use-default: false max-issues-per-linter: 0 max-same-issues: 0 + exclude-files: + - http.go + # directories to be ignored by linters + exclude-dirs: + - api/ + - artifacts/ + - controller/test + - controller/mocks + - models/ + - forks/ + - plugins/examples/ + - clab-gosdn_csbi_arista_base/ + # ignore csbi, since we do not maintain it at the moment + - csbi/ linters: # enable the specific needed linters diff --git a/go.mod b/go.mod index 4b44ba7d3f96152957c43ff97ab892b17824438d..5422284552a8b75bba6ea4d8a6f0f9ac17fd7d4b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module code.fbi.h-da.de/danet/gosdn go 1.22 require ( - github.com/aristanetworks/goarista v0.0.0-20240514173732-cca2755bbd44 + github.com/aristanetworks/goarista v0.0.0-20240522193158-389fb921f90a github.com/c-bata/go-prompt v0.2.6 github.com/docker/docker v24.0.9+incompatible github.com/google/go-cmp v0.6.0 @@ -32,7 +32,7 @@ require ( require ( github.com/Microsoft/go-winio v0.5.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/containerd/containerd v1.6.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/distribution v2.7.1+incompatible // indirect @@ -63,8 +63,8 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pkg/term v1.2.0-beta.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_model v0.6.0 // indirect - github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.52.2 // indirect github.com/prometheus/procfs v0.13.0 // indirect github.com/rabbitmq/amqp091-go v1.10.0 github.com/rivo/uniseg v0.4.4 // indirect @@ -90,7 +90,7 @@ require ( github.com/bufbuild/protovalidate-go v0.6.2 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-plugin v1.4.10 - github.com/lesismal/nbio v1.5.8 + github.com/lesismal/nbio v1.5.9 google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 ) @@ -117,6 +117,6 @@ require ( github.com/stoewer/go-strcase v1.3.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect + golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect ) diff --git a/go.sum b/go.sum index 2c3d459b175283e1b1a695998763feee9315faf6..9b8a785ff20d732d844b0913784325720b4e4b1a 100644 --- a/go.sum +++ b/go.sum @@ -134,6 +134,8 @@ github.com/aristanetworks/goarista v0.0.0-20240430094517-e1401db4eb86 h1:FNmX9n7 github.com/aristanetworks/goarista v0.0.0-20240430094517-e1401db4eb86/go.mod h1:fHHqPssWPeAUdlIlhc/wCFmqvNVNl6MkpCaRkImRV74= github.com/aristanetworks/goarista v0.0.0-20240514173732-cca2755bbd44 h1:GhiREzkrXov7bhV/3EWOXjcOWMwEQa0N10Y2JSnKi2Q= github.com/aristanetworks/goarista v0.0.0-20240514173732-cca2755bbd44/go.mod h1:fHHqPssWPeAUdlIlhc/wCFmqvNVNl6MkpCaRkImRV74= +github.com/aristanetworks/goarista v0.0.0-20240522193158-389fb921f90a h1:H5hh7e2wV9Thf2eBwK/aydD4KPiMbb9zRCOh4xrj7wY= +github.com/aristanetworks/goarista v0.0.0-20240522193158-389fb921f90a/go.mod h1:EYZhF2e6OK8Ihd4lxnA47OXkF5v4QpO9YJsNMfCmOxs= github.com/aristanetworks/gomap v0.0.0-20240103001659-f6b0e31fb1a7 h1:dCLOS8aCKzuaC3cqIwRwxSlZE5HiMshdALvpxrxQSaw= github.com/aristanetworks/gomap v0.0.0-20240103001659-f6b0e31fb1a7/go.mod h1:p7lmI+ecoe1RTyD11SPXWsSQ3H+pJ4cp5y7vtKW4QdM= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -178,6 +180,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= @@ -672,6 +676,8 @@ github.com/lesismal/nbio v1.5.7 h1:5nvcD+lDH9dZ/7Y2Zdn5heySiJhIxUhhMXNh5rkhI5w= github.com/lesismal/nbio v1.5.7/go.mod h1:rel3I/9ObYjvNHwRNpOIuXvhsrjhU11E9xcRCjhiwx4= github.com/lesismal/nbio v1.5.8 h1:LGYYnXQi387hzn1PL5cqshX37Yraqg21lwlJW8HqgJs= github.com/lesismal/nbio v1.5.8/go.mod h1:QsxE0fKFe1PioyjuHVDn2y8ktYK7xv9MFbpkoRFj8vI= +github.com/lesismal/nbio v1.5.9 h1:g/+/Bhuqn6ZuMT0YpVjLk+18zYzBhSEcIXQs8nqgyZg= +github.com/lesismal/nbio v1.5.9/go.mod h1:QsxE0fKFe1PioyjuHVDn2y8ktYK7xv9MFbpkoRFj8vI= github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4= github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4= @@ -875,6 +881,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -885,6 +893,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= 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/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck= +github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -1163,6 +1173,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= +golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8= +golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=