From 595e9bbb178c0a3971252a44d51bb88283204c3f Mon Sep 17 00:00:00 2001
From: Matheus Macabu <macabu@users.noreply.github.com>
Date: Tue, 6 May 2025 10:45:54 +0200
Subject: [PATCH] [release-10.4.19] Chore: Fix Enterprise build (#104949)

* Build: Move argcount and flag into util package

* Chore: Run make gen-cue and push changes

* CI: Trigger zizmor
---
 pkg/build/cmd/main.go                        |  5 +++--
 pkg/build/cmd/{ => util}/argcount_wrapper.go |  2 +-
 pkg/build/cmd/util/flags.go                  |  8 ++++++++
 pkg/kindsysreport/codegen/report.json        | 10 ++++------
 4 files changed, 16 insertions(+), 9 deletions(-)
 rename pkg/build/cmd/{ => util}/argcount_wrapper.go (96%)
 create mode 100644 pkg/build/cmd/util/flags.go

diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go
index d207abe020b..f18df683172 100644
--- a/pkg/build/cmd/main.go
+++ b/pkg/build/cmd/main.go
@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/grafana/grafana/pkg/build"
+	"github.com/grafana/grafana/pkg/build/cmd/util"
 	"github.com/urfave/cli/v2"
 )
 
@@ -66,7 +67,7 @@ func main() {
 			Name:      "publish-metrics",
 			Usage:     "Publish a set of metrics from stdin",
 			ArgsUsage: "<api-key>",
-			Action:    MaxArgCountWrapper(1, PublishMetrics),
+			Action:    util.MaxArgCountWrapper(1, PublishMetrics),
 		},
 		{
 			Name:   "verify-drone",
@@ -178,7 +179,7 @@ func main() {
 							Name:      "fetch",
 							Usage:     "Fetch Grafana Docker images",
 							ArgsUsage: "[version]",
-							Action:    MaxArgCountWrapper(1, FetchImages),
+							Action:    util.MaxArgCountWrapper(1, FetchImages),
 							Flags: []cli.Flag{
 								&editionFlag,
 							},
diff --git a/pkg/build/cmd/argcount_wrapper.go b/pkg/build/cmd/util/argcount_wrapper.go
similarity index 96%
rename from pkg/build/cmd/argcount_wrapper.go
rename to pkg/build/cmd/util/argcount_wrapper.go
index 394283e163d..cce3605db62 100644
--- a/pkg/build/cmd/argcount_wrapper.go
+++ b/pkg/build/cmd/util/argcount_wrapper.go
@@ -1,4 +1,4 @@
-package main
+package util
 
 import "github.com/urfave/cli/v2"
 
diff --git a/pkg/build/cmd/util/flags.go b/pkg/build/cmd/util/flags.go
new file mode 100644
index 00000000000..89cb772bdda
--- /dev/null
+++ b/pkg/build/cmd/util/flags.go
@@ -0,0 +1,8 @@
+package util
+
+import "github.com/urfave/cli/v2"
+
+var DryRunFlag = cli.BoolFlag{
+	Name:  "dry-run",
+	Usage: "Only simulate actions",
+}
diff --git a/pkg/kindsysreport/codegen/report.json b/pkg/kindsysreport/codegen/report.json
index a44e34a9472..0904821ddc5 100644
--- a/pkg/kindsysreport/codegen/report.json
+++ b/pkg/kindsysreport/codegen/report.json
@@ -33,9 +33,7 @@
     },
     "alertgroupspanelcfg": {
       "category": "composable",
-      "codeowners": [
-        "grafana/alerting-frontend"
-      ],
+      "codeowners": [],
       "currentVersion": [
         0,
         0
@@ -533,7 +531,7 @@
     "elasticsearchdataquery": {
       "category": "composable",
       "codeowners": [
-        "grafana/observability-logs"
+        "grafana/aws-datasources"
       ],
       "currentVersion": [
         0,
@@ -1249,7 +1247,7 @@
     "parcadataquery": {
       "category": "composable",
       "codeowners": [
-        "grafana/observability-traces-and-profiling"
+        "grafana/oss-big-tent"
       ],
       "currentVersion": [
         0,
@@ -1420,7 +1418,7 @@
     "prometheusdataquery": {
       "category": "composable",
       "codeowners": [
-        "grafana/observability-metrics"
+        "grafana/oss-big-tent"
       ],
       "currentVersion": [
         0,