Merge branch 'main' into pprof

Author: alecholmez

.golangci.yml

@@ -0,0 +1,37 @@
+run:
+  timeout: 10m
+
+linters:
+  enable:
+  - bodyclose
+  - gofmt
+  - goimports
+  - golint
+  - gosec
+  - misspell
+  - revive
+  - unconvert
+  - unparam
+
+linters-settings:
+  misspell:
+    locale: US
+  gofmt:
+    simplify: true
+  unparam:
+    check-exported: false
+  goimports:
+    local-prefixes: github.com/envoyproxy/go-control-plane
+
+issues:
+  exclude:
+  exclude-rules:
+  - text: "SA1019: package github.com/golang/protobuf/jsonpb is deprecated"
+    linters:
+    - staticcheck
+  - text: "SA1019: package github.com/golang/protobuf/proto is deprecated"
+    linters:
+    - staticcheck
+  - text: "SA1019: proto.MessageName is deprecated"
+    linters:
+    - staticcheck

Makefile

@@ -39,6 +39,15 @@ format:
 examples:
 	@pushd examples/dyplomat && go build ./... && popd
 
+.PHONY: lint
+lint:
+	docker run \
+		--rm \
+		--volume $$(pwd):/src \
+		--workdir /src \
+		golangci/golangci-lint:v1.41.1 \
+	golangci-lint run
+
 #-----------------
 #-- integration
 #-----------------

envoy/COMMIT

@@ -1 +1 @@
-012c57bfb95f1486cfcb5be091c25258f8f8da31
+be63e3435fce4636027d34fe312d8b89558c740d