20231129 fix build

.github/workflows/ci.yml

@@ -16,19 +16,16 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.20.1
+          go-version: 1.21.4
           cache: true
 
       - name: Install dependencies
         run: go get .
 
-      - name: Install osv-scanner
-        run: go install github.com/google/osv-scanner/cmd/osv-scanner@v1
-
       - name: Install golangci-lint
-        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.51.2
+        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
 
       - name: Run Gosec Security Scanner
         uses: securego/gosec@master

.github/workflows/osv-scanner-pr.yml

@@ -0,0 +1,19 @@
+name: OSV-Scanner PR Scan
+
+# Change "main" to your default branch if you use a different name, i.e. "master"
+on:
+  pull_request:
+    branches: [ main ]
+  merge_group:
+    branches: [ main ]
+
+permissions:
+  # Require writing security events to upload SARIF file to security tab
+  security-events: write
+  # Only need to read contents
+  contents: read
+
+jobs:
+  scan-pr:
+    uses: "google/osv-scanner/.github/workflows/osv-scanner-reusable-pr.yml@main"
+

Magefile.go

@@ -178,7 +178,6 @@ func (Build) Local(ctx context.Context) {
 // CI Lint/Format/Test/Build
 func (Build) CI(ctx context.Context) {
 	mg.Deps(
-		Build.OSVScanner,
 		Build.Lint,
 		Build.Format,
 		Test.Verbose,
@@ -204,12 +203,6 @@ func (Build) Lint() error {
 	return sh.RunV("golangci-lint", "--timeout", "5m", "run", "./pkg/...")
 }
 
-// OSVScanner Vulnerability scanning
-func (Build) OSVScanner() error {
-	log.Printf("Scanning...")
-	return sh.RunV("osv-scanner", "--lockfile", "./go.mod")
-}
-
 // Verbose Run tests in verbose mode
 func (Test) Verbose() {
 	mg.Deps(

go.mod

@@ -1,45 +1,47 @@
 module github.com/grafana/grafana-kiosk
 
-go 1.20
+go 1.21
 
 require (
-	github.com/chromedp/cdproto v0.0.0-20230408222125-26b95782d8e2
-	github.com/chromedp/chromedp v0.9.1
-	github.com/ilyakaznacheev/cleanenv v1.4.2
-	github.com/magefile/mage v1.14.0
-	github.com/smartystreets/goconvey v1.8.0
+	github.com/chromedp/cdproto v0.0.0-20231126232103-8e31ff06e23b
+	github.com/chromedp/chromedp v0.9.3
+	github.com/ilyakaznacheev/cleanenv v1.5.0
+	github.com/magefile/mage v1.15.0
+	github.com/smartystreets/goconvey v1.8.1
 )
 
 require (
-	cloud.google.com/go/compute v1.19.0 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/smarty/assertions v1.15.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd // indirect
-	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
+	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )
 
 require (
-	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/chromedp/sysutil v1.0.0 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.1.0 // indirect
+	github.com/gobwas/ws v1.3.1 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/smartystreets/assertions v1.13.1 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	google.golang.org/api v0.116.0
+	golang.org/x/sys v0.15.0 // indirect
+	google.golang.org/api v0.152.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect
 )