From 1dab49a8c6666e476edf4b98eef9d0eca2806763 Mon Sep 17 00:00:00 2001 From: baurine <2008.hbl@gmail.com> Date: Mon, 5 Apr 2021 22:34:14 +0800 Subject: [PATCH 1/3] refine --- package.json | 16 ++++----- scaffold-template/pd/pd.patch | 60 ------------------------------- scaffold-template/tidb/tidb.patch | 42 ---------------------- scaffold-template/tikv/tikv.patch | 39 -------------------- src/cluster/provider.ts | 11 +----- src/extension.ts | 8 ----- 6 files changed, 8 insertions(+), 168 deletions(-) delete mode 100644 scaffold-template/pd/pd.patch delete mode 100644 scaffold-template/tidb/tidb.patch delete mode 100644 scaffold-template/tikv/tikv.patch diff --git a/package.json b/package.json index 052d4f8..55a9d11 100644 --- a/package.json +++ b/package.json @@ -82,10 +82,6 @@ "dark": "media/refresh.svg" } }, - { - "command": "ticode.cluster.list", - "title": "List clusters" - }, { "command": "ticode.cluster.display", "title": "Display cluster" @@ -204,7 +200,7 @@ }, { "command": "ticode.topo.diffModification", - "title": "Diff Modificatioin" + "title": "Diff Modification" }, { "command": "ticode.topo.vagrantUp", @@ -272,6 +268,12 @@ } ] }, + "viewsWelcome": [ + { + "view": "ticode-tiup-cluster", + "contents": "No cluster deployed, use \"VM & Topo Manager\" to deploy a cluster" + } + ], "menus": { "explorer/context": [ { @@ -332,10 +334,6 @@ "when": "view == ticode-tiup-playground && viewItem == playground-cluster", "group": "0@1" }, - { - "command": "ticode.cluster.list", - "when": "view == ticode-tiup-cluster && viewItem == clusters" - }, { "command": "ticode.cluster.display", "when": "view == ticode-tiup-cluster && viewItem == cluster-name", diff --git a/scaffold-template/pd/pd.patch b/scaffold-template/pd/pd.patch deleted file mode 100644 index e81cb89..0000000 --- a/scaffold-template/pd/pd.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1206b042010179ddb8bc72c043ff48d8eb801a39 Mon Sep 17 00:00:00 2001 -From: Aylei -Date: Sat, 16 Jan 2021 21:03:53 +0800 -Subject: [PATCH] Scaffold - -Signed-off-by: Aylei ---- - server/api/myapp.go | 26 ++++++++++++++++++++++++++ - server/api/router.go | 2 ++ - 2 files changed, 28 insertions(+) - create mode 100644 server/api/myapp.go - -diff --git a/server/api/myapp.go b/server/api/myapp.go -new file mode 100644 -index 00000000..ff2e241b ---- /dev/null -+++ b/server/api/myapp.go -@@ -0,0 +1,26 @@ -+package api -+ -+import ( -+ "net/http" -+ -+ "github.com/tikv/pd/server" -+ "github.com/unrolled/render" -+) -+ -+type myAppHandler struct { -+ svr *server.Server -+ rd *render.Render -+} -+ -+func newMyAppHandler(svr *server.Server, rd *render.Render) *myAppHandler { -+ return &myAppHandler{ -+ svr: svr, -+ rd: rd, -+ } -+} -+ -+func (h *myAppHandler) ServeHTTP(w http.ResponseWriter, _ *http.Request) { -+ msg := "TODO" -+ h.rd.Data(w, http.StatusOK, []byte(msg)) -+} -+ -diff --git a/server/api/router.go b/server/api/router.go -index e07ebaaf..04ff5b77 100644 ---- a/server/api/router.go -+++ b/server/api/router.go -@@ -174,6 +174,8 @@ func createRouter(ctx context.Context, prefix string, svr *server.Server) *mux.R - apiRouter.Handle("/version", newVersionHandler(rd)).Methods("GET") - apiRouter.Handle("/status", newStatusHandler(svr, rd)).Methods("GET") - -+ apiRouter.Handle("/hack", newMyAppHandler(svr, rd)).Methods("GET") -+ - memberHandler := newMemberHandler(svr, rd) - apiRouter.HandleFunc("/members", memberHandler.ListMembers).Methods("GET") - apiRouter.HandleFunc("/members/name/{name}", memberHandler.DeleteByName).Methods("DELETE") --- -2.27.0 - diff --git a/scaffold-template/tidb/tidb.patch b/scaffold-template/tidb/tidb.patch deleted file mode 100644 index e758b4c..0000000 --- a/scaffold-template/tidb/tidb.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 94adab56d3678842c8373e89d163cecefe443252 Mon Sep 17 00:00:00 2001 -From: Aylei -Date: Sat, 16 Jan 2021 21:01:48 +0800 -Subject: [PATCH] Scaffold - -Signed-off-by: Aylei ---- - server/app_handler.go | 8 ++++++++ - server/http_status.go | 2 ++ - 2 files changed, 10 insertions(+) - create mode 100644 server/app_handler.go - -diff --git a/server/app_handler.go b/server/app_handler.go -new file mode 100644 -index 000000000..56d35e285 ---- /dev/null -+++ b/server/app_handler.go -@@ -0,0 +1,8 @@ -+package server -+ -+import "net/http" -+ -+func MyHandler(w http.ResponseWriter, _ *http.Request) { -+ msg := "TODO" -+ _, _ = w.Write([]byte(msg)) -+} -diff --git a/server/http_status.go b/server/http_status.go -index e18b0423a..5f6ee5973 100644 ---- a/server/http_status.go -+++ b/server/http_status.go -@@ -289,6 +289,8 @@ func (s *Server) startHTTPServer() { - fetcher := sqlInfoFetcher{store: tikvHandlerTool.Store} - serverMux.HandleFunc("/debug/sub-optimal-plan", fetcher.zipInfoForSQL) - -+ serverMux.HandleFunc("/hack", MyHandler) -+ - // failpoint is enabled only for tests so we can add some http APIs here for tests. - failpoint.Inject("enableTestAPI", func() { - serverMux.HandleFunc("/fail/", func(w http.ResponseWriter, r *http.Request) { --- -2.27.0 - diff --git a/scaffold-template/tikv/tikv.patch b/scaffold-template/tikv/tikv.patch deleted file mode 100644 index ec92190..0000000 --- a/scaffold-template/tikv/tikv.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6dd82c05340b3b80ac765e41f1bb7414be8cf094 Mon Sep 17 00:00:00 2001 -From: Aylei -Date: Sat, 16 Jan 2021 21:04:36 +0800 -Subject: [PATCH] Scalffold - -Signed-off-by: Aylei ---- - src/server/status_server/mod.rs | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/server/status_server/mod.rs b/src/server/status_server/mod.rs -index 52391ff07..84fe9f8f2 100644 ---- a/src/server/status_server/mod.rs -+++ b/src/server/status_server/mod.rs -@@ -331,6 +331,11 @@ where - .build() - } - -+ pub async fn my_handler(_req: Request) -> hyper::Result> { -+ let msg = "TODO SCAFFOLD"; -+ Ok(Response::new(Body::from(format!("{}", msg)))) -+ } -+ - pub async fn dump_rsperf_to_resp(req: Request) -> hyper::Result> { - let query = match req.uri().query() { - Some(query) => query, -@@ -747,6 +752,9 @@ where - (Method::GET, "/debug/pprof/profile") => { - Self::dump_rsperf_to_resp(req).await - } -+ (Method::GET, "/hack") => { -+ Self::my_handler(req).await -+ } - (Method::GET, path) if path.starts_with("/region") => { - Self::dump_region_meta(req, router).await - } --- -2.27.0 - diff --git a/src/cluster/provider.ts b/src/cluster/provider.ts index e6c59a4..603418b 100644 --- a/src/cluster/provider.ts +++ b/src/cluster/provider.ts @@ -31,16 +31,6 @@ export class ClusterProvider implements vscode.TreeDataProvider { async getChildren(element?: Item): Promise { const items: Item[] = [] if (element === undefined) { - const item = new Item( - 'clusters', - vscode.TreeItemCollapsibleState.Expanded - ) - item.contextValue = 'clusters' - items.push(item) - return Promise.resolve(items) - } - - if (element.contextValue === 'clusters') { const clusters = await ClusterCommand.listClusters() clusters.forEach((cluster) => { const item = new Item( @@ -52,6 +42,7 @@ export class ClusterProvider implements vscode.TreeDataProvider { item.contextValue = 'cluster-name' items.push(item) }) + return Promise.resolve(items) } if (element.contextValue === 'cluster-name') { const cluster = element.extra as Cluster diff --git a/src/extension.ts b/src/extension.ts index 584ba0b..53f9121 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -118,8 +118,6 @@ export async function activate(context: vscode.ExtensionContext) { // navigation action registerCommand('ticode.cluster.refresh', () => clusterProvider.refresh()), // context menu - registerCommand('ticode.cluster.list', listClusters), - // context menu registerCommand('ticode.cluster.display', (treeItem) => displayClusters(treeItem.label) ), @@ -384,12 +382,6 @@ async function stopPlayground() { } // TiUP Cluster -async function listClusters() { - const uri = vscode.Uri.parse('ticode:list') - const doc = await vscode.workspace.openTextDocument(uri) // calls back into the provider - await vscode.window.showTextDocument(doc, { preview: false }) -} - async function displayClusters(clusterName?: string) { if (clusterName === undefined) { vscode.window.showErrorMessage('cluster name is unknown') From 5b945c0c5df973751ee9e2f4efb6150a5ef0c5c5 Mon Sep 17 00:00:00 2001 From: baurine <2008.hbl@gmail.com> Date: Mon, 5 Apr 2021 23:03:38 +0800 Subject: [PATCH 2/3] update doc --- CHANGELOG.md | 18 ++++++++++++++++-- README.md | 11 ----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d34b9a..82b547e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ All notable changes to the "ticode" extension will be documented in this file. Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. -## [Unreleased] +### 0.3.1 -- Initial release +- Some slight refinements + +### 0.3.0 + +- Support manage virtual machines by vagrant +- Support deploy a cluster + +### 0.2.3 + +- Auto install TiUP if it doesn't install - [#28](https://github.com/dragonly/ticode/pull/28) +- Fix view log in Linux - [#30](https://github.com/dragonly/ticode/pull/30) + +### 0.0.1 + +Initial release diff --git a/README.md b/README.md index f448609..cb7e98f 100644 --- a/README.md +++ b/README.md @@ -127,14 +127,3 @@ Video: https://www.bilibili.com/video/BV12A411H74T/ - [x] Install TiUP - [ ] Upgrade TiUP - -## Release Notes - -### 0.2.3 - -- Auto install TiUP if it doesn't install - [#28](https://github.com/dragonly/ticode/pull/28) -- Fix view log in Linux - [#30](https://github.com/dragonly/ticode/pull/30) - -### 0.0.1 - -Initial release From bff4a1258e8dc1fc3c7ece51f4b488d35a34b544 Mon Sep 17 00:00:00 2001 From: baurine <2008.hbl@gmail.com> Date: Mon, 5 Apr 2021 23:03:58 +0800 Subject: [PATCH 3/3] bump version to 0.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55a9d11..196309c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "description": "make developing TiDB a breeze", "icon": "media/logo.png", - "version": "0.3.0", + "version": "0.3.1", "engines": { "vscode": "^1.52.0" },