From 617695d64008f62202b1aff325ab4dc1feb58169 Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Thu, 18 Sep 2025 19:34:13 +0200 Subject: [PATCH 1/2] chore: move frontend to distroless Signed-off-by: Miguel Martinez --- app/cli/cmd/root.go | 3 +-- app/cli/main.go | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/cli/cmd/root.go b/app/cli/cmd/root.go index 05a10d0c5..e694142cc 100644 --- a/app/cli/cmd/root.go +++ b/app/cli/cmd/root.go @@ -72,8 +72,7 @@ var telemetryWg sync.WaitGroup // Environment variable prefix for vipers const envPrefix = "CHAINLOOP" -func Execute(l zerolog.Logger) error { - rootCmd := NewRootCmd(l) +func Execute(rootCmd *cobra.Command, l zerolog.Logger) error { if err := rootCmd.Execute(); err != nil { // The local file is pointing to the wrong organization, we remove it if v1.IsUserNotMemberOfOrgErrorNotInOrg(err) { diff --git a/app/cli/main.go b/app/cli/main.go index ca1b95407..638d76859 100644 --- a/app/cli/main.go +++ b/app/cli/main.go @@ -1,5 +1,5 @@ // -// Copyright 2023 The Chainloop Authors. +// Copyright 2023-2025 The Chainloop Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -34,9 +34,9 @@ import ( func main() { // Couldn't find an easier way to disable the timestamp logger := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr, FormatTimestamp: func(interface{}) string { return "" }}) - + rootCmd := cmd.NewRootCmd(logger) // Run the command - if err := cmd.Execute(logger); err != nil { + if err := cmd.Execute(rootCmd, logger); err != nil { msg, exitCode := errorInfo(err, logger) logger.Error().Msg(msg) os.Exit(exitCode) From 9e2d3a15b88d4a1f1dd417d3d5fc9879c49cae39 Mon Sep 17 00:00:00 2001 From: Miguel Martinez Date: Fri, 19 Sep 2025 09:42:56 +0200 Subject: [PATCH 2/2] fix linter Signed-off-by: Miguel Martinez --- app/cli/cmd/root.go | 2 +- app/cli/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/cli/cmd/root.go b/app/cli/cmd/root.go index e694142cc..45c53d2ab 100644 --- a/app/cli/cmd/root.go +++ b/app/cli/cmd/root.go @@ -72,7 +72,7 @@ var telemetryWg sync.WaitGroup // Environment variable prefix for vipers const envPrefix = "CHAINLOOP" -func Execute(rootCmd *cobra.Command, l zerolog.Logger) error { +func Execute(rootCmd *cobra.Command) error { if err := rootCmd.Execute(); err != nil { // The local file is pointing to the wrong organization, we remove it if v1.IsUserNotMemberOfOrgErrorNotInOrg(err) { diff --git a/app/cli/main.go b/app/cli/main.go index 638d76859..bbaf98712 100644 --- a/app/cli/main.go +++ b/app/cli/main.go @@ -36,7 +36,7 @@ func main() { logger := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr, FormatTimestamp: func(interface{}) string { return "" }}) rootCmd := cmd.NewRootCmd(logger) // Run the command - if err := cmd.Execute(rootCmd, logger); err != nil { + if err := cmd.Execute(rootCmd); err != nil { msg, exitCode := errorInfo(err, logger) logger.Error().Msg(msg) os.Exit(exitCode)