Merge branch 'master' into invalid-indent-hint-scalar-block

.drone/drone.jsonnet

@@ -1,4 +1,4 @@
-local golang = 'golang:1.19.1';
+local golang = 'golang:1.20.6';
 
 local volumes = [{ name: 'docker', host: { path: '/var/run/docker.sock' } }, { name: 'gopath', temp: {} }];
 local mounts = [{ name: 'gopath', path: '/go' }, { name: 'docker', path: '/var/run/docker.sock' }];

.drone/drone.yml

@@ -9,7 +9,7 @@ platform:
 
 steps:
 - name: download
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - go mod download
   volumes:
@@ -19,7 +19,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: lint
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - make lint
   volumes:
@@ -31,7 +31,7 @@ steps:
   - download
 
 - name: test
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - go test ./...
   volumes:
@@ -71,7 +71,7 @@ platform:
 
 steps:
 - name: fetch-tags
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - git fetch origin --tags
   volumes:
@@ -81,7 +81,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: cross
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - make cross
   volumes:
@@ -125,7 +125,7 @@ platform:
 
 steps:
 - name: static
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - make static
   volumes:
@@ -172,7 +172,7 @@ platform:
 
 steps:
 - name: static
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - make static
   volumes:
@@ -219,7 +219,7 @@ platform:
 
 steps:
 - name: static
-  image: golang:1.19.1
+  image: golang:1.20.6
   commands:
   - make static
   volumes:
@@ -320,6 +320,6 @@ get:
 
 ---
 kind: signature
-hmac: c43c45c827c9fb5c2436edeebb7f04fdc115e79e219691524970aeb83d2ead4c
+hmac: bc79c5325c183a42cea6ece31262a4ee2bdb0698650b5c4e8f74ca36e4267c55
 
 ...

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19.1
+FROM golang:1.20.6
 ARG JSONNET_VERSION=v0.19.1
 ARG JB_VERSION=v0.5.1
 WORKDIR /app

go.mod

@@ -1,23 +1,23 @@
 module github.com/grafana/grizzly
 
-go 1.19
+go 1.20
 
 require (
-	github.com/fatih/color v1.13.0
-	github.com/gdamore/tcell v1.3.0
+	github.com/fatih/color v1.15.0
+	github.com/gdamore/tcell v1.4.0
 	github.com/go-clix/cli v0.2.0
 	github.com/gobwas/glob v0.2.3
-	github.com/goccy/go-yaml v1.11.0
-	github.com/google/go-jsonnet v0.19.1
-	github.com/grafana/synthetic-monitoring-agent v0.14.1
-	github.com/grafana/synthetic-monitoring-api-go-client v0.0.2
-	github.com/grafana/tanka v0.24.0
+	github.com/google/go-jsonnet v0.20.0
+	github.com/grafana/synthetic-monitoring-agent v0.16.5
+	github.com/grafana/synthetic-monitoring-api-go-client v0.7.0
+	github.com/grafana/tanka v0.25.0
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/rivo/tview v0.0.0-20200818120338-53d50e499bf9
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.8.1
-	golang.org/x/crypto v0.7.0
+	github.com/sirupsen/logrus v1.9.3
+	github.com/stretchr/testify v1.8.4
+	golang.org/x/crypto v0.11.0
 	gopkg.in/fsnotify.v1 v1.4.7
+	github.com/goccy/go-yaml v1.11.2
 )
 
 require (
@@ -26,37 +26,36 @@ require (
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/rivo/uniseg v0.1.0 // indirect
-	github.com/rs/zerolog v1.28.0 // indirect
+	github.com/rs/zerolog v1.29.1 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
-	google.golang.org/grpc v1.52.1 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/term v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
+	google.golang.org/genproto v0.0.0-20230524185152-1884fd1fac28 // indirect
+	google.golang.org/grpc v1.56.2 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )