Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove backend code #1

Merged
merged 4 commits into from
Nov 5, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,27 @@ platform:
arch: amd64

steps:
- name: build
- name: initialize
image: grafana/grafana-plugin-ci:1.2.1-alpine
commands:
- mage -v build
- mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.27/grabpl
- chmod +x bin/grabpl
- mkdir ci
- yarn install --frozen-lockfile --no-progress
- rm -rf node_modules/@grafana/data/node_modules

- name: lint
- name: build-and-test-frontend
image: grafana/grafana-plugin-ci:1.2.1-alpine
commands:
- mage -v lint

- name: test
image: grafana/grafana-plugin-ci:1.2.1-alpine
commands:
- mage -v test
- yarn eslint ./src --ext .js,.jsx,.ts,.tsx
- yarn build
- yarn test-ci
depends_on:
- initialize

---
kind: signature
hmac: b980986bcf4841da3d58e4adb04bd532480c15b1a719570cece295970e5d7265
hmac: b63300304a0dad7f76ee99c27e2fc095c1be56d60501d9ad93d371324f2eb637

...
11 changes: 11 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": ["@grafana/eslint-config"],
"root": true,
"plugins": ["no-only-tests", "@emotion", "lodash"],
"rules": {
"no-only-tests/no-only-tests": "error",
"react/prop-types": "off",
"@emotion/jsx-import": "error",
"lodash/import-scope": [2, "member"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious what inspired the need to extend what we have? Seems like we'd want to keep things more or less in line with whatever the defaults right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just copied this from the root of grafana/grafana but I guess it's not really that needed. I can just use the default.

}
}
4 changes: 1 addition & 3 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
module.exports = {
trailingComma: 'es5',
singleQuote: true,
printWidth: 120,
...require('@grafana/toolkit/src/config/prettier.plugin.config.json'),
};
2 changes: 1 addition & 1 deletion Magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func Drone() error {
return err
}

if err := sh.RunV("drone", "--server", "https://drone.grafana.net", "sign", "--save", "grafana/grafana-plugin-sdk-go"); err != nil {
if err := sh.RunV("drone", "--server", "https://drone.grafana.net", "sign", "--save", "grafana/grafana-aws-sdk-react"); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to have this file for Drone?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really, it was just out of convenience to not having to remember the whole drone command but I can just add it to the docs.

return err
}

Expand Down
14 changes: 3 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
module github.com/grafana/grafana-aws-sdk
module github.com/grafana/grafana-aws-sdk-react

go 1.14
go 1.17

require (
github.com/aws/aws-sdk-go v1.35.30
github.com/google/go-cmp v0.5.6
github.com/grafana/grafana-plugin-sdk-go v0.94.0
github.com/grafana/sqlds/v2 v2.3.2
github.com/jpillora/backoff v1.0.0
github.com/magefile/mage v1.11.0
github.com/stretchr/testify v1.7.0
)
require github.com/magefile/mage v1.11.0
527 changes: 0 additions & 527 deletions go.sum

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"clean": "rimraf ./dist ./compiled",
"typecheck": "tsc --noEmit",
"publish": "npm publish --access=public --scope=grafana",
"test": "jest --notify --watch"
"test": "jest --notify --watch",
"test-ci": "grafana-toolkit plugin:test"
},
"files": [
"index.js",
Expand All @@ -21,13 +22,14 @@
"license": "Apache-2.0",
"dependencies": {},
"devDependencies": {
"@grafana/data": "^7.5.0",
"@grafana/ui": "^7.5.0",
"@babel/preset-env": "^7.13.12",
"@babel/preset-react": "^7.13.13",
"@babel/preset-typescript": "^7.13.0",
"@emotion/eslint-plugin": "^11.5.0",
"@grafana/data": "^7.5.0",
"@grafana/toolkit": "^7.5.1",
"@grafana/tsconfig": "^1.0.0-rc1",
"@grafana/ui": "^7.5.0",
"@rollup/plugin-commonjs": "11.0.2",
"@rollup/plugin-json": "4.0.3",
"@rollup/plugin-node-resolve": "7.1.1",
Expand All @@ -45,6 +47,9 @@
"@types/rollup-plugin-visualizer": "2.6.0",
"@types/sinon": "^7.5.2",
"babel-jest": "^26.6.3",
"eslint-plugin": "^1.0.1",
"eslint-plugin-lodash": "^7.3.0",
"eslint-plugin-no-only-tests": "^2.6.0",
"jest": "^26.6.3",
"pretty-format": "25.1.0",
"react-test-renderer": "^17.0.2",
Expand Down
243 changes: 0 additions & 243 deletions pkg/awsds/sessions.go

This file was deleted.

Loading