move collectoSupportBundle query to go (#875)

* move collectoSupportBundle query to go
replicatedhq · Jul 28, 2020 · 323af55 · 323af55
1 parent d3bfe55
commit 323af55
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 15 deletions.
diff --git a/kotsadm/pkg/apiserver/server.go b/kotsadm/pkg/apiserver/server.go
@@ -73,6 +73,7 @@ func Start() {
 	r.Path("/api/v1/troubleshoot/supportbundle/{bundleId}/redactions").Methods("OPTIONS", "GET").HandlerFunc(handlers.GetSupportBundleRedactions)
 	r.Path("/api/v1/troubleshoot/supportbundle/{bundleId}/redactions").Methods("PUT").HandlerFunc(handlers.SetSupportBundleRedactions)
 	r.Path("/api/v1/troubleshoot/supportbundle/{bundleId}/download").Methods("OPTIONS", "GET").HandlerFunc(handlers.DownloadSupportBundle)
+	r.Path("/api/v1/troubleshoot/supportbundle/app/{appId}/cluster/{clusterId}/collect").Methods("OPTIONS", "POST").HandlerFunc(handlers.CollectSupportBundle)
 	r.Path("/api/v1/troubleshoot/analyzebundle/{bundleId}").Methods("POST").HandlerFunc(handlers.NodeProxy(upstream))
 
 	// redactor routes

diff --git a/kotsadm/pkg/handlers/troubleshoot.go b/kotsadm/pkg/handlers/troubleshoot.go
@@ -298,6 +298,36 @@ func DownloadSupportBundle(w http.ResponseWriter, r *http.Request) {
 	io.Copy(w, f)
 }
 
+func CollectSupportBundle(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Access-Control-Allow-Headers", "content-type, origin, accept, authorization")
+
+	if r.Method == "OPTIONS" {
+		w.WriteHeader(200)
+		return
+	}
+
+	if err := requireValidSession(w, r); err != nil {
+		logger.Error(err)
+		return
+	}
+
+	a, err := app.Get(mux.Vars(r)["appId"])
+	if err != nil {
+		logger.Error(err)
+		w.WriteHeader(500)
+		return
+	}
+
+	if err := supportbundle.Collect(a.ID, mux.Vars(r)["clusterId"]); err != nil {
+		logger.Error(err)
+		w.WriteHeader(500)
+		return
+	}
+
+	JSON(w, 204, "")
+}
+
 func UploadSupportBundle(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	w.Header().Set("Access-Control-Allow-Headers", "content-type, origin, accept, authorization")

diff --git a/kotsadm/pkg/supportbundle/supportbundle.go b/kotsadm/pkg/supportbundle/supportbundle.go
@@ -98,6 +98,20 @@ func Get(id string) (*types.SupportBundle, error) {
 	return s, nil
 }
 
+func Collect(appID string, clusterID string) error {
+	db := persistence.MustGetPGSession()
+	query := `insert into pending_supportbundle (id, app_id, cluster_id, created_at) values ($1, $2, $3, $4)`
+
+	id := ksuid.New().String()
+
+	_, err := db.Exec(query, id, appID, clusterID, time.Now())
+	if err != nil {
+		return errors.Wrap(err, "failed to insert support bundle")
+	}
+
+	return nil
+}
+
 func CreateBundle(requestedID string, appID string, archivePath string) (*types.SupportBundle, error) {
 	fi, err := os.Stat(archivePath)
 	if err != nil {

diff --git a/kotsadm/web/src/components/troubleshoot/GenerateSupportBundle.jsx b/kotsadm/web/src/components/troubleshoot/GenerateSupportBundle.jsx
@@ -1,14 +1,12 @@
 import * as React from "react";
 import Helmet from "react-helmet";
 import { withRouter, Link } from "react-router-dom";
-import { compose, withApollo, graphql } from "react-apollo";
 import Modal from "react-modal";
 
 import Loader from "../shared/Loader";
 import CodeSnippet from "@src/components/shared/CodeSnippet";
 import UploadSupportBundleModal from "../troubleshoot/UploadSupportBundleModal";
 import ConfigureRedactorsModal from "./ConfigureRedactorsModal";
-import { collectSupportBundle } from "../../mutations/TroubleshootMutations";
 import { Utilities } from "../../utilities/utilities";
 import { Repeater } from "../../utilities/repeater";
 
@@ -147,6 +145,7 @@ class GenerateSupportBundle extends React.Component {
 
   collectBundle = (clusterId) => {
     const { watch } = this.props;
+
     this.setState({
       isGeneratingBundle: true,
     });
@@ -155,11 +154,20 @@ class GenerateSupportBundle extends React.Component {
       bundle.id
     });
 
-    this.props.collectSupportBundle(watch.id, clusterId);
-
-    setTimeout(() => {
-      this.redirectOnNewBundle(currentBundles);
-    }, 1000);
+    fetch(`${window.env.API_ENDPOINT}/troubleshoot/supportbundle/app/${watch?.id}/cluster/${clusterId}/collect`, {
+      headers: {
+        "Authorization": Utilities.getToken(),
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+    })
+      .then(() => {
+        this.redirectOnNewBundle(currentBundles);
+      })
+      .catch((err) => {
+        console.log(err);
+        this.setState({ isGeneratingBundle: false });
+      });
   }
 
   redirectOnNewBundle(currentBundles) {
@@ -275,11 +283,4 @@ class GenerateSupportBundle extends React.Component {
   }
 }
 
-export default withRouter(compose(
-  withApollo,
-  graphql(collectSupportBundle, {
-    props: ({ mutate }) => ({
-      collectSupportBundle: (appId, clusterId) => mutate({ variables: { appId, clusterId } })
-    })
-  }),
-)(GenerateSupportBundle));
+export default withRouter(GenerateSupportBundle);