From 1194da0d04368e4ae1c4ed38d6c2e3c23290bb13 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Wed, 31 Oct 2018 10:55:47 +0100
Subject: [PATCH] stackdriver: remove not used func. wrap query in exception

---
 .../stackdriver/StackdriverMetricFindQuery.ts | 64 +++++++------------
 1 file changed, 23 insertions(+), 41 deletions(-)

diff --git a/public/app/plugins/datasource/stackdriver/StackdriverMetricFindQuery.ts b/public/app/plugins/datasource/stackdriver/StackdriverMetricFindQuery.ts
index e94fa0f24eb..6771aeb13e5 100644
--- a/public/app/plugins/datasource/stackdriver/StackdriverMetricFindQuery.ts
+++ b/public/app/plugins/datasource/stackdriver/StackdriverMetricFindQuery.ts
@@ -13,24 +13,29 @@ export default class StackdriverMetricFindQuery {
   constructor(private datasource) {}
 
   async query(query: any) {
-    switch (query.type) {
-      case MetricFindQueryTypes.Services:
-        return this.handleServiceQuery();
-      case MetricFindQueryTypes.MetricTypes:
-        return this.handleMetricTypesQuery(query);
-      case MetricFindQueryTypes.MetricLabels:
-      case MetricFindQueryTypes.ResourceLabels:
-        return this.handleLabelQuery(query);
-      case MetricFindQueryTypes.ResourceTypes:
-        return this.handleResourceTypeQuery(query);
-      case MetricFindQueryTypes.Alignerns:
-        return this.handleAlignersQuery(query);
-      case MetricFindQueryTypes.AlignmentPeriods:
-        return this.handleAlignmentPeriodQuery();
-      case MetricFindQueryTypes.Aggregations:
-        return this.handleAggregationQuery(query);
-      default:
-        return [];
+    try {
+      switch (query.type) {
+        case MetricFindQueryTypes.Services:
+          return this.handleServiceQuery();
+        case MetricFindQueryTypes.MetricTypes:
+          return this.handleMetricTypesQuery(query);
+        case MetricFindQueryTypes.MetricLabels:
+        case MetricFindQueryTypes.ResourceLabels:
+          return this.handleLabelQuery(query);
+        case MetricFindQueryTypes.ResourceTypes:
+          return this.handleResourceTypeQuery(query);
+        case MetricFindQueryTypes.Alignerns:
+          return this.handleAlignersQuery(query);
+        case MetricFindQueryTypes.AlignmentPeriods:
+          return this.handleAlignmentPeriodQuery();
+        case MetricFindQueryTypes.Aggregations:
+          return this.handleAggregationQuery(query);
+        default:
+          return [];
+      }
+    } catch (error) {
+      console.error(`Could not run StackdriverMetricFindQuery ${query}`, error);
+      return [];
     }
   }
 
@@ -60,7 +65,6 @@ export default class StackdriverMetricFindQuery {
     if (!metricType) {
       return [];
     }
-    // const key = this.getLabelKey({ type });
     const refId = 'handleLabelsQueryType';
     const response = await this.datasource.getLabels(metricType, refId);
     if (!has(response, `meta.${type}.${labelKey}`)) {
@@ -107,26 +111,4 @@ export default class StackdriverMetricFindQuery {
   toFindQueryResult(x) {
     return isString(x) ? { text: x, expandable: true } : { ...x, expandable: true };
   }
-
-  getLabelKey({ type, metricLabelKey, resourceLabelKey }) {
-    //   switch (type) {
-    //     case MetricFindQueryTypes.MetricLabels:
-    //       return metricLabelKey;
-    //       break;
-    //     case MetricFindQueryTypes.ResourceLabels:
-    //       return resourceLabelKey;
-    //     default:
-    //       return '';
-    //   }
-    // }
-    switch (type) {
-      case MetricFindQueryTypes.MetricLabels:
-        return 'metricLabels';
-        break;
-      case MetricFindQueryTypes.ResourceLabels:
-        return 'resourceLabels';
-      default:
-        return '';
-    }
-  }
 }