DatasourceRef: keep uid/type ref when using template variables (#41785)

public/app/features/plugins/datasource_srv.test.ts

@@ -30,7 +30,7 @@ class TestDataSource {
   constructor(public instanceSettings: DataSourceInstanceSettings) {}
 }
 
-jest.mock('../plugin_loader', () => ({
+jest.mock('./plugin_loader', () => ({
   importDataSourcePlugin: (meta: DataSourcePluginMeta) => {
     return Promise.resolve(new DataSourcePlugin(TestDataSource as any));
   },
@@ -128,13 +128,21 @@ describe('datasource_srv', () => {
 
     describe('when getting instance settings', () => {
       it('should work by name or uid', () => {
-        expect(dataSourceSrv.getInstanceSettings('mmm')).toBe(dataSourceSrv.getInstanceSettings('uid-code-mmm'));
+        const ds = dataSourceSrv.getInstanceSettings('mmm');
+        expect(dataSourceSrv.getInstanceSettings('uid-code-mmm')).toBe(ds);
+        expect(dataSourceSrv.getInstanceSettings({ uid: 'uid-code-mmm' })).toBe(ds);
       });
 
       it('should work with variable', () => {
         const ds = dataSourceSrv.getInstanceSettings('${datasource}');
         expect(ds?.name).toBe('${datasource}');
         expect(ds?.uid).toBe('${datasource}');
+        expect(ds?.rawRef).toMatchInlineSnapshot(`
+          Object {
+            "type": "test-db",
+            "uid": "uid-code-BBB",
+          }
+        `);
       });
 
       it('should not set isDefault when being fetched via variable', () => {
@@ -146,6 +154,12 @@ describe('datasource_srv', () => {
         const ds = dataSourceSrv.getInstanceSettings('${datasourceDefault}');
         expect(ds?.name).toBe('${datasourceDefault}');
         expect(ds?.uid).toBe('${datasourceDefault}');
+        expect(ds?.rawRef).toMatchInlineSnapshot(`
+          Object {
+            "type": "test-db",
+            "uid": "uid-code-BBB",
+          }
+        `);
       });
     });
 

public/app/features/plugins/datasource_srv.ts

@@ -101,6 +101,7 @@ export class DatasourceSrv implements DataSourceService {
         isDefault: false,
         name: nameOrUid,
         uid: nameOrUid,
+        rawRef: { type: dsSettings.type, uid: dsSettings.uid },
       };
     }
 

public/app/features/query/state/PanelQueryRunner.test.ts

@@ -114,6 +114,7 @@ function describeQueryRunnerScenario(
           ctx.queryCalledWith = options;
           return Promise.resolve(response);
         },
+        getRef: () => ({ type: 'test', uid: 'TestDB-uid' }),
         testDatasource: jest.fn(),
       };
 

public/app/features/query/state/PanelQueryRunner.ts

@@ -235,7 +235,7 @@ export class PanelQueryRunner {
       // Attach the data source name to each query
       request.targets = request.targets.map((query) => {
         if (!query.datasource) {
-          query.datasource = { uid: ds.uid };
+          query.datasource = ds.getRef();
         }
         return query;
       });