lint

grafana · Feb 16, 2024 · 11bb9fd · 11bb9fd
1 parent 1221f5d
commit 11bb9fd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/pkg/flow/internal/controller/loader.go b/pkg/flow/internal/controller/loader.go
@@ -341,7 +341,7 @@ func (l *Loader) populateDeclareNodes(g *dag.Graph, declareBlocks []*ast.BlockSt
 	var diags diag.Diagnostics
 	l.declareNodes = map[string]*DeclareNode{}
 	for _, declareBlock := range declareBlocks {
-		if declareBlock.Label == "declare" {
+		if declareBlock.Label == declareType {
 			diags.Add(diag.Diagnostic{
 				Severity: diag.SeverityLevelError,
 				Message:  "'declare' is not a valid label for a declare block",
@@ -857,7 +857,7 @@ func (l *Loader) collectCustomComponentReferences(stmts ast.Body, uniqueReferenc
 		)
 
 		switch {
-		case componentName == "declare":
+		case componentName == declareType:
 			l.collectCustomComponentReferences(blockStmt.Body, uniqueReferences)
 		case foundDeclare:
 			uniqueReferences[declareNode] = struct{}{}

diff --git a/pkg/flow/internal/controller/node_config_import.go b/pkg/flow/internal/controller/node_config_import.go
@@ -237,7 +237,7 @@ func (cn *ImportConfigNode) processImportedContent(content *ast.File) error {
 
 		componentName := strings.Join(blockStmt.Name, ".")
 		switch componentName {
-		case "declare":
+		case declareType:
 			cn.processDeclareBlock(blockStmt)
 		case importsource.BlockImportFile, importsource.BlockImportString: // TODO: add other import sources
 			err := cn.processImportBlock(blockStmt, componentName)
@@ -332,7 +332,7 @@ func (cn *ImportConfigNode) Run(ctx context.Context) error {
 		return runner.ApplyTasks(newCtx, tasks)
 	}
 
-	updateTasks()
+	errChan <- updateTasks()
 
 	go func() {
 		errChan <- cn.source.Run(newCtx)

diff --git a/pkg/flow/internal/controller/node_declare.go b/pkg/flow/internal/controller/node_declare.go
@@ -15,6 +15,8 @@ type DeclareNode struct {
 
 var _ BlockNode = (*DeclareNode)(nil)
 
+const declareType = "declare"
+
 // NewDeclareNode creates a new declare node with a content which will be loaded by custom components.
 func NewDeclareNode(block *ast.BlockStmt) *DeclareNode {
 	return &DeclareNode{