Skip to content

N
nexpie-grafana-theme
Commit 7ec87ee7 by Ryan McKinley Committed by Dominik Prokop
Options

grafana/toolkit: improve CircleCI stubs (#17995) 

* validate type and id

* copy all svg and png, useful if people don't use the img folder

* update comments

* add stubs for each ci task

* use ci-work folder rather than build

* use axios for basic testing

* Packages: publish packages@6.3.0-alpha.39

* bump version

* add download task

* Packages: publish packages@6.3.0-alpha.40

* merge all dist folders into one

* fix folder paths

* Fix ts error

* Packages: publish packages@6.3.0-beta.0

* Packages: publish packages@6.3.0-beta.1

* bump next to 6.4

* Packages: publish packages@6.4.0-alpha.2

* better build and bundle tasks

* fix lint

* Packages: publish packages@6.4.0-alpha.3

* copy the file to start grafana

* Packages: publish packages@6.4.0-alpha.4

* use sudo for copy

* Packages: publish packages@6.4.0-alpha.5

* add missing service

* add service and homepath

* Packages: publish packages@6.4.0-alpha.6

* make the folder

* Update packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts

* Update packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts
parent 51909499
Showing with 86 additions and 30 deletions
lerna.json
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"packages": ["packages/*"], "packages": ["packages/*"],
"version": "6.3.0-alpha.36" "version": "6.4.0-alpha.6"
} }
package.json
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
"themes:generate": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts", "themes:generate": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts",
"packages:prepare": "lerna run clean && npm run test && lerna version --tag-version-prefix=\"packages@\" -m \"Packages: publish %s\" --no-push", "packages:prepare": "lerna run clean && npm run test && lerna version --tag-version-prefix=\"packages@\" -m \"Packages: publish %s\" --no-push",
"packages:build": "lerna run clean && lerna run build", "packages:build": "lerna run clean && lerna run build",
"packages:publish": "lerna publish from-package --contents dist --tag-version-prefix=\"packages@\" --dist-tag next" "packages:publish": "lerna publish from-package --contents dist --dist-tag next --tag-version-prefix=\"packages@\""
}, },
"husky": { "husky": {
"hooks": { "hooks": {
......
packages/grafana-data/README.md
# Grafana Data Library # Grafana Data Library
The core data components This package holds the root data types and functions used within Grafana.
\ No newline at end of file \ No newline at end of file
packages/grafana-data/package.json
{ {
"name": "@grafana/data", "name": "@grafana/data",
"version": "6.3.0-alpha.36", "version": "6.4.0-alpha.2",
"description": "Grafana Data Library", "description": "Grafana Data Library",
"keywords": [ "keywords": [
"typescript" "typescript"
......
packages/grafana-runtime/README.md
# Grafana Runtime library # Grafana Runtime library
Interfaces that let you use the runtime... This package allows access to grafana services. It requires Grafana to be running already and the functions to be imported as externals.
\ No newline at end of file \ No newline at end of file
packages/grafana-runtime/package.json
{ {
"name": "@grafana/runtime", "name": "@grafana/runtime",
"version": "6.3.0-alpha.36", "version": "6.4.0-alpha.2",
"description": "Grafana Runtime Library", "description": "Grafana Runtime Library",
"keywords": [ "keywords": [
"typescript", "grafana"
"react",
"react-component"
], ],
"main": "src/index.ts", "main": "src/index.ts",
"scripts": { "scripts": {
......
packages/grafana-toolkit/package.json
{ {
"name": "@grafana/toolkit", "name": "@grafana/toolkit",
"version": "6.3.0-alpha.36", "version": "6.4.0-alpha.6",
"description": "Grafana Toolkit", "description": "Grafana Toolkit",
"keywords": [ "keywords": [
"typescript", "grafana",
"react", "cli",
"react-component" "plugins"
], ],
"bin": { "bin": {
"grafana-toolkit": "./bin/grafana-toolkit.js" "grafana-toolkit": "./bin/grafana-toolkit.js"
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"@types/node": "^12.0.4", "@types/node": "^12.0.4",
"@types/react-dev-utils": "^9.0.1", "@types/react-dev-utils": "^9.0.1",
"@types/semver": "^6.0.0", "@types/semver": "^6.0.0",
"@types/tmp": "^0.1.0",
"@types/webpack": "4.4.34", "@types/webpack": "4.4.34",
"axios": "0.19.0", "axios": "0.19.0",
"babel-loader": "8.0.6", "babel-loader": "8.0.6",
......
packages/grafana-toolkit/src/cli/index.ts
...@@ -13,7 +13,13 @@ import { pluginTestTask } from './tasks/plugin.tests'; ...@@ -13,7 +13,13 @@ import { pluginTestTask } from './tasks/plugin.tests';
import { searchTestDataSetupTask } from './tasks/searchTestDataSetup'; import { searchTestDataSetupTask } from './tasks/searchTestDataSetup';
import { closeMilestoneTask } from './tasks/closeMilestone'; import { closeMilestoneTask } from './tasks/closeMilestone';
import { pluginDevTask } from './tasks/plugin.dev'; import { pluginDevTask } from './tasks/plugin.dev';
import { pluginCITask } from './tasks/plugin.ci'; import {
ciBuildPluginTask,
ciBundlePluginTask,
ciTestPluginTask,
ciDeployPluginTask,
ciSetupPluginTask,
} from './tasks/plugin.ci';
import { buildPackageTask } from './tasks/package.build'; import { buildPackageTask } from './tasks/package.build';
export const run = (includeInternalScripts = false) => { export const run = (includeInternalScripts = false) => {
...@@ -141,15 +147,47 @@ export const run = (includeInternalScripts = false) => { ...@@ -141,15 +147,47 @@ export const run = (includeInternalScripts = false) => {
}); });
program program
.command('plugin:ci') .command('plugin:ci-build')
.option('--dryRun', "Dry run (don't post results)") .option('--platform <platform>', 'For backend task, which backend to run')
.description('Run Plugin CI task') .description('Build the plugin, leaving artifacts in /dist')
.action(async cmd => { .action(async cmd => {
await execTask(pluginCITask)({ await execTask(ciBuildPluginTask)({
dryRun: cmd.dryRun, platform: cmd.platform,
}); });
}); });
program
.command('plugin:ci-bundle')
.description('Create a zip artifact for the plugin')
.action(async cmd => {
await execTask(ciBundlePluginTask)({});
});
program
.command('plugin:ci-setup')
.option('--installer <installer>', 'Name of installer to download and run')
.description('Install and configure grafana')
.action(async cmd => {
await execTask(ciSetupPluginTask)({
installer: cmd.installer,
});
});
program
.command('plugin:ci-test')
.description('end-to-end test using bundle in /artifacts')
.action(async cmd => {
await execTask(ciTestPluginTask)({
platform: cmd.platform,
});
});
program
.command('plugin:ci-deploy')
.description('Publish plugin CI results')
.action(async cmd => {
await execTask(ciDeployPluginTask)({});
});
program.on('command:*', () => { program.on('command:*', () => {
console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' ')); console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' '));
process.exit(1); process.exit(1);
......
packages/grafana-toolkit/src/config/utils/pluginValidation.test.ts
...@@ -3,7 +3,7 @@ import { getPluginJson, validatePluginJson } from './pluginValidation'; ...@@ -3,7 +3,7 @@ import { getPluginJson, validatePluginJson } from './pluginValidation';
describe('pluginValdation', () => { describe('pluginValdation', () => {
describe('plugin.json', () => { describe('plugin.json', () => {
test('missing plugin.json file', () => { test('missing plugin.json file', () => {
expect(() => getPluginJson(`${__dirname}/mocks/missing-plugin-json`)).toThrow('plugin.json file is missing!'); expect(() => getPluginJson(`${__dirname}/mocks/missing-plugin.json`)).toThrowError();
}); });
}); });
......
packages/grafana-toolkit/src/config/utils/pluginValidation.ts
import path = require('path');
// See: packages/grafana-ui/src/types/plugin.ts // See: packages/grafana-ui/src/types/plugin.ts
interface PluginJSONSchema { interface PluginJSONSchema {
id: string; id: string;
...@@ -22,15 +20,24 @@ export const validatePluginJson = (pluginJson: any) => { ...@@ -22,15 +20,24 @@ export const validatePluginJson = (pluginJson: any) => {
if (!pluginJson.info.version) { if (!pluginJson.info.version) {
throw new Error('Plugin info.version is missing in plugin.json'); throw new Error('Plugin info.version is missing in plugin.json');
} }
const types = ['panel', 'datasource', 'app'];
const type = pluginJson.type;
if (!types.includes(type)) {
throw new Error('Invalid plugin type in plugin.json: ' + type);
}
if (!pluginJson.id.endsWith('-' + type)) {
throw new Error('[plugin.json] id should end with: -' + type);
}
}; };
export const getPluginJson = (root: string = process.cwd()): PluginJSONSchema => { export const getPluginJson = (path: string): PluginJSONSchema => {
let pluginJson; let pluginJson;
try { try {
pluginJson = require(path.resolve(root, 'src/plugin.json')); pluginJson = require(path);
} catch (e) { } catch (e) {
throw new Error('plugin.json file is missing!'); throw new Error('Unable to find: ' + path);
} }
validatePluginJson(pluginJson); validatePluginJson(pluginJson);
......
packages/grafana-ui/package.json
{ {
"name": "@grafana/ui", "name": "@grafana/ui",
"version": "6.3.0-alpha.36", "version": "6.4.0-alpha.2",
"description": "Grafana Components Library", "description": "Grafana Components Library",
"keywords": [ "keywords": [
"typescript", "grafana",
"react", "react",
"react-component" "react-component"
], ],
......
yarn.lock
...@@ -3371,6 +3371,11 @@ ...@@ -3371,6 +3371,11 @@
resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.2.tgz#721ca5c5d1a2988b4a886e35c2ffc5735b6afbdf" resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.2.tgz#721ca5c5d1a2988b4a886e35c2ffc5735b6afbdf"
integrity sha512-PeHg/AtdW6aaIO2a+98Xj7rWY4KC1E6yOy7AFknJQ7VXUGNrMlyxDFxJo7HqLtjQms/ZhhQX52mLVW/EX3JGOw== integrity sha512-PeHg/AtdW6aaIO2a+98Xj7rWY4KC1E6yOy7AFknJQ7VXUGNrMlyxDFxJo7HqLtjQms/ZhhQX52mLVW/EX3JGOw==
"@types/tmp@^0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.1.0.tgz#19cf73a7bcf641965485119726397a096f0049bd"
integrity sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==
"@types/uglify-js@*": "@types/uglify-js@*":
version "3.0.4" version "3.0.4"
resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082" resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082"
...@@ -17202,6 +17207,13 @@ tmp@^0.0.33: ...@@ -17202,6 +17207,13 @@ tmp@^0.0.33:
dependencies: dependencies:
os-tmpdir "~1.0.2" os-tmpdir "~1.0.2"
tmp@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
dependencies:
rimraf "^2.6.3"
tmpl@1.0.x: tmpl@1.0.x:
version "1.0.4" version "1.0.4"
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment