Skip to content

Commit 4592142

Browse files
Add debug error logs (#217)
* add error debug logs to clients * add error debug logs to refreshToken * add error debug logs to label fetching * Update internal/pkg/services/argus/client/client.go Co-authored-by: Vicente Pinto <vicente.pinto@freiheit.com> * Update internal/pkg/services/argus/client/client.go Co-authored-by: Vicente Pinto <vicente.pinto@freiheit.com> * add error debug logs to flag conversions * add printer to argus grafana commands * add debug log to getBearerToken function * fix debug messages on clients * Update internal/pkg/flags/flag_to_value.go Co-authored-by: Vicente Pinto <vicente.pinto@freiheit.com> * remove obsolete err from the debug messages * make printer first parameter * add printer to new argus commands * Update internal/pkg/auth/user_token_flow.go Co-authored-by: Vicente Pinto <vicente.pinto@freiheit.com> * Update internal/cmd/root.go Co-authored-by: Vicente Pinto <vicente.pinto@freiheit.com> * fix linting problem * add string formatting to the printer debug function * set source in log handler to false --------- Co-authored-by: Vicente Pinto <vicente.pinto@freiheit.com>
1 parent e400797 commit 4592142

File tree

345 files changed

+1307
-1141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

345 files changed

+1307
-1141
lines changed

internal/cmd/argus/grafana/describe/describe.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
5353
),
5454
RunE: func(cmd *cobra.Command, args []string) error {
5555
ctx := context.Background()
56-
model, err := parseInput(cmd, args)
56+
model, err := parseInput(p, cmd, args)
57+
5758
if err != nil {
5859
return err
5960
}
@@ -86,18 +87,18 @@ func configureFlags(cmd *cobra.Command) {
8687
cmd.Flags().Bool(hidePasswordFlag, false, `Show the initial admin password in the "pretty" output format`)
8788
}
8889

89-
func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
90+
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
9091
instanceId := inputArgs[0]
92+
globalFlags := globalflags.Parse(p, cmd)
9193

92-
globalFlags := globalflags.Parse(cmd)
9394
if globalFlags.ProjectId == "" {
9495
return nil, &errors.ProjectIdError{}
9596
}
9697

9798
return &inputModel{
9899
GlobalFlagModel: globalFlags,
99100
InstanceId: instanceId,
100-
HidePassword: flags.FlagToBoolValue(cmd, hidePasswordFlag),
101+
HidePassword: flags.FlagToBoolValue(p, cmd, hidePasswordFlag),
101102
}, nil
102103
}
103104

internal/cmd/argus/grafana/describe/describe_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ func TestParseInput(t *testing.T) {
199199
t.Fatalf("error validating flags: %v", err)
200200
}
201201

202-
model, err := parseInput(cmd, tt.argValues)
202+
model, err := parseInput(nil, cmd, tt.argValues)
203+
203204
if err != nil {
204205
if !tt.isValid {
205206
return

internal/cmd/argus/grafana/public-read-access/disable/disable.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
4242
),
4343
RunE: func(cmd *cobra.Command, args []string) error {
4444
ctx := context.Background()
45-
model, err := parseInput(cmd, args)
45+
model, err := parseInput(p, cmd, args)
4646
if err != nil {
4747
return err
4848
}
@@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
8383
return cmd
8484
}
8585

86-
func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
86+
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
8787
instanceId := inputArgs[0]
8888

89-
globalFlags := globalflags.Parse(cmd)
89+
globalFlags := globalflags.Parse(p, cmd)
9090
if globalFlags.ProjectId == "" {
9191
return nil, &errors.ProjectIdError{}
9292
}

internal/cmd/argus/grafana/public-read-access/disable/disable_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
216216
t.Fatalf("error validating flags: %v", err)
217217
}
218218

219-
model, err := parseInput(cmd, tt.argValues)
219+
model, err := parseInput(nil, cmd, tt.argValues)
220220
if err != nil {
221221
if !tt.isValid {
222222
return

internal/cmd/argus/grafana/public-read-access/enable/enable.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
4242
),
4343
RunE: func(cmd *cobra.Command, args []string) error {
4444
ctx := context.Background()
45-
model, err := parseInput(cmd, args)
45+
model, err := parseInput(p, cmd, args)
4646
if err != nil {
4747
return err
4848
}
@@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
8383
return cmd
8484
}
8585

86-
func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
86+
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
8787
instanceId := inputArgs[0]
8888

89-
globalFlags := globalflags.Parse(cmd)
89+
globalFlags := globalflags.Parse(p, cmd)
9090
if globalFlags.ProjectId == "" {
9191
return nil, &errors.ProjectIdError{}
9292
}

internal/cmd/argus/grafana/public-read-access/enable/enable_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
216216
t.Fatalf("error validating flags: %v", err)
217217
}
218218

219-
model, err := parseInput(cmd, tt.argValues)
219+
model, err := parseInput(nil, cmd, tt.argValues)
220220
if err != nil {
221221
if !tt.isValid {
222222
return

internal/cmd/argus/grafana/single-sign-on/disable/disable.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
4242
),
4343
RunE: func(cmd *cobra.Command, args []string) error {
4444
ctx := context.Background()
45-
model, err := parseInput(cmd, args)
45+
model, err := parseInput(p, cmd, args)
4646
if err != nil {
4747
return err
4848
}
@@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
8383
return cmd
8484
}
8585

86-
func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
86+
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
8787
instanceId := inputArgs[0]
8888

89-
globalFlags := globalflags.Parse(cmd)
89+
globalFlags := globalflags.Parse(p, cmd)
9090
if globalFlags.ProjectId == "" {
9191
return nil, &errors.ProjectIdError{}
9292
}

internal/cmd/argus/grafana/single-sign-on/disable/disable_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
216216
t.Fatalf("error validating flags: %v", err)
217217
}
218218

219-
model, err := parseInput(cmd, tt.argValues)
219+
model, err := parseInput(nil, cmd, tt.argValues)
220220
if err != nil {
221221
if !tt.isValid {
222222
return

internal/cmd/argus/grafana/single-sign-on/enable/enable.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
4242
),
4343
RunE: func(cmd *cobra.Command, args []string) error {
4444
ctx := context.Background()
45-
model, err := parseInput(cmd, args)
45+
model, err := parseInput(p, cmd, args)
4646
if err != nil {
4747
return err
4848
}
@@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
8383
return cmd
8484
}
8585

86-
func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
86+
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
8787
instanceId := inputArgs[0]
8888

89-
globalFlags := globalflags.Parse(cmd)
89+
globalFlags := globalflags.Parse(p, cmd)
9090
if globalFlags.ProjectId == "" {
9191
return nil, &errors.ProjectIdError{}
9292
}

internal/cmd/argus/grafana/single-sign-on/enable/enable_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
216216
t.Fatalf("error validating flags: %v", err)
217217
}
218218

219-
model, err := parseInput(cmd, tt.argValues)
219+
model, err := parseInput(nil, cmd, tt.argValues)
220220
if err != nil {
221221
if !tt.isValid {
222222
return

0 commit comments

Comments
 (0)