Merge pull request #108 from datawire/alicewasko/remove-metrics

Disable collecting/sending envoy metrics
datawire · Aug 16, 2023 · a9cb6c4 · a9cb6c4
2 parents 9eb2fcb + c3366ba
commit a9cb6c4
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 435 deletions.
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
@@ -4,7 +4,7 @@ on:
     types:
       - labeled
 jobs:
-  build_image:
+  build-image:
     runs-on: ubuntu-latest
     if: ${{ github.event.label.name == 'ok to test' }}
     steps:
@@ -32,7 +32,7 @@ jobs:
           path: build-output/ambassador-agent-image.tar
   test:
     runs-on: ubuntu-latest
-    needs: build_image
+    needs: build-image
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -74,7 +74,7 @@ jobs:
             export KUBECONFIG=${{ steps.kluster.outputs.kubeconfig }}
             export AMBASSADOR_AGENT_DOCKER_IMAGE=datawiredev/ambassador-agent:dev-latest
             export KAT_SERVER_DOCKER_IMAGE=docker.io/datawiredev/kat-server:3.0.1-0.20220817135951-2cb28ef4f415
-            make itest
+            make go-integration-test
       - name: Mark test as succesfull
         run: echo "::set-output name=run_result::success" > run_result
       - name: Cleanup kluster

diff --git a/.github/workflows/licenses.yaml b/.github/workflows/licenses.yaml
@@ -1,6 +1,10 @@
 name: "License verification"
 on:
   pull_request:
+
+env:
+  GO_VERSION: 1.19.5
+
 jobs:
   dependency_info_linux:
     name: "Verify use of forbidden licenses"
@@ -15,7 +19,7 @@ jobs:
           ref: "${{ github.event.pull_request.head.sha }}"
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.5
+          go-version: "${{env.GO_VERSION}}"
       - name: "Generate dependency information"
         shell: bash
         run: make generate

diff --git a/.github/workflows/test_lint.yaml b/.github/workflows/test_lint.yaml
@@ -0,0 +1,49 @@
+name: "Test and Lint"
+
+on:
+  pull_request:
+    branches:
+      - "**"
+
+env:
+  GO_VERSION: 1.19.5
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout local
+        uses: actions/checkout@v3
+
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "${{env.GO_VERSION}}"
+
+      - name: Lint
+        run: |
+          make lint
+
+  unittest:
+    needs: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout local
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: "${{ github.event.pull_request.head.sha }}"
+
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "${{env.GO_VERSION}}"
+
+      - name: go unit tests
+        run: |
+          make go-unit-test
+
+      - name: Report Success
+        run: echo "::set-output name=run_result::success" > run_result
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -18,11 +18,10 @@ following Free and Open Source software:
     github.com/blang/semver                           v3.5.1+incompatible                   MIT license
     github.com/cespare/xxhash/v2                      v2.1.2                                MIT license
     github.com/chai2010/gettext-go                    v1.0.2                                3-clause BSD license
-    github.com/cncf/xds/go                            v0.0.0-20220121163655-4a2b9fdd466b    Apache License 2.0
     github.com/containerd/containerd                  v1.6.6                                Apache License 2.0
     github.com/cyphar/filepath-securejoin             v0.2.3                                3-clause BSD license
     github.com/datawire/ambassador-agent/rpc          (modified)                            Apache License 2.0
-    github.com/datawire/dlib                          v1.3.1-0.20221228104658-e373c6d44961  Apache License 2.0
+    github.com/datawire/dlib                          v1.3.1                                Apache License 2.0
     github.com/datawire/envconfig                     v0.0.0-20221012222025-09524dc7d59b    Apache License 2.0
     github.com/datawire/k8sapi                        v0.1.2                                Apache License 2.0
     github.com/davecgh/go-spew                        v1.1.1                                ISC license
@@ -35,7 +34,6 @@ following Free and Open Source software:
     github.com/docker/go-units                        v0.5.0                                Apache License 2.0
     github.com/emicklei/go-restful/v3                 v3.9.0                                MIT license
     github.com/emissary-ingress/emissary/v3           v3.3.1                                Apache License 2.0
-    github.com/envoyproxy/protoc-gen-validate         v0.6.7                                Apache License 2.0
     github.com/evanphx/json-patch                     v5.6.0+incompatible                   3-clause BSD license
     github.com/exponent-io/jsonpath                   v0.0.0-20210407135951-1de76d718b3f    MIT license
     github.com/fatih/camelcase                        v1.0.0                                MIT license
@@ -85,7 +83,7 @@ following Free and Open Source software:
     github.com/mattn/go-colorable                     v0.1.12                               MIT license
     github.com/mattn/go-isatty                        v0.0.14                               MIT license
     github.com/mattn/go-runewidth                     v0.0.9                                MIT license
-    github.com/matttproud/golang_protobuf_extensions  v1.0.2                                Apache License 2.0
+    github.com/matttproud/golang_protobuf_extensions  v1.0.4                                Apache License 2.0
     github.com/mitchellh/copystructure                v1.2.0                                MIT license
     github.com/mitchellh/go-homedir                   v1.1.0                                MIT license
     github.com/mitchellh/go-wordwrap                  v1.0.1                                MIT license

diff --git a/Makefile b/Makefile
@@ -31,10 +31,10 @@ build:
 
 .PHONY: format
 format: $(tools/golangci-lint) ## (QA) Automatically fix linter complaints
-	$(tools/golangci-lint) run --fix --timeout 2m ./... || true
+	$(tools/golangci-lint) run -v --fix --timeout 2m ./... || true
 
 lint: $(tools/golangci-lint) ## (QA) Run the linter
