From 9d15b4c880175cd1a92281ac7bec9a2d14e2e66f Mon Sep 17 00:00:00 2001 From: Bryan Burkholder Date: Thu, 28 Jul 2022 14:23:53 -0700 Subject: [PATCH] Disable plugin signing (#3) Also fixes a docker compose path issue --- .github/workflows/release.yml | 38 +++++++++++-------- docker-compose.yml | 2 +- .../datasources/automatic.yml | 3 -- 3 files changed, 23 insertions(+), 20 deletions(-) rename automatic.yml => provisioning/datasources/automatic.yml (93%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62e2bcb..724ddf7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,10 +75,12 @@ jobs: version: latest args: buildAll - - name: Sign plugin - run: yarn sign - env: - GRAFANA_API_KEY: ${{ secrets.GRAFANA_API_KEY }} # Requires a Grafana API key from Grafana.com. + # Signing disabled as this is not a community published plugin yet + # + # - name: Sign plugin + # run: yarn sign + # env: + # GRAFANA_API_KEY: ${{ secrets.GRAFANA_API_KEY }} # Requires a Grafana API key from Grafana.com. - name: Get plugin metadata id: metadata @@ -116,13 +118,15 @@ jobs: md5sum ${{ steps.metadata.outputs.archive }} > ${{ steps.metadata.outputs.archive-checksum }} echo "::set-output name=checksum::$(cat ./${{ steps.metadata.outputs.archive-checksum }} | cut -d' ' -f1)" - - name: Lint plugin - run: | - git clone https://github.com/grafana/plugin-validator - pushd ./plugin-validator/pkg/cmd/plugincheck - go install - popd - plugincheck ${{ steps.metadata.outputs.archive }} + # Lint disabled as this validates a MANIFEST generated by signing exists, which we do not have yet + # + # - name: Lint plugin + # run: | + # git clone https://github.com/grafana/plugin-validator + # pushd ./plugin-validator/pkg/cmd/plugincheck + # go install + # popd + # plugincheck ${{ steps.metadata.outputs.archive }} - name: Create release id: create_release @@ -157,8 +161,10 @@ jobs: asset_name: ${{ steps.metadata.outputs.archive-checksum }} asset_content_type: text/plain - - name: Publish to Grafana.com - run: | - echo A draft release has been created for your plugin. Please review and publish it. Then submit your plugin to grafana.com/plugins by opening a PR to https://github.com/grafana/grafana-plugin-repository with the following entry: - echo - echo '{ "id": "${{ steps.metadata.outputs.plugin-id }}", "type": "${{ steps.metadata.outputs.plugin-type }}", "url": "https://github.com/${{ github.repository }}", "versions": [ { "version": "${{ steps.metadata.outputs.plugin-version }}", "commit": "${{ github.sha }}", "url": "https://github.com/${{ github.repository }}", "download": { "any": { "url": "https://github.com/${{ github.repository }}/releases/download/v${{ steps.metadata.outputs.plugin-version }}/${{ steps.metadata.outputs.archive }}", "md5": "${{ steps.package-plugin.outputs.checksum }}" } } } ] }' | jq . + # Disabled, as we are not currently publishing to Grafana.com - even though this is only an echo statement + # + # - name: Publish to Grafana.com + # run: | + # echo A draft release has been created for your plugin. Please review and publish it. Then submit your plugin to grafana.com/plugins by opening a PR to https://github.com/grafana/grafana-plugin-repository with the following entry: + # echo + # echo '{ "id": "${{ steps.metadata.outputs.plugin-id }}", "type": "${{ steps.metadata.outputs.plugin-type }}", "url": "https://github.com/${{ github.repository }}", "versions": [ { "version": "${{ steps.metadata.outputs.plugin-version }}", "commit": "${{ github.sha }}", "url": "https://github.com/${{ github.repository }}", "download": { "any": { "url": "https://github.com/${{ github.repository }}/releases/download/v${{ steps.metadata.outputs.plugin-version }}/${{ steps.metadata.outputs.archive }}", "md5": "${{ steps.package-plugin.outputs.checksum }}" } } } ] }' | jq . diff --git a/docker-compose.yml b/docker-compose.yml index d4e0533..e9aa27b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: - '3000:3000' volumes: - ./provisioning:/etc/grafana/provisioning - - ./:/var/lib/grafana/plugins/slack-kaldb-app + - ./dist:/var/lib/grafana/plugins/slack-kaldb-app environment: GF_LOG_MODE: "console file" GF_LOG_LEVEL: "debug" diff --git a/automatic.yml b/provisioning/datasources/automatic.yml similarity index 93% rename from automatic.yml rename to provisioning/datasources/automatic.yml index 79d30ab..25bba7d 100644 --- a/automatic.yml +++ b/provisioning/datasources/automatic.yml @@ -4,9 +4,6 @@ deleteDatasources: - name: KalDB orgId: 1 -apps: - - type: slack-kaldb-app - datasources: - name: KalDB Query [ES] type: elasticsearch