update plugin dependencies (#170)

* update plugin dependencies

* cleanup

* add vendors

* add build tags

* use mage as build

* fix Makefile

* add plugin check with grafana check tool

* change release pipeline

* add CHANGELOG.md

* fix CHANGELOG.md

Author: dmitryk-dk

.github/workflows/pr-checks-backend.yml

@@ -9,7 +9,7 @@ on:
       - 'vendor/**'
       - 'pkg/**'
       - '**/Makefile'
-      - '**/Dockerfile'
+      - '**/Magefile.go'
   pull_request:
     branches:
       - main
@@ -19,7 +19,7 @@ on:
       - 'vendor/**'
       - 'pkg/**'
       - '**/Makefile'
-      - '**/Dockerfile'
+      - '**/Magefile.go'
 
 permissions:
   contents: read
@@ -39,7 +39,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.6
+          go-version-file: 'go.mod'
           check-latest: true
           cache: true
 
@@ -62,27 +62,10 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.6
+          go-version-file: 'go.mod'
           check-latest: true
           cache: true
 
       - name: run tests
         run: |
           make ${{ matrix.scenario }}
-
-  build:
-    needs: test
-    name: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v4
-
-      - uses: actions/cache@v4
-        with:
-          path: gocache-for-docker
-          key:  gocache-docker-${{ runner.os }}-${{ steps.go.outputs.go-version }}-${{ hashFiles('go.mod') }}
-
-      - name: Build
-        run: |
-          make vl-backend-plugin-build

.github/workflows/pr-checks-frontend.yml

@@ -26,9 +26,6 @@ jobs:
   run-check:
     name: check
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        scenario: ["make vl-frontend-plugin-build", "yarn test"]
     steps:
       - name: Code checkout
         uses: actions/checkout@v4
@@ -41,6 +38,5 @@ jobs:
       - name: Install all dependencies
         run: yarn install
 
-      - name: Run
-        run: |
-          ${{ matrix.scenario }}
+      - name: Run tests
+        run: yarn test

.github/workflows/pr-checks-plugin.yml

@@ -0,0 +1,66 @@
+name: check / plugin
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '.github/workflows/pr-checks-plugin.yml'
+      - 'go.*'
+      - 'vendor/**'
+      - 'pkg/**'
+      - '**/Makefile'
+      - '**/Magefile.go'
+      - '**/Dockerfile'
+      - '**/*.ts'
+      - '**/*.tsx'
+      - '**/yarn.lock'
+      - '**/package.json'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - '.github/workflows/pr-checks-plugin.yml'
+      - 'go.*'
+      - 'vendor/**'
+      - 'pkg/**'
+      - '**/Makefile'
+      - '**/Magefile.go'
+      - '**/Dockerfile'
+      - '**/*.ts'
+      - '**/*.tsx'
+      - '**/yarn.lock'
+      - '**/package.json'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: build and validate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
+      - name: Setup node caches
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ github.workspace }}/.cache
+          key: ${{ runner.os }}-yarn-${{ hashFiles('package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Build
+        run: |
+          make vl-plugin-check

.github/workflows/pr-codeql-backend.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.6
+          go-version-file: 'go.mod'
           check-latest: true
           cache: true
         if: ${{ matrix.language == 'go' }}

.github/workflows/release.yaml

@@ -16,14 +16,12 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Setup golang caches
-        uses: actions/cache@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
         with:
-          path: |
-            ${{ github.workspace }}/gocache-for-docker
-          key: ${{ runner.os }}-golang-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-golang-
+          go-version-file: 'go.mod'
+          check-latest: true
+          cache: true
       - name: Setup node caches
         uses: actions/cache@v4
         with:
@@ -34,8 +32,9 @@ jobs:
             ${{ runner.os }}-yarn-
       - name: Build plugin
         run: |
-          yq -iP '.version="${{ env.PKG_TAG }}"' package.json -o json
-          make vl-plugin-release
+          export PKG_TAG="${PKG_TAG#v}"
+          yq -iP '.version=env(PKG_TAG)' package.json -o json
+          make vl-plugin-check
       - name: Prepare release notes
         run: |
           if grep -q "^## tip$" CHANGELOG.md; then

CHANGELOG.md

@@ -2,8 +2,12 @@
 
 ## tip
 
+
+* FEATURE: update plugin dependencies to satisfy Grafana marketplace requirements.
+
 * BUGFIX: filter out empty variable values in queries. See [this issue](https://github.com/VictoriaMetrics/victorialogs-datasource/issues/159).
 
+
 ## v0.13.0
 
 ⚠️ **Breaking Change: Plugin ID Updated**  

deployment/docker/web/Dockerfile renamed to Dockerfile

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2024 VictoriaMetrics
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

LICENSE

@@ -0,0 +1,20 @@
+//go:build mage
+// +build mage
+
+package main
+
+import (
+	// mage:import
+	"github.com/grafana/grafana-plugin-sdk-go/build"
+)
+
+func init() {
+	build.SetBeforeBuildCallback(func(cfg build.Config) (build.Config, error) {
+		// Do something before building
+		cfg.OutputBinaryPath = "plugins/victoriametrics-logs-datasource"
+		return cfg, nil
+	})
+}
+
+// Default configures the default target.
+var Default = build.BuildAll

Magefile.go

@@ -16,46 +16,30 @@ GO_BUILDINFO = -X 'github.com/grafana/grafana-plugin-sdk-go/build.buildInfoJSON=
 
 .PHONY: $(MAKECMDGOALS)
 
-include deployment/*/Makefile
-
-app-via-docker-linux-amd64:
-	CGO_ENABLED=1 GOOS=linux GOARCH=amd64 $(MAKE) app-via-docker
-
-app-via-docker-linux-arm:
-	CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) app-via-docker
-
-app-via-docker-linux-386:
-	CGO_ENABLED=0 GOOS=linux GOARCH=386 $(MAKE) app-via-docker
-
-app-via-docker-linux-arm64:
-	DOCKER_OPTS='--env CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' CGO_ENABLED=1 GOOS=linux GOARCH=arm64 $(MAKE) app-via-docker
-
-app-via-docker-darwin-amd64:
-	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 $(MAKE) app-via-docker
-
-app-via-docker-darwin-arm64:
-	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(MAKE) app-via-docker
-
-app-via-docker-windows-arm64:
-	CGO_ENABLED=0 GOOS=windows GOARCH=arm64 $(MAKE) app-via-docker
-
-app-via-docker-windows-amd64:
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 $(MAKE) app-via-docker
+frontend-package-base-image:
+	docker build -t frontent-builder-image -f Dockerfile $(shell pwd)
+
+frontend-build: frontend-package-base-image
+	mkdir -p .npm .cache && \
+	chown -R $(shell id -u):$(shell id -g) .npm .cache && \
+	docker run --rm \
+		-v "$(shell pwd):/victorialogs-datasource" \
+		-v "$(shell pwd)/.yarn:/.yarn" \
+		-v "$(shell pwd)/.npm:/.npm" \
+		-v "$(shell pwd)/.cache:/.cache" \
+		-w /victorialogs-datasource \
+		--user $(shell id -u):$(shell id -g) \
+		--env YARN_CACHE_FOLDER="/victorialogs-datasource/.cache" \
+		--entrypoint=/bin/bash \
+		frontent-builder-image -c "yarn install --omit=dev && yarn build"
 
 app-via-docker-local:
 	$(eval OS := $(shell docker run $(GO_BUILDER_IMAGE) go env GOOS))
 	$(eval ARCH := $(shell docker run $(GO_BUILDER_IMAGE) go env GOARCH))
 	$(MAKE) app-via-docker-$(OS)-$(ARCH)
 
-vl-backend-plugin-build: \
-	app-via-docker-linux-amd64 \
-	app-via-docker-linux-arm \
-	app-via-docker-linux-arm64 \
-	app-via-docker-linux-386 \
-	app-via-docker-darwin-amd64 \
-	app-via-docker-darwin-arm64 \
-	app-via-docker-windows-amd64 \
-	app-via-docker-windows-arm64
+vl-backend-plugin-build:
+	which mage || go install github.com/magefile/[email protected] && mage -v
 
 vl-frontend-plugin-build: frontend-build
 
@@ -102,3 +86,10 @@ vet:
 	go vet ./pkg/...
 
 check-all: fmt vet golang-ci-lint
+
+vl-plugin-check-install:
+	which plugincheck2 || go install github.com/grafana/plugin-validator/pkg/cmd/[email protected]
+
+vl-plugin-check: vl-plugin-release vl-plugin-check-install
+	$(eval PACKAGE_NAME := $(PLUGIN_ID)-$(PKG_TAG)) \
+	plugincheck2 -sourceCodeUri file://$(shell pwd)/ "$(shell pwd)/dist/${PACKAGE_NAME}.zip"