diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e83e2f26ba026639dcbb7fe187325e1cb393211c..aa3063630a41f2e1482c4e8f706225e9b65036b7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -16,7 +16,7 @@ "dockerDashComposeVersion": "v2" }, "ghcr.io/devcontainers/features/go:1": { - "version": "1.21" + "version": "1.22" } }, // Add any required extensions that must be pre-installed in the devcontainer diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9137a0dbf359446ed0251c74f509128869168639..a3efdf1c92d3c7328aedcdcb8be9a66b4c7ded8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${DOCKER_TAG}" GOSDN_INTEGRATION_TEST_IMAGE: "${CI_REGISTRY_IMAGE}/integration-tests:${DOCKER_TAG}" CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F" - GOLANG_VERSION: "1.21" + GOLANG_VERSION: "1.22" GNMI_TARGET_IMAGE: registry.code.fbi.h-da.de/danet/gnmi-target/debian:master GNMI_TARGET_INTEGRATION_IMAGE: "$CI_REGISTRY_IMAGE/gnmi-target-integration-test:${CI_COMMIT_SHA}" diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml index ecfcef2cdbcbadd88f47284617149a3477999152..7eeda954509f82e06071d03f9d56e8ab7cc5f2b8 100644 --- a/.gitlab/ci/.code-quality-ci.yml +++ b/.gitlab/ci/.code-quality-ci.yml @@ -1,7 +1,5 @@ -variables: - GOLANG_VERSION: "1.21" code-quality: - image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.55.2-alpine + image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.56.0-alpine stage: analyze script: # writes golangci-lint output to gl-code-quality-report.json diff --git a/.golangci.yml b/.golangci.yml index 05a93c5fd6dac9a09312a7d783db806137d8aa0a..981b9610312adf52842ccc4e1c8263a0f5d3aa8b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ variables: - GOLANG_VERSION: "1.21" + GOLANG_VERSION: "1.22" run: go: $GOLANG_VERSION concurrency: 8 diff --git a/Makefile b/Makefile index a273315fa0f26e32db65cfd44e3b7acdbee3a7e9..fa33811628f77fee9267b753f471768c49e22793 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ PLUGIN_NAME= bundled_plugin.zip # Tool Versions GOTESTSUM_VERSION=v1.8.1 -GOLANGCI_LINT_VERSION=v1.55.0 +GOLANGCI_LINT_VERSION=v1.56.0 MOCKERY_VERSION=v2.20.0 YGOT_GENERATOR_VERSION=v0.27.0 YGOT_GENERATOR_GENERATOR_VERSION=v0.0.4 diff --git a/applications/arista-routing-engine/arista-routing-engine.Dockerfile b/applications/arista-routing-engine/arista-routing-engine.Dockerfile index 6df44a04b62256e1b589b559c40f70985e350c4c..7b62ff822127a4cc1a434111481b12966658b119 100644 --- a/applications/arista-routing-engine/arista-routing-engine.Dockerfile +++ b/applications/arista-routing-engine/arista-routing-engine.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile index 706555b00f69a8c7d9e53c435ad0d516bc03570e..30a844ed29db5ca590cfbdceb6fad6da5a1047c2 100644 --- a/applications/venv-manager/venv-manager.Dockerfile +++ b/applications/venv-manager/venv-manager.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/applications/ws-events/ws-events.Dockerfile b/applications/ws-events/ws-events.Dockerfile index 04223f4a48dde7aca88a3a792871b90461e19145..07b6dc89a16c5372ecee9f1a06fa704a83d6a925 100644 --- a/applications/ws-events/ws-events.Dockerfile +++ b/applications/ws-events/ws-events.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/cli/build/ci/.test.yml b/cli/build/ci/.test.yml index 7936deafe0ea4d6c7f1045eb7d6f375acda1d6fa..7889ce83f347e387daef26afd1b9b694974f2eea 100644 --- a/cli/build/ci/.test.yml +++ b/cli/build/ci/.test.yml @@ -1,5 +1,3 @@ -variables: - GOLANG_VERSION: "1.21" test: image: golang:$GOLANG_VERSION stage: test diff --git a/cli/cli.Dockerfile b/cli/cli.Dockerfile index 593b70655eacf06220e05c8b5d228ddb853c661f..e30f679c22d281098c666f2e15f3e84cf1ee7117 100644 --- a/cli/cli.Dockerfile +++ b/cli/cli.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/controller/Dockerfile.debug b/controller/Dockerfile.debug index 019506180a1611506d899de87f39182476f07340..605fb09250878a60e106e27b55566b73946cccac 100644 --- a/controller/Dockerfile.debug +++ b/controller/Dockerfile.debug @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.2 -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 FROM golang:$GOLANG_VERSION-alpine AS builder ARG GITLAB_USER ARG GITLAB_TOKEN diff --git a/controller/Makefile b/controller/Makefile index 14fb43fefe7364094d0a3051d1f6f4af4b12093f..2dc2aa5a23d707a1ed3a081d219e7f39abaebb89 100644 --- a/controller/Makefile +++ b/controller/Makefile @@ -47,7 +47,7 @@ show-unit-test-coverage: unit-test go tool cover -html=coverage.out ci-unit-test: ci-install-tools - ENVIRONMENT=testing gotestsum --junitfile report.xml --format testname -- -short -race $$( go list ./... | grep -v /forks/ | grep -v /mocks ) -v -trimpath -coverprofile=coverage.out -covermode atomic -timeout 30m + ENVIRONMENT=testing gotestsum --junitfile report.xml --format testname -- -short $$( go list ./... | grep -v /forks/ | grep -v /mocks ) -v -trimpath -coverprofile=coverage.out -covermode atomic -timeout 30m generate-mocks: install-tools ./$(TOOLS_DIR)/mockery --all --dir "./interfaces/" diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile index 873e576ed1b969200c8dc140b8582c1c303c6aac..43368bc07eb880c0e8e27a80b7c74375fe103adf 100644 --- a/controller/controller.Dockerfile +++ b/controller/controller.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/csbi/build/ci/.code-quality-ci.yml b/csbi/build/ci/.code-quality-ci.yml index df1514f7955f51f7445380f4c08557f0b8f4f55a..955d2a723a0f18e31eb13fba49177348e26de183 100644 --- a/csbi/build/ci/.code-quality-ci.yml +++ b/csbi/build/ci/.code-quality-ci.yml @@ -1,5 +1,5 @@ code-quality: - image: golangci/golangci-lint:v1.51.2-alpine + image: golangci/golangci-lint:v1.56.0-alpine stage: test rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" diff --git a/csbi/gnmi-target/gnmitarget.Dockerfile b/csbi/gnmi-target/gnmitarget.Dockerfile index b8e190f8db27d74f89cef311b1ca43190c3fa74e..63225a0bffc9758060425ace9752ad1cb3e208dc 100644 --- a/csbi/gnmi-target/gnmitarget.Dockerfile +++ b/csbi/gnmi-target/gnmitarget.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 FROM golang:$GOLANG_VERSION-alpine RUN go install github.com/google/gnxi/gnmi_target@latest RUN wget https://raw.githubusercontent.com/google/gnxi/master/gnmi_target/openconfig-openflow.json diff --git a/csbi/resources/Dockerfile b/csbi/resources/Dockerfile index e18279aafd31dd06e0162334b0490b9710ce1717..169db470c4e15f20d5bb14eae397459544efc640 100644 --- a/csbi/resources/Dockerfile +++ b/csbi/resources/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.2 -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 FROM golang:$GOLANG_VERSION-alpine AS installer ARG GITLAB_USER ARG GITLAB_TOKEN diff --git a/go.mod b/go.mod index c96ebcffb63c455c32b075f3b36f486d44988c1c..d866c16ab2609dd551f69d517e86dc26b55de050 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module code.fbi.h-da.de/danet/gosdn -go 1.21 +go 1.22 require ( github.com/aristanetworks/goarista v0.0.0-20240205212632-469910f40f00 diff --git a/go.sum b/go.sum index 91fddf8f548e80911d9560da4b42ccf0c277964c..eeb8936c485cc8c76d1984719d9bd6cd556fbd51 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,6 @@ atomicgo.dev/schedule v0.1.0 h1:nTthAbhZS5YZmgYbb2+DH8uQIZcTlIrd4eYr3UQxEjs= atomicgo.dev/schedule v0.1.0/go.mod h1:xeUa3oAkiuHYh8bKiQBRojqAMq3PXXbJujjb0hw8pEU= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20231115204500-e097f827e652.2 h1:iEPA5SBtdLJNwQis/SrcCuDWJh5E1V0mVO4Ih7/mRbg= -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20231115204500-e097f827e652.2/go.mod h1:xafc+XIsTxTy76GJQ1TKgvJWsSugFBqMaN27WhUblew= buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1 h1:u0olL4yf2p7Tl5jfsAK5keaFi+JFJuv1CDHrbiXkxkk= buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1/go.mod h1:tiTMKD8j6Pd/D2WzREoweufjzaJKHZg35f/VGcZ2v3I= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -124,14 +122,6 @@ github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= -github.com/aristanetworks/goarista v0.0.0-20231211200415-1eb38cb3bbb8 h1:LczpuTZ/uyp7joAoUmMySLttDE05X2Z7yDjtmpstwQw= -github.com/aristanetworks/goarista v0.0.0-20231211200415-1eb38cb3bbb8/go.mod h1:qtkQYued5bAVh2DF272b5dNRgECbA0r5GCz6W0qhIKg= -github.com/aristanetworks/goarista v0.0.0-20240116150346-3eda167ffc70 h1:WQZZ8RUHDOC7yGTINoyjO23D17WAP+5CbsIpnTQSb6Y= -github.com/aristanetworks/goarista v0.0.0-20240116150346-3eda167ffc70/go.mod h1:qtkQYued5bAVh2DF272b5dNRgECbA0r5GCz6W0qhIKg= -github.com/aristanetworks/goarista v0.0.0-20240119211700-6ce17ed9b1a2 h1:D3hS4aVrnwM2Y4it+/UrZ50dLTu4SnrW4AfEMhbbhWk= -github.com/aristanetworks/goarista v0.0.0-20240119211700-6ce17ed9b1a2/go.mod h1:qtkQYued5bAVh2DF272b5dNRgECbA0r5GCz6W0qhIKg= -github.com/aristanetworks/goarista v0.0.0-20240123222021-c1a9e408a1c4 h1:zKSj8fnDRMjl38iYy/5DPYDCSz0a/2NN/eWs4xol3AI= -github.com/aristanetworks/goarista v0.0.0-20240123222021-c1a9e408a1c4/go.mod h1:qtkQYued5bAVh2DF272b5dNRgECbA0r5GCz6W0qhIKg= github.com/aristanetworks/goarista v0.0.0-20240205212632-469910f40f00 h1:wZFDEOhlWV0822Nmu5zAZ7R4cB0BYIbsOCfIVTdyn7M= github.com/aristanetworks/goarista v0.0.0-20240205212632-469910f40f00/go.mod h1:qtkQYued5bAVh2DF272b5dNRgECbA0r5GCz6W0qhIKg= github.com/aristanetworks/gomap v0.0.0-20230726210543-f4e41046dced h1:HxlRMDx/VeRqzj3nvqX9k4tjeBcEIkoNHDJPsS389hs= @@ -157,8 +147,6 @@ github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/bufbuild/protovalidate-go v0.4.3 h1:1Xsm3qhkwioxLDEtxWgtn0Ch71xBP/sBauT/FZnn76A= -github.com/bufbuild/protovalidate-go v0.4.3/go.mod h1:RcgJ+onKVv4OkAVtzkRUxkocb8stcUAMK0EoqR4fuZE= github.com/bufbuild/protovalidate-go v0.5.0 h1:xFery2RlLh07FQTvB7hlasKqPrDK2ug+uw6DUiuadjo= github.com/bufbuild/protovalidate-go v0.5.0/go.mod h1:3XAwFeJ2x9sXyPLgkxufH9sts1tQRk8fdt1AW93NiUU= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= @@ -345,8 +333,6 @@ github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= -github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v24.0.8+incompatible h1:lbGlhLzolo0tpp+paD0JzOYId072MQmQxZLPevQCFPU= github.com/docker/docker v24.0.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= @@ -375,8 +361,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= -github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -532,8 +518,6 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -792,8 +776,6 @@ github.com/openconfig/goyang v1.4.5 h1:+s3p3MeiPQ/QNsC5DL3MXhCp5cv4dag3vlGKCtszs github.com/openconfig/goyang v1.4.5/go.mod h1:sdNZi/wdTZyLNBNfgLzmmbi7kISm7FskMDKKzMY+x1M= github.com/openconfig/grpctunnel v0.0.0-20220819142823-6f5422b8ca70/go.mod h1:OmTWe7RyZj2CIzIgy4ovEBzCLBJzRvWSZmn7u02U9gU= github.com/openconfig/ygot v0.6.0/go.mod h1:o30svNf7O0xK+R35tlx95odkDmZWS9JyWWQSmIhqwAs= -github.com/openconfig/ygot v0.29.17 h1:o1r7jSsWdpuIk/mqrt0xZ/MfE8CRUsgIPUwWudnZqaY= -github.com/openconfig/ygot v0.29.17/go.mod h1:LeoQY1Ll4N20ccB33VjukrWJ6633V7jtg223GBfjHno= github.com/openconfig/ygot v0.29.18 h1:vgG2r7RVwaVDXgHtpsCNW+qdSGSdxqRxUfRN2rPCy7M= github.com/openconfig/ygot v0.29.18/go.mod h1:sp6roPPmVDcTCF2E3qTjILA+jzJMkZ9d6spC9KLMqpc= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -896,10 +878,6 @@ github.com/pterm/pterm v0.12.31/go.mod h1:32ZAWZVXD7ZfG0s8qqHXePte42kdz8ECtRyEej github.com/pterm/pterm v0.12.33/go.mod h1:x+h2uL+n7CP/rel9+bImHD5lF3nM9vJj80k9ybiiTTE= github.com/pterm/pterm v0.12.36/go.mod h1:NjiL09hFhT/vWjQHSj1athJpx6H8cjpHXNAK5bUw8T8= github.com/pterm/pterm v0.12.40/go.mod h1:ffwPLwlbXxP+rxT0GsgDTzS3y3rmpAO1NMjUkGTYf8s= -github.com/pterm/pterm v0.12.74 h1:fPsds9KisCyJh4NyY6bv8QJt3FLHceb5DxI6W0An9cc= -github.com/pterm/pterm v0.12.74/go.mod h1:+M33aZWQVpmLmLbvjykyGZ4gAfeebznRo8JMbabaxQU= -github.com/pterm/pterm v0.12.75 h1:sRoDOqowp0lOr2SBREsxLRzLOUmwBWfyOflsGnVIIbo= -github.com/pterm/pterm v0.12.75/go.mod h1:1v/gzOF1N0FsjbgTHZ1wVycRkKiatFvJSJC4IGaQAAo= github.com/pterm/pterm v0.12.76 h1:x1gbA2c7mJEd0PjJP3EYN04PR1DVrE3Z8sRDMP+qH6g= github.com/pterm/pterm v0.12.76/go.mod h1:1v/gzOF1N0FsjbgTHZ1wVycRkKiatFvJSJC4IGaQAAo= github.com/pterm/pterm v0.12.78 h1:QTWKaIAa4B32GKwqVXtu9m1DUMgWw3VRljMkMevX+b8= @@ -1565,10 +1543,10 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH google.golang.org/genproto v0.0.0-20210811021853-ddbe55d93216/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg= -google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg= google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k= +google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1:0poefMBYvYbs7g5UkjS6HcxBPaTRAmznle9jnxYoAI8= +google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe h1:USL2DhxfgRchafRvt/wYyyQNzwgL7ZiURcozOE/Pkvo= google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 h1:OPXtXn7fNMaXwO3JvOmF1QyTc00jsSFFz1vXXBOdCDo= @@ -1618,8 +1596,6 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= @@ -1637,7 +1613,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= diff --git a/lab-vm/vm-with-packer/scripts/setup.sh b/lab-vm/vm-with-packer/scripts/setup.sh index 38cea0299ec91d47fa89bd7a69ae9617c1126e95..b9c990d1f03d5a4d2281d7bdaa3b4e6de40fef4b 100644 --- a/lab-vm/vm-with-packer/scripts/setup.sh +++ b/lab-vm/vm-with-packer/scripts/setup.sh @@ -5,9 +5,9 @@ sudo apt update sudo apt upgrade -y # Install go -wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz -rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.21.5.linux-amd64.tar.gz -rm go1.21.5.linux-amd64.tar.gz +wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz +rm go1.22.0.linux-amd64.tar.gz echo "export PATH=$PATH:/usr/local/go/bin" >>/home/gosdn/.profile echo "export GOPATH=$HOME/go " >>/home/gosdn/.profile source /home/gosdn/.profile diff --git a/lab-vm/vm-with-vagrant/Vagrantfile b/lab-vm/vm-with-vagrant/Vagrantfile index e3e3883f1ec78fa6b2775814f4bf8703f20263b0..4a32d445e0d512caf2b77d470a0d4e353668953f 100644 --- a/lab-vm/vm-with-vagrant/Vagrantfile +++ b/lab-vm/vm-with-vagrant/Vagrantfile @@ -37,9 +37,9 @@ Vagrant.configure(2) do |config| zip apt-get autoremove -y ####### installing go ####### - wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz - rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.21.5.linux-amd64.tar.gz - rm go1.21.5.linux-amd64.tar.gz + wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz + rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz + rm go1.22.0.linux-amd64.tar.gz echo 'export PATH=$PATH:/usr/local/go/bin' >> /home/vagrant/.profile echo 'export GOPATH=$HOME/go' >> /home/vagrant/.profile source /home/vagrant/.profile diff --git a/plugin-registry/plugin-registry.Dockerfile b/plugin-registry/plugin-registry.Dockerfile index 9b568ff16609bbacacb9c2b53c700d2ec169c36b..a0a70dedc7110bfdbd21ddc75356e92a0735980f 100644 --- a/plugin-registry/plugin-registry.Dockerfile +++ b/plugin-registry/plugin-registry.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/plugin-registry/plugin-registry.debug.Dockerfile b/plugin-registry/plugin-registry.debug.Dockerfile index 827ec93033117838e9538899dcd9ab6d746c062d..9248a716cf930b1d3c351c9aaabd536762f69f6c 100644 --- a/plugin-registry/plugin-registry.debug.Dockerfile +++ b/plugin-registry/plugin-registry.debug.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.21 +ARG GOLANG_VERSION=1.22 ARG BUILDARGS ARG $GITLAB_PROXY