Merge pull request #112 from scalyr/DSET-2067

Dset 2067

Author: jmakar-s1

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
   frontend:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/[email protected]
         with:
-          node-version: "16.x"
+          node-version: '16.x'
       # Ref: https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Get yarn cache path
         id: yarn-cache-path
@@ -35,25 +35,23 @@ jobs:
   backend:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.16"
-      # Ref: https://github.com/actions/cache/blob/main/examples.md#linux-1
-      - uses: actions/cache@v3
+          go-version: 'stable'
+      # `mage format` would reformat files
+      - name: gofmt check
+        run: test -z "$(gofmt -l pkg)"
+      #- uses: magefile/mage-action@v2
+      #  with:
+      #    args: lint
+      - uses: golangci/golangci-lint-action@v3
         with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Run tests and generate coverage report
-        uses: magefile/mage-action@v2
+          version: 'latest'
+          working-directory: pkg
+      - uses: magefile/mage-action@v2
         with:
-          version: latest
-          args: coverage
+          args: test
       - uses: magefile/mage-action@v2
         with:
-          version: latest
-          args: buildAll
+          args: buildall

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
+      - '[0-9]+.[0-9]+.[0-9]+'
 permissions:
   # Write permissions required to create a release
   # Ref: https://stackoverflow.com/a/69941765
@@ -11,10 +11,10 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/[email protected]
         with:
-          node-version: "16.x"
+          node-version: '16.x'
       # Ref: https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Get yarn cache path
         id: yarn-cache-path
@@ -31,27 +31,25 @@ jobs:
         run: yarn install --frozen-lockfile
       - name: Build and test
         run: yarn build
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: "stable"
-      # Ref: https://github.com/actions/cache/blob/main/examples.md#linux-1
-      - uses: actions/cache@v3
+          go-version: 'stable'
+      # `mage format` would reformat files
+      - name: gofmt check
+        run: test -z "$(gofmt -l pkg)"
+      #- uses: magefile/mage-action@v2
+      #  with:
+      #    args: lint
+      - uses: golangci/golangci-lint-action@v3
         with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Run tests and generate coverage report
-        uses: magefile/mage-action@v2
+          version: 'latest'
+          working-directory: pkg
+      - uses: magefile/mage-action@v2
         with:
-          version: latest
-          args: coverage
+          args: test
       - uses: magefile/mage-action@v2
         with:
-          version: latest
-          args: buildAll
+          args: buildall
       - name: Sign plugin
         run: npx @grafana/toolkit plugin:sign
         env:

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.1.0
+
+- Bumped Golang version to 1.20
+  - Bumped dependent packages (namely grafana-plugin-sdk-go) to latest
+
 ## 3.0.9
 
 - #110: Do not set autoAlign (formerly the default) for plots to allow specification via query options

go.mod

@@ -1,10 +1,69 @@
 module github.com/scalyr/scalyr-grafana-datasource-plugin
 
-go 1.16
+go 1.20
 
 require (
-	github.com/grafana/grafana-plugin-sdk-go v0.126.0
-	github.com/magefile/mage v1.12.1 // indirect
-	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
-	moul.io/http2curl v1.0.0 // indirect
+	github.com/grafana/grafana-plugin-sdk-go v0.155.0
+	golang.org/x/time v0.3.0
+)
+
+require (
+	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
+	github.com/fatih/color v1.7.0 // indirect
+	github.com/getkin/kin-openapi v0.94.0 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.15 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.3 // indirect
+	github.com/google/flatbuffers v2.0.0+incompatible // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/hashicorp/go-hclog v0.14.1 // indirect
+	github.com/hashicorp/go-plugin v1.4.3 // indirect
+	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.13.1 // indirect
+	github.com/magefile/mage v1.14.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattetti/filebuffer v1.0.1 // indirect
+	github.com/mattn/go-colorable v0.1.4 // indirect
+	github.com/mattn/go-isatty v0.0.10 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/pierrec/lz4/v4 v4.1.8 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.40.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
+	github.com/unknwon/com v1.0.1 // indirect
+	github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect
+	github.com/urfave/cli v1.22.12 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys 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-20210630183607-d20f26d13c79 // indirect
+	google.golang.org/grpc v1.41.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )