From 395c74b585c88356cf8c49400d6b5a64cb033fd4 Mon Sep 17 00:00:00 2001
From: Michael Mandrus <michael.mandrus@grafana.com>
Date: Tue, 31 Jan 2023 08:51:23 -0500
Subject: [PATCH] move caching config to the right place in the ds info

---
 packages/grafana-data/src/types/datasource.ts       | 13 +++++--------
 pkg/api/frontendsettings.go                         |  4 ++--
 pkg/plugins/models.go                               |  4 ++--
 .../components/PanelEditor/PanelEditorQueries.tsx   |  2 +-
 .../features/query/components/QueryGroupOptions.tsx |  4 ++--
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index cdcb722c8ca..4da86b39889 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -133,6 +133,7 @@ export interface DataSourcePluginMeta<T extends KeyValue = {}> extends PluginMet
   hasQueryHelp?: boolean;
   category?: string;
   queryOptions?: PluginMetaQueryOptions;
+  cachingConfig?: PluginQueryCachingConfig;
   sort?: number;
   streaming?: boolean;
   unlicensed?: boolean;
@@ -145,6 +146,10 @@ interface PluginMetaQueryOptions {
   maxDataPoints?: boolean;
   minInterval?: boolean;
 }
+/**
+ * Information about the datasource's query caching configuration
+ * When the caching feature is disabled, this config will always be falsy
+ */
 interface PluginQueryCachingConfig {
   enabled?: boolean;
   TTLMs?: number;
@@ -229,7 +234,6 @@ abstract class DataSourceApi<
     this.id = instanceSettings.id;
     this.type = instanceSettings.type;
     this.meta = instanceSettings.meta;
-    this.cachingConfig = instanceSettings.cachingConfig;
     this.uid = instanceSettings.uid;
   }
 
@@ -307,12 +311,6 @@ abstract class DataSourceApi<
    */
   meta: DataSourcePluginMeta;
 
-  /**
-   * Information about the datasource's query caching configuration
-   * When the caching feature is disabled, this config will always be empty
-   */
-  cachingConfig?: PluginQueryCachingConfig;
-
   /**
    * Used by alerting to check if query contains template variables
    */
@@ -599,7 +597,6 @@ export interface DataSourceInstanceSettings<T extends DataSourceJsonData = DataS
   type: string;
   name: string;
   meta: DataSourcePluginMeta;
-  cachingConfig?: PluginQueryCachingConfig;
   readOnly: boolean;
   url?: string;
   jsonData: T;
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 791cc38a893..02c27b33fd1 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -358,7 +358,7 @@ func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, enabledPlugin
 		}
 
 		if cfg, ok := cacheCfgs[dsDTO.UID]; ok {
-			dsDTO.EnterpriseCachingConfig = cfg
+			dsDTO.PluginMeta.EnterpriseCachingConfig = cfg
 		}
 
 		dataSources[ds.Name] = dsDTO
@@ -385,7 +385,7 @@ func (hs *HTTPServer) getFSDataSources(c *contextmodel.ReqContext, enabledPlugin
 			}
 
 			if cfg, ok := cacheCfgs[dto.UID]; ok {
-				dto.EnterpriseCachingConfig = cfg
+				dto.PluginMeta.EnterpriseCachingConfig = cfg
 			}
 
 			dataSources[ds.Name] = dto
diff --git a/pkg/plugins/models.go b/pkg/plugins/models.go
index 12fa003a522..a63e5c4bfec 100644
--- a/pkg/plugins/models.go
+++ b/pkg/plugins/models.go
@@ -208,6 +208,8 @@ type PluginMetaDTO struct {
 
 	Module  string `json:"module"`
 	BaseURL string `json:"baseUrl"`
+
+	EnterpriseCachingConfig querycaching.CacheConfig `json:"cachingConfig,omitempty"`
 }
 
 type DataSourceDTO struct {
@@ -227,8 +229,6 @@ type DataSourceDTO struct {
 	BasicAuth       string `json:"basicAuth,omitempty"`
 	WithCredentials bool   `json:"withCredentials,omitempty"`
 
-	EnterpriseCachingConfig querycaching.CacheConfig `json:"cachingConfig,omitempty"`
-
 	// InfluxDB
 	Username string `json:"username,omitempty"`
 	Password string `json:"password,omitempty"`
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx b/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx
index 28bf9147077..af963c29018 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelEditorQueries.tsx
@@ -33,7 +33,7 @@ export class PanelEditorQueries extends PureComponent<Props> {
         type: datasourceSettings?.type,
         uid: datasourceSettings?.uid,
       },
-      queryCachingTTL: datasourceSettings?.cachingConfig?.enabled ? panel.queryCachingTTL : undefined,
+      queryCachingTTL: datasourceSettings?.meta.cachingConfig?.enabled ? panel.queryCachingTTL : undefined,
       queries: panel.targets,
       maxDataPoints: panel.maxDataPoints,
       minInterval: panel.interval,
diff --git a/public/app/features/query/components/QueryGroupOptions.tsx b/public/app/features/query/components/QueryGroupOptions.tsx
index e73fdf31677..5107e2fad9f 100644
--- a/public/app/features/query/components/QueryGroupOptions.tsx
+++ b/public/app/features/query/components/QueryGroupOptions.tsx
@@ -188,7 +188,7 @@ export class QueryGroupOptionsEditor extends PureComponent<Props, State> {
 
     const tooltip = `Cache time-to-live: How long results from this queries in this panel will be cached, in milliseconds. Defaults to the TTL in the caching configuration for this datasource.`;
 
-    if (!dataSource.cachingConfig?.enabled) {
+    if (!dataSource.meta.cachingConfig?.enabled) {
       return null;
     }
 
@@ -201,7 +201,7 @@ export class QueryGroupOptionsEditor extends PureComponent<Props, State> {
           <Input
             type="number"
             className="width-6"
-            placeholder={`${dataSource.cachingConfig.TTLMs}`}
+            placeholder={`${dataSource.meta.cachingConfig.TTLMs}`}
             spellCheck={false}
             onBlur={this.onQueryCachingTTLBlur}
             defaultValue={options.queryCachingTTL ?? undefined}