diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 84436a27d860aebfd17c2d1c4b381b4b8af4ea30..631ef5164e34ff6056c674e2feebc8b7c4514841 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -16,7 +16,7 @@ "dockerDashComposeVersion": "v2" }, "ghcr.io/devcontainers/features/go:1": { - "version": "1.22" + "version": "1.23" } }, // Add any required extensions that must be pre-installed in the devcontainer diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd21e130b7fd179d9fe24ef4f5b272af7efd7c0b..446770e257ed78594cf83d97ffc60bf10e86dad4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}" GOSDN_INTEGRATION_TEST_IMAGE: "${CI_REGISTRY_IMAGE}/integration-tests:${CI_COMMIT_SHA}" CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F" - GOLANG_VERSION: "1.22" + GOLANG_VERSION: "1.23" 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}" DOCKER_TLS_CERTDIR: "/certs" diff --git a/.golangci.yml b/.golangci.yml index 4785de7cfe76c6e564c9c110b8b2736d6c2afc84..cdd404e55c3ed172a14d18e70ece0ec4be7ebe53 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,5 +1,5 @@ run: - go: "1.22" + go: "1.23" concurrency: 8 timeout: 20m issues-exit-code: 1 diff --git a/applications/arista-routing-engine/arista-routing-engine.Dockerfile b/applications/arista-routing-engine/arista-routing-engine.Dockerfile index 7b62ff822127a4cc1a434111481b12966658b119..35f45d15fad6547f37ca4902fb195ab861777046 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.22 +ARG GOLANG_VERSION=1.23 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile index 33df4b0a7164e51077d8b45bcc3fb5c7f5b60253..6521d393a0cedb91443d3bd4a306525065625128 100644 --- a/applications/venv-manager/venv-manager.Dockerfile +++ b/applications/venv-manager/venv-manager.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/applications/ws-events/ws-events.Dockerfile b/applications/ws-events/ws-events.Dockerfile index 07b6dc89a16c5372ecee9f1a06fa704a83d6a925..07c32c8e9c9e5a260524c9ac963f2bbb84b14bb5 100644 --- a/applications/ws-events/ws-events.Dockerfile +++ b/applications/ws-events/ws-events.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/cli/cli.Dockerfile b/cli/cli.Dockerfile index e30f679c22d281098c666f2e15f3e84cf1ee7117..81d501a1ef108c494c1fdcb86cbfe25854356b5c 100644 --- a/cli/cli.Dockerfile +++ b/cli/cli.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/cli/cmd/config/.gosdnc.toml b/cli/cmd/config/.gosdnc.toml new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/controller/Dockerfile.debug b/controller/Dockerfile.debug index 1560b16eae5687b2fd21db263cd398826320fe35..d4e5e7e1bb6a7e7de89af5e31a21815d36673e10 100644 --- a/controller/Dockerfile.debug +++ b/controller/Dockerfile.debug @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.2 -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 FROM golang:$GOLANG_VERSION-alpine AS builder ARG GITLAB_USER ARG GITLAB_TOKEN diff --git a/controller/controller.Dockerfile b/controller/controller.Dockerfile index 43368bc07eb880c0e8e27a80b7c74375fe103adf..88d55fcfb9db250ba4aa1e7f8b86c85a8957a492 100644 --- a/controller/controller.Dockerfile +++ b/controller/controller.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/csbi/gnmi-target/gnmitarget.Dockerfile b/csbi/gnmi-target/gnmitarget.Dockerfile index 63225a0bffc9758060425ace9752ad1cb3e208dc..f2dfea971ccd0b056dd5ec6ce92e7a73c9c7765e 100644 --- a/csbi/gnmi-target/gnmitarget.Dockerfile +++ b/csbi/gnmi-target/gnmitarget.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 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 ace1399e46c02c3c21af4d4a1426e2b83998bba0..6aaa1a44bfe6657edccb3708c269a1aa36a0ecb2 100644 --- a/csbi/resources/Dockerfile +++ b/csbi/resources/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.2 -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 FROM golang:$GOLANG_VERSION-alpine AS installer ARG GITLAB_USER ARG GITLAB_TOKEN diff --git a/go.mod b/go.mod index 25ce4305e51ee4d4a1d95d11d2f9e78bde72b112..1ab9ac7cb38d3dd3ece937809579c1ed61768269 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module code.fbi.h-da.de/danet/gosdn -go 1.22 +go 1.23 require ( github.com/aristanetworks/goarista v0.0.0-20240905152313-a118023be78b diff --git a/go.sum b/go.sum index 45f4cbb88dc5499622c2db895b5eeeca297bd393..f45a5492304c3abf011930c6cd3399f3293794d0 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,6 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE 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-20240903103537-5c43403566da h1:TdGxVEF0PL/dyO/o/jpmdE4Wq64dQ3Yu8DPI3oIdNqo= -github.com/aristanetworks/goarista v0.0.0-20240903103537-5c43403566da/go.mod h1:C+YeQrhbMvCPh5wG6iqGiCD/zcITTpt4YQ1v4K0g5Vc= github.com/aristanetworks/goarista v0.0.0-20240905152313-a118023be78b h1:2AWFbPack74VtZ/bbvdZcmhbL53GLWv3tlInmt8fbi0= github.com/aristanetworks/goarista v0.0.0-20240905152313-a118023be78b/go.mod h1:C+YeQrhbMvCPh5wG6iqGiCD/zcITTpt4YQ1v4K0g5Vc= github.com/aristanetworks/gomap v0.0.0-20240724180630-b4cffb90720f h1:3GwV1IeLp0PwWcnbc9ZihE3osvexJf3PMjWSCGjtIqc= @@ -170,8 +168,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lesismal/llib v1.1.13 h1:+w1+t0PykXpj2dXQck0+p6vdC9/mnbEXHgUy/HXDGfE= github.com/lesismal/llib v1.1.13/go.mod h1:70tFXXe7P1FZ02AU9l8LgSOK7d7sRrpnkUr3rd3gKSg= -github.com/lesismal/nbio v1.5.9 h1:g/+/Bhuqn6ZuMT0YpVjLk+18zYzBhSEcIXQs8nqgyZg= -github.com/lesismal/nbio v1.5.9/go.mod h1:QsxE0fKFe1PioyjuHVDn2y8ktYK7xv9MFbpkoRFj8vI= github.com/lesismal/nbio v1.5.10 h1:k9O6a2bG+eBJn4ed94d918AB55QxF0KEj0OHKLCppJQ= github.com/lesismal/nbio v1.5.10/go.mod h1:QsxE0fKFe1PioyjuHVDn2y8ktYK7xv9MFbpkoRFj8vI= github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4= @@ -349,8 +345,6 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210513122933-cd7d49e622d5/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -382,8 +376,6 @@ golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -429,8 +421,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -438,8 +428,6 @@ golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -450,8 +438,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= @@ -491,8 +477,6 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= -google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= diff --git a/plugin-registry/plugin-registry.Dockerfile b/plugin-registry/plugin-registry.Dockerfile index a0a70dedc7110bfdbd21ddc75356e92a0735980f..05d3aad83fd593051616bfc5345367d961f8adeb 100644 --- a/plugin-registry/plugin-registry.Dockerfile +++ b/plugin-registry/plugin-registry.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 ARG BUILDARGS ARG GITLAB_PROXY diff --git a/plugin-registry/plugin-registry.debug.Dockerfile b/plugin-registry/plugin-registry.debug.Dockerfile index 9248a716cf930b1d3c351c9aaabd536762f69f6c..fcac92bffe037ce9585460248ddfed479d522fbc 100644 --- a/plugin-registry/plugin-registry.debug.Dockerfile +++ b/plugin-registry/plugin-registry.debug.Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.22 +ARG GOLANG_VERSION=1.23 ARG BUILDARGS ARG $GITLAB_PROXY