Regex fix (#262)

* excepion when not set full vars

* v5.1.1

Author: Mattia Moretti

package.json

@@ -1,7 +1,7 @@
 {
   "name": "oci-metrics-datasource",
   "private": true,
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

src/datasource.ts

@@ -111,10 +111,18 @@ export class OCIDataSource extends DataSourceWithBackend<OCIQuery, OCIDataSource
   interpolateProps<T extends Record<string, any>>(object: T, scopedVars: ScopedVars = {}): T {
     const templateSrv = getTemplateSrv();
     return Object.entries(object).reduce((acc, [key, value]) => {
-      return {
-        ...acc,
-        [key]: value && isString(value) ? templateSrv.replace(value, scopedVars) : value,
-      };
+      if (key === "compartment"){
+        return {
+          ...acc,
+          [key]: value && isString(value) ? templateSrv.replace(value, scopedVars, this.compartmentFormatter) : value,
+        };        
+      } else {
+        return {
+          ...acc,
+          [key]: value && isString(value) ? templateSrv.replace(value, scopedVars) : value,
+        };
+      }
+
     }, {} as T);
   }
 

src/plugin.json

@@ -23,8 +23,8 @@
       },
       { "name": "UPL", "url": "https://oss.oracle.com/licenses/upl" }
     ],
-    "version": "5.1.0",
-    "updated": "2024-03-07",
+    "version": "5.1.1",
+    "updated": "2024-03-08",
     "screenshots":[
       {
         "name":"OCI Metrics Dashboard",