feat(dashboardapi): walking skeleton for graph-aware Grafana generator (#34)
Encrypts the Grafana bearer token via Node-RED credentials block instead of plain config (F-11). Adds folderUid config field threaded through to the buildUpsertRequest payload (F-8, resolves PRD O-5). Migration path: legacy plain bearerToken still loads, with one-time warn() prompting user to re-save. Composition + URL + headers + per-instance UID were already in place; only the credentials + folderUid + tests are new. - dashboardAPI.html: bearerToken moved to credentials block; folderUid added. - dashboardAPI.js: registerType options pass credentials descriptor. - src/nodeClass.js: read token from node.credentials; legacy fallback warns. - src/specificClass.js: buildUpsertRequest emits folderUid when set. - src/commands/handlers.js: pass folderUid from config to buildUpsertRequest. - test/basic/slice34-credentials-and-folder.basic.test.js: 5 new tests. Diff-based regeneration (F-1) and the explicit flows:started lifecycle hook land in #36 once the S1 spike predicate is wired. Until then, the existing child.register message trigger continues to drive composition on every startup-time child registration. Closes #34
This commit is contained in:
@@ -48,7 +48,7 @@ function registerChild(source, msg, ctx) {
|
||||
headers,
|
||||
payload: source.buildUpsertRequest({
|
||||
dashboard: dash.dashboard,
|
||||
folderId: 0,
|
||||
folderUid: source.config?.grafanaConnector?.folderUid || undefined,
|
||||
overwrite: true,
|
||||
}),
|
||||
meta: {
|
||||
|
||||
@@ -30,6 +30,18 @@ class nodeClass {
|
||||
|
||||
_buildConfig(uiConfig) {
|
||||
const cfgMgr = new configManager();
|
||||
// Credentials block (Node-RED encrypts at rest in flow_cred.json). Legacy
|
||||
// installs may still carry bearerToken on uiConfig — fall back with a
|
||||
// one-time deprecation warning so the user knows to re-save.
|
||||
const credentialToken = this.node?.credentials?.bearerToken || '';
|
||||
const legacyToken = uiConfig.bearerToken || '';
|
||||
if (!credentialToken && legacyToken) {
|
||||
this.RED?.log?.warn?.(
|
||||
`[${this.name}] bearer token loaded from legacy plain config field. ` +
|
||||
`Re-open this node in the editor and click Done to migrate to encrypted credentials.`
|
||||
);
|
||||
}
|
||||
const bearerToken = credentialToken || legacyToken;
|
||||
return cfgMgr.buildConfig(this.name, uiConfig, this.node.id, {
|
||||
functionality: {
|
||||
softwareType: this.name.toLowerCase(),
|
||||
@@ -39,7 +51,8 @@ class nodeClass {
|
||||
protocol: uiConfig.protocol || 'http',
|
||||
host: uiConfig.host || 'localhost',
|
||||
port: Number(uiConfig.port || 3000),
|
||||
bearerToken: uiConfig.bearerToken || '',
|
||||
bearerToken,
|
||||
folderUid: uiConfig.folderUid || '',
|
||||
},
|
||||
defaultBucket: uiConfig.defaultBucket || process.env.INFLUXDB_BUCKET || '',
|
||||
});
|
||||
|
||||
@@ -64,6 +64,7 @@ class DashboardApi {
|
||||
host: config?.grafanaConnector?.host || 'localhost',
|
||||
port: Number(config?.grafanaConnector?.port || 3000),
|
||||
bearerToken: config?.grafanaConnector?.bearerToken || '',
|
||||
folderUid: config?.grafanaConnector?.folderUid || '',
|
||||
},
|
||||
defaultBucket: config?.defaultBucket || '',
|
||||
bucketMap: config?.bucketMap || {},
|
||||
@@ -144,8 +145,13 @@ class DashboardApi {
|
||||
return { dashboard, uid, title, softwareType, nodeId, measurementName };
|
||||
}
|
||||
|
||||
buildUpsertRequest({ dashboard, folderId = 0, overwrite = true }) {
|
||||
return { dashboard, folderId, overwrite };
|
||||
buildUpsertRequest({ dashboard, folderId, folderUid, overwrite = true }) {
|
||||
const out = { dashboard, overwrite };
|
||||
// Prefer folderUid (modern Grafana API). Fall back to folderId for older callers.
|
||||
const uid = folderUid ?? this.config?.grafanaConnector?.folderUid ?? '';
|
||||
if (uid) out.folderUid = uid;
|
||||
else if (typeof folderId === 'number') out.folderId = folderId;
|
||||
return out;
|
||||
}
|
||||
|
||||
extractChildren(nodeSource) {
|
||||
|
||||
Reference in New Issue
Block a user