-	$(tools/golangci-lint) run --timeout 8m ./...
+	$(tools/golangci-lint) run -v --timeout 8m ./...
 
 
 .PHONY: protoc
@@ -119,13 +119,16 @@ image-tar: image
 	mkdir -p ./build-output
 	docker save $(IMAGE) > ./build-output/ambassador-agent-image.tar
 
-.PHONY: itest
-itest:
-	go test -p 1 ./integration_tests/...
+.PHONY: go-integration-test
+go-integration-test:
+	go mod download
+	go test -parallel 1 ./integration_tests/... -race
 
-.PHONY: unit-test
-unit-test:
-	go test -count=1 ./cmd/... ./pkg/...
+.PHONY: go-unit-test
+go-unit-test:
+	go mod download
+	go test ./cmd/... -race
+	go test ./pkg/... -race
 
 .PHONY: apply
 apply: push-image

diff --git a/build-aux/kubeception/main.go b/build-aux/kubeception/main.go
@@ -62,7 +62,7 @@ func run() error {
 			kubeconfig, err := kubeceptionRequest(ctx, cli, "PUT", token, clusterName, map[string]string{
 				"wait":           "true",
 				"timeoutSecs":    "7200",
-				"version":        "1.19",
+				"version":        "1.25",
 				"provider":       "preview",
 				"enableSNIRelay": "true",
 			})

diff --git a/cmd/main.go b/cmd/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"errors"
-	"net"
 	"net/http"
 	"os"
 	"os/signal"
@@ -53,18 +52,7 @@ func main() {
 
 	ambAgent.SetReportDiagnosticsAllowed(env.AESReportDiagnostics)
 
-	metricsListener, err := net.Listen("tcp", ":8080")
-	if err != nil {
-		dlog.Error(ctx, err.Error())
-		os.Exit(1)
-	}
-	dlog.Info(ctx, "metrics service listening on :8080")
-
 	grp := dgroup.NewGroup(ctx, dgroup.GroupConfig{})
-	grp.Go("metrics-server", func(ctx context.Context) error {
-		metricsServer := agent.NewMetricsServer(ambAgent.MetricsRelayHandler)
-		return metricsServer.Serve(ctx, metricsListener)
-	})
 
 	// Begin lease-lock. watch when we are leader
 	grp.Go("lease-lock-watch", func(ctx context.Context) error {

diff --git a/go.mod b/go.mod
@@ -77,7 +77,7 @@ require (
 	github.com/argoproj/argo-rollouts v1.3.2
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/datawire/ambassador-agent/rpc v0.0.0-20221012222025-09524dc7d59b
-	github.com/datawire/dlib v1.3.1-0.20221228104658-e373c6d44961
+	github.com/datawire/dlib v1.3.1
 	github.com/datawire/envconfig v0.0.0-20221012222025-09524dc7d59b
 	github.com/datawire/k8sapi v0.1.2
 	github.com/emissary-ingress/emissary/v3 v3.3.1
@@ -112,7 +112,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
-	github.com/cncf/xds/go v0.0.0-20220121163655-4a2b9fdd466b // indirect
 	github.com/containerd/containerd v1.6.6 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -124,7 +123,6 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
@@ -172,7 +170,7 @@ require (
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -146,8 +146,6 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20220121163655-4a2b9fdd466b h1:+CVhWLkTEEGdjn4cRvVCk6epN2T8eVyrpE/s1U1Y/Cg=
-github.com/cncf/xds/go v0.0.0-20220121163655-4a2b9fdd466b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4=
 github.com/containerd/containerd v1.6.6 h1:xJNPhbrmz8xAMDNoVjHy9YHtWwEQNS+CDkcIRh7t8Y0=
@@ -175,8 +173,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
 github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
-github.com/datawire/dlib v1.3.1-0.20221228104658-e373c6d44961 h1:15OzlA2wuggBrByhFFxZAMuuxXd3JYNbZZHQ09HTJAA=
-github.com/datawire/dlib v1.3.1-0.20221228104658-e373c6d44961/go.mod h1:TqC6RI+yPsW3Am6RmfSz+eUUDyJCB4RuK3q9QajswiM=
+github.com/datawire/dlib v1.3.1 h1:igD//7PiHYOdGEk4z6f1X4iDBHucnV9byssykTnpYQc=
+github.com/datawire/dlib v1.3.1/go.mod h1:TqC6RI+yPsW3Am6RmfSz+eUUDyJCB4RuK3q9QajswiM=
 github.com/datawire/dtest v0.0.0-20210928162311-722b199c4c2f h1:Yz+xVYWkSARvfJ0e3LWwF1N5F+zJI9pCZ9R41OtkrKE=
 github.com/datawire/envconfig v0.0.0-20221012222025-09524dc7d59b h1:QXkFwAQPkOoX4jXItBbUdYCQC9I5OwhI50gZl/Dn5jc=
 github.com/datawire/envconfig v0.0.0-20221012222025-09524dc7d59b/go.mod h1:3SpNv+sKT10l7Gt88j8Eyk4Rd5FhMCnEYbfPo4Ee/e4=
@@ -229,8 +227,6 @@ 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 v0.6.7 h1:qcZcULcd/abmQg6dwigimCNEyi4gg31M/xaciQlDml8=
-github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo=
 github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -519,7 +515,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
 github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -586,7 +581,6 @@ github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
 github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
-github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
@@ -629,8 +623,8 @@ github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRU
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
-github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
@@ -806,7 +800,6 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
@@ -974,7 +967,6 @@ golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hM
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1029,7 +1021,6 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
@@ -1142,7 +1133,6 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1244,7 +1234,6 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=