Fix datasource without backend template and update test CI

.github/workflows/ci.yml

@@ -29,10 +29,14 @@ jobs:
 
       - name: '@grafana/create-plugin - test an app plugin generation'
         run: yarn workspace @grafana/create-plugin run generate-app && (cd ./packages/create-plugin/generated && yarn install --prefer-offline && yarn build && yarn lint)
+      - name: '@grafana/create-plugin - test an app with backend plugin generation'
+        run: yarn workspace @grafana/create-plugin run generate-app-backend && (cd ./packages/create-plugin/generated && yarn install --prefer-offline && yarn build && yarn lint)
       - name: '@grafana/create-plugin - test panel plugin generation'
         run: yarn workspace @grafana/create-plugin run generate-panel && (cd ./packages/create-plugin/generated && yarn install --prefer-offline && yarn build && yarn lint)
       - name: '@grafana/create-plugin - test datasource plugin generation'
         run: yarn workspace @grafana/create-plugin run generate-datasource && (cd ./packages/create-plugin/generated && yarn install --prefer-offline && yarn build && yarn lint)
+      - name: '@grafana/create-plugin - test datasource with backend plugin generation'
+        run: yarn workspace @grafana/create-plugin run generate-datasource-backend && (cd ./packages/create-plugin/generated && yarn install --prefer-offline && yarn build && yarn lint)
 
       - name: '@grafana/sign-plugin - build'
         run: yarn workspace @grafana/sign-plugin run build

packages/create-plugin/package.json

@@ -24,7 +24,8 @@
     "generate-app": "tsc && yarn clean-generated && CREATE_PLUGIN_DEV=true node ./scripts/generate-app.js",
     "generate-app-backend": "tsc && yarn clean-generated && CREATE_PLUGIN_DEV=true node ./scripts/generate-app-backend.js",
     "generate-panel": "tsc && yarn clean-generated && CREATE_PLUGIN_DEV=true node ./scripts/generate-panel.js",
-    "generate-datasource": "tsc && yarn clean-generated && CREATE_PLUGIN_DEV=true node ./scripts/generate-datasource.js",
+    "generate-datasource": "tsc && yarn clean-generated && CREATE_PLUGIN_DEV=true node ./scripts/generate-datasource-without-backend.js",
+    "generate-datasource-backend": "tsc && yarn clean-generated && CREATE_PLUGIN_DEV=true node ./scripts/generate-datasource-with-backend.js",
     "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx ./src",
     "lint:fix": "yarn lint --fix",
     "test": "jest",

packages/create-plugin/scripts/generate-app-backend.js

@@ -2,7 +2,7 @@ const nodePlop = require('node-plop');
 const path = require('path');
 const fs = require('fs');
 
-async function generateApp() {
+async function generate() {
   const plopFile = path.join(__dirname, '../dist/commands/generate.plopfile.js');
   if (!fs.existsSync(plopFile)) {
     console.error('Run build first');
@@ -21,4 +21,4 @@ async function generateApp() {
   });
 }
 
-generateApp();
+generate();

packages/create-plugin/scripts/generate-app.js

@@ -2,7 +2,7 @@ const nodePlop = require('node-plop');
 const path = require('path');
 const fs = require('fs');
 
-async function generatePanel() {
+async function generate() {
   const plopFile = path.join(__dirname, '../dist/commands/generate.plopfile.js');
   if (!fs.existsSync(plopFile)) {
     console.error('Run build first');
@@ -21,4 +21,4 @@ async function generatePanel() {
   });
 }
 
-generatePanel();
+generate();

packages/create-plugin/scripts/generate-datasource.js → packages/create-plugin/scripts/generate-datasource-with-backend.js

@@ -2,7 +2,7 @@ const nodePlop = require('node-plop');
 const path = require('path');
 const fs = require('fs');
 
-async function generatePanel() {
+async function generate() {
   const plopFile = path.join(__dirname, '../dist/commands/generate.plopfile.js');
   if (!fs.existsSync(plopFile)) {
     console.error('Run build first');
@@ -21,4 +21,4 @@ async function generatePanel() {
   });
 }
 
-generatePanel();
+generate();

packages/create-plugin/scripts/generate-datasource-without-backend.js

@@ -0,0 +1,24 @@
+const nodePlop = require('node-plop');
+const path = require('path');
+const fs = require('fs');
+
+async function generate() {
+  const plopFile = path.join(__dirname, '../dist/commands/generate.plopfile.js');
+  if (!fs.existsSync(plopFile)) {
+    console.error('Run build first');
+    process.exit(1);
+  }
+  const plop = await nodePlop(plopFile);
+  const generator = plop.getGenerator('create-plugin');
+  await generator.runActions({
+    pluginName: 'my-plugin',
+    orgName: 'my-org',
+    pluginDescription: 'Auto-generated datasource',
+    pluginType: 'datasource',
+    hasBackend: false,
+    hasGithubWorkflows: true,
+    hasGithubLevitateWorkflow: true,
+  });
+}
+
+generate();

packages/create-plugin/scripts/generate-panel.js

@@ -2,7 +2,7 @@ const nodePlop = require('node-plop');
 const path = require('path');
 const fs = require('fs');
 
-async function generatePanel() {
+async function generate() {
   const plopFile = path.join(__dirname, '../dist/commands/generate.plopfile.js');
   if (!fs.existsSync(plopFile)) {
     console.error('Run build first');
@@ -20,4 +20,4 @@ async function generatePanel() {
   });
 }
 
-generatePanel();
+generate();

packages/create-plugin/src/constants.ts

@@ -38,7 +38,7 @@ export enum PLUGIN_TYPES {
 // and will be available to use in the templates.
 // Example: "@grafana/ui": "{{ grafanaVersion }}"
 export const EXTRA_TEMPLATE_VARIABLES = {
-  grafanaVersion: '9.2.5',
+  grafanaVersion: '9.3.8',
 };
 
 export const GRAFANA_FE_PACKAGES = [

packages/create-plugin/templates/datasource/src/datasource.ts

@@ -7,7 +7,7 @@ import {
   FieldType,
 } from '@grafana/data';
 
-import { MyQuery, MyDataSourceOptions, DEFAULT_QUERY } from './types';
+import { MyQuery, MyDataSourceOptions } from './types';
 
 export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
   constructor(instanceSettings: DataSourceInstanceSettings<MyDataSourceOptions>) {