Update dependencies.

Updates all dependencies using `go get -u ./...`.

Signed-off-by: Thomas Hallgren <[email protected]>

.github/workflows/licenses.yaml

@@ -2,9 +2,6 @@ name: "License verification"
 on:
   pull_request:
 
-env:
-  GO_VERSION: 1.19.5
-
 jobs:
   dependency_info_linux:
     name: "Verify use of forbidden licenses"
@@ -19,7 +16,7 @@ jobs:
           ref: "${{ github.event.pull_request.head.sha }}"
       - uses: actions/setup-go@v3
         with:
-          go-version: "${{env.GO_VERSION}}"
+          go-version: stable
       - name: "Generate dependency information"
         shell: bash
         run: make generate

.github/workflows/test_lint.yaml

@@ -5,9 +5,6 @@ on:
     branches:
       - "**"
 
-env:
-  GO_VERSION: 1.19.5
-
 jobs:
 
   lint:
@@ -20,7 +17,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: "${{env.GO_VERSION}}"
+          go-version: stable
 
       - name: Lint
         run: |
@@ -39,7 +36,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: "${{env.GO_VERSION}}"
+          go-version: stable
 
       - name: go unit tests
         run: |

.golangci.yml

@@ -30,14 +30,21 @@ linters-settings:
     max-complexity: 32
     skip-tests: true
   depguard:
-    list-type: blacklist
-    include-go-root: true
-    packages-with-error-message:
-      - io/ioutil:                         "`io/ioutil` is deprecated in Go 1.16, use `io` or `os` instead"
-      - syscall:                           "Use `golang.org/x/sys/...` instead of `syscall`"
-      - github.com/golang/protobuf:        "Use `google.golang.org/protobuf` instead of `github.com/golang/protobuf`"
-      - github.com/datawire/dlib/dutil:    "Use either `github.com/datawire/dlib/derror` or `github.com/datawire/dlib/dhttp` instead of `github.com/datawire/dlib/dutil`"
-      - golang.org/x/net/http2/h2c:        "Use `github.com/datawire/dlib/dhttp` instead of `golang.org/x/net/http2/h2c`"
+    rules:
+      main:
+        files:
+          - $all
+        deny:
+          - pkg: io/ioutil
+            desc: "`io/ioutil` is deprecated in Go 1.16, use `io` or `os` instead"
+          - pkg: syscall
+            desc: "Use `golang.org/x/sys/...` instead of `syscall`"
+          - pkg: github.com/golang/protobuf
+            desc: "Use `google.golang.org/protobuf` instead of `github.com/golang/protobuf`"
+          - pkg: github.com/datawire/dlib/dutil
+            desc: "Use either `github.com/datawire/dlib/derror` or `github.com/datawire/dlib/dhttp` instead of `github.com/datawire/dlib/dutil`"
+          - pkg: golang.org/x/net/http2/h2c
+            desc: "Use `github.com/datawire/dlib/dhttp` instead of `golang.org/x/net/http2/h2c`"
   gomodguard:
     blocked:
       modules:

Makefile

@@ -77,12 +77,12 @@ generate:
 	export GOFLAGS=-mod=mod && go mod tidy && go mod vendor
 
 	mkdir -p $(BUILDDIR)
-	$(tools/go-mkopensource) --gotar=$(filter %.src.tar.gz,$^) --output-format=txt --package=mod --application-type=external  \
+	$(tools/go-mkopensource) --ignore-dirty --gotar=$(filter %.src.tar.gz,$^) --output-format=txt --package=mod --application-type=external  \
 		--unparsable-packages build-aux/unparsable-packages.yaml >$(BUILDDIR)/DEPENDENCIES.txt
-	sed 's/\(^.*the Go language standard library ."std".[ ]*v[1-9]\.[1-9]*\)\..../\1    /' $(BUILDDIR)/DEPENDENCIES.txt >DEPENDENCIES.md
+	sed 's/\(^.*the Go language standard library ."std".[ ]*v[1-9]\.[0-9]*\)\..../\1    /' $(BUILDDIR)/DEPENDENCIES.txt >DEPENDENCIES.md
 
 	printf "ambassador-agent incorporates Free and Open Source software under the following licenses:\n\n" > DEPENDENCY_LICENSES.md
-	$(tools/go-mkopensource) --gotar=$(filter %.src.tar.gz,$^) --output-format=txt --package=mod \
+	$(tools/go-mkopensource) --ignore-dirty --gotar=$(filter %.src.tar.gz,$^) --output-format=txt --package=mod \
 		--output-type=json --application-type=external --unparsable-packages build-aux/unparsable-packages.yaml > $(BUILDDIR)/DEPENDENCIES.json
 	jq -r '.licenseInfo | to_entries | .[] | "* [" + .key + "](" + .value + ")"' $(BUILDDIR)/DEPENDENCIES.json > $(BUILDDIR)/LICENSES.txt
 	sed -e 's/\[\([^]]*\)]()/\1/' $(BUILDDIR)/LICENSES.txt >> DEPENDENCY_LICENSES.md

build-aux/unparsable-packages.yaml

@@ -0,0 +1,59 @@
+sigs.k8s.io/yaml:
+  - Apache-2.0
+sigs.k8s.io/yaml/goyaml.v2:
+  - Apache-2.0
+  - MIT
+sigs.k8s.io/json:
+  - Apache-2.0
+sigs.k8s.io/json/internal/golang/encoding/json:
+  - BSD-3-Clause
+github.com/google/cel-go/cel:
+  - Apache-2.0
+github.com/google/cel-go/checker:
+  - Apache-2.0
+github.com/google/cel-go/checker/decls:
+  - Apache-2.0
+github.com/google/cel-go/common:
+  - Apache-2.0
+github.com/google/cel-go/common/ast:
+  - Apache-2.0
+github.com/google/cel-go/common/containers:
+  - Apache-2.0
+github.com/google/cel-go/common/debug:
+  - Apache-2.0
+github.com/google/cel-go/common/decls:
+  - Apache-2.0
+github.com/google/cel-go/common/functions:
+  - Apache-2.0
+github.com/google/cel-go/common/operators:
+  - Apache-2.0
+github.com/google/cel-go/common/overloads:
+  - Apache-2.0
+github.com/google/cel-go/common/runes:
+  - Apache-2.0
+github.com/google/cel-go/common/stdlib:
+  - Apache-2.0
+github.com/google/cel-go/common/types:
+  - Apache-2.0
+github.com/google/cel-go/common/types/pb:
+  - Apache-2.0
+github.com/google/cel-go/common/types/ref:
+  - Apache-2.0
+github.com/google/cel-go/common/types/traits:
+  - Apache-2.0
+github.com/google/cel-go/interpreter:
+  - Apache-2.0
+github.com/google/cel-go/interpreter/functions:
+  - Apache-2.0
+github.com/google/cel-go/parser:
+  - Apache-2.0
+github.com/google/cel-go/parser/gen:
+  - Apache-2.0
+github.com/hashicorp/consul/api:
+  - MPL-2.0
+github.com/hashicorp/consul/api/watch:
+  - MPL-2.0
+github.com/hashicorp/golang-lru/simplelru:
+  - MPL-2.0
+github.com/Masterminds/squirrel:
+  - MIT