[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
This commit is contained in:
@@ -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,
|
||||
},
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package main
|
||||
package util
|
||||
|
||||
import "github.com/urfave/cli/v2"
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
package util
|
||||
|
||||
import "github.com/urfave/cli/v2"
|
||||
|
||||
var DryRunFlag = cli.BoolFlag{
|
||||
Name: "dry-run",
|
||||
Usage: "Only simulate actions",
|
||||
}
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user