Merge pull request #2280 from replicatedhq/divolgin/expired

Show license expired error when sharing bundles
replicatedhq · Oct 29, 2021 · 93c195d · 93c195d
2 parents 42e6ef4 + e7be9ac
commit 93c195d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/handlers/troubleshoot.go b/pkg/handlers/troubleshoot.go
@@ -401,7 +401,7 @@ func (h *Handler) ShareSupportBundle(w http.ResponseWriter, r *http.Request) {
 		} else {
 			logger.Errorf("Failed to share support bundle: %d", resp.StatusCode)
 		}
-		JSON(w, http.StatusInternalServerError, nil)
+		JSON(w, http.StatusInternalServerError, string(body))
 		return
 	}
 

diff --git a/web/src/components/troubleshoot/SupportBundleAnalysis.jsx b/web/src/components/troubleshoot/SupportBundleAnalysis.jsx
@@ -45,7 +45,12 @@ export class SupportBundleAnalysis extends React.Component {
     })
       .then(async (result) => {
         if (!result.ok) {
-          this.setState({ sendingBundle: false, sendingBundleErrMsg: `Unable to send bundle to vendor: Status ${result.status}, please try again.` });
+          const text = await result.text();
+          let msg = `Unable to send bundle to vendor: Status ${result.status}, please try again.`;
+          if (text) {
+            msg = `Unable to send bundle to vendor: ${text}`;
+          }
+          this.setState({ sendingBundle: false, sendingBundleErrMsg: msg });
           return;
         }
         await this.getSupportBundle();