Skip to content

Add debug error logs #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GokceGK merged 22 commits into from
Apr 19, 2024
Merged

Add debug error logs #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5771a8b
add error debug logs to clients
GokceGK Apr 15, 2024
535f026
add error debug logs to refreshToken
GokceGK Apr 15, 2024
df69fe4
add error debug logs to label fetching
GokceGK Apr 15, 2024
8fe6894
Update internal/pkg/services/argus/client/client.go
GokceGK Apr 16, 2024
8a26a96
Update internal/pkg/services/argus/client/client.go
GokceGK Apr 16, 2024
4dfd856
add error debug logs to flag conversions
GokceGK Apr 16, 2024
060dde7
Merge remote-tracking branch 'origin/gg/add-verbosity-error-logs' int…
GokceGK Apr 16, 2024
5c77cb9
Merge remote-tracking branch 'origin' into gg/add-verbosity-error-logs
GokceGK Apr 17, 2024
12e788e
add printer to argus grafana commands
GokceGK Apr 17, 2024
e17f29f
add debug log to getBearerToken function
GokceGK Apr 17, 2024
cf68003
fix debug messages on clients
GokceGK Apr 17, 2024
7d71a7f
Update internal/pkg/flags/flag_to_value.go
GokceGK Apr 17, 2024
26d0d9a
remove obsolete err from the debug messages
GokceGK Apr 17, 2024
2da0daf
make printer first parameter
GokceGK Apr 18, 2024
85096d3
Merge remote-tracking branch 'origin' into gg/add-verbosity-error-logs
GokceGK Apr 18, 2024
c3f7cd2
add printer to new argus commands
GokceGK Apr 18, 2024
0b98bfc
Update internal/pkg/auth/user_token_flow.go
GokceGK Apr 18, 2024
7413798
Update internal/cmd/root.go
GokceGK Apr 18, 2024
c796875
Merge branch 'main' into gg/add-verbosity-error-logs
GokceGK Apr 18, 2024
d0d64c3
fix linting problem
GokceGK Apr 18, 2024
eeacab1
add string formatting to the printer debug function
GokceGK Apr 19, 2024
b08ce6a
set source in log handler to false
GokceGK Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 5 additions & 4 deletions internal/cmd/argus/grafana/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)

if err != nil {
return err
}
Expand Down Expand Up @@ -86,18 +87,18 @@ func configureFlags(cmd *cobra.Command) {
cmd.Flags().Bool(hidePasswordFlag, false, `Show the initial admin password in the "pretty" output format`)
}

func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
instanceId := inputArgs[0]
globalFlags := globalflags.Parse(p, cmd)

globalFlags := globalflags.Parse(cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}

return &inputModel{
GlobalFlagModel: globalFlags,
InstanceId: instanceId,
HidePassword: flags.FlagToBoolValue(cmd, hidePasswordFlag),
HidePassword: flags.FlagToBoolValue(p, cmd, hidePasswordFlag),
}, nil
}

Expand Down
3 changes: 2 additions & 1 deletion internal/cmd/argus/grafana/describe/describe_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)

if err != nil {
if !tt.isValid {
return
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/argus/grafana/public-read-access/disable/disable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)
if err != nil {
return err
}
Expand Down Expand Up @@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
return cmd
}

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

globalFlags := globalflags.Parse(cmd)
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/grafana/public-read-access/disable/disable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)
if err != nil {
if !tt.isValid {
return
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/argus/grafana/public-read-access/enable/enable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)
if err != nil {
return err
}
Expand Down Expand Up @@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
return cmd
}

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

globalFlags := globalflags.Parse(cmd)
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/grafana/public-read-access/enable/enable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)
if err != nil {
if !tt.isValid {
return
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/argus/grafana/single-sign-on/disable/disable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)
if err != nil {
return err
}
Expand Down Expand Up @@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
return cmd
}

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

globalFlags := globalflags.Parse(cmd)
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/grafana/single-sign-on/disable/disable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)
if err != nil {
if !tt.isValid {
return
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/argus/grafana/single-sign-on/enable/enable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)
if err != nil {
return err
}
Expand Down Expand Up @@ -83,10 +83,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
return cmd
}

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

globalFlags := globalflags.Parse(cmd)
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/grafana/single-sign-on/enable/enable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)
if err != nil {
if !tt.isValid {
return
Expand Down
15 changes: 8 additions & 7 deletions internal/cmd/argus/instance/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd)
model, err := parseInput(p, cmd)
if err != nil {
return err
}
Expand All @@ -62,8 +62,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
return err
}

projectLabel, err := projectname.GetProjectName(ctx, cmd, p)
projectLabel, err := projectname.GetProjectName(ctx, p, cmd)
if err != nil {
p.Debug(print.ErrorLevel, "get project name: %v", err)
projectLabel = model.ProjectId
}

Expand Down Expand Up @@ -122,14 +123,14 @@ func configureFlags(cmd *cobra.Command) {
cobra.CheckErr(err)
}

func parseInput(cmd *cobra.Command) (*inputModel, error) {
globalFlags := globalflags.Parse(cmd)
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &cliErr.ProjectIdError{}
}

planId := flags.FlagToStringPointer(cmd, planIdFlag)
planName := flags.FlagToStringValue(cmd, planNameFlag)
planId := flags.FlagToStringPointer(p, cmd, planIdFlag)
planName := flags.FlagToStringValue(p, cmd, planNameFlag)

if planId == nil && (planName == "") {
return nil, &cliErr.ArgusInputPlanError{
Expand All @@ -144,7 +145,7 @@ func parseInput(cmd *cobra.Command) (*inputModel, error) {

return &inputModel{
GlobalFlagModel: globalFlags,
InstanceName: flags.FlagToStringPointer(cmd, instanceNameFlag),
InstanceName: flags.FlagToStringPointer(p, cmd, instanceNameFlag),
PlanId: planId,
PlanName: planName,
}, nil
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/instance/create/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd)
model, err := parseInput(nil, cmd)
if err != nil {
if !tt.isValid {
return
Expand Down
7 changes: 4 additions & 3 deletions internal/cmd/argus/instance/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)
if err != nil {
return err
}
Expand All @@ -54,6 +54,7 @@ func NewCmd(p *print.Printer) *cobra.Command {

instanceLabel, err := argusUtils.GetInstanceName(ctx, apiClient, model.InstanceId, model.ProjectId)
if err != nil {
p.Debug(print.ErrorLevel, "get instance name: %v", err)
instanceLabel = model.InstanceId
}

Expand Down Expand Up @@ -94,10 +95,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
return cmd
}

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

globalFlags := globalflags.Parse(cmd)
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/instance/delete/delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)
if err != nil {
if !tt.isValid {
return
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/argus/instance/describe/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)
if err != nil {
return err
}
Expand All @@ -66,10 +66,10 @@ func NewCmd(p *print.Printer) *cobra.Command {
return cmd
}

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

globalFlags := globalflags.Parse(cmd)
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/instance/describe/describe_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)
if err != nil {
if !tt.isValid {
return
Expand Down
13 changes: 7 additions & 6 deletions internal/cmd/argus/instance/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd)
model, err := parseInput(p, cmd)
if err != nil {
return err
}
Expand All @@ -66,8 +66,9 @@ func NewCmd(p *print.Printer) *cobra.Command {
}
instances := *resp.Instances
if len(instances) == 0 {
projectLabel, err := projectname.GetProjectName(ctx, cmd, p)
projectLabel, err := projectname.GetProjectName(ctx, p, cmd)
if err != nil {
p.Debug(print.ErrorLevel, "get project name: %v", err)
projectLabel = model.ProjectId
}
p.Info("No instances found for project %q\n", projectLabel)
Expand All @@ -91,13 +92,13 @@ func configureFlags(cmd *cobra.Command) {
cmd.Flags().Int64(limitFlag, 0, "Maximum number of entries to list")
}

func parseInput(cmd *cobra.Command) (*inputModel, error) {
globalFlags := globalflags.Parse(cmd)
func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &errors.ProjectIdError{}
}

limit := flags.FlagToInt64Pointer(cmd, limitFlag)
limit := flags.FlagToInt64Pointer(p, cmd, limitFlag)
if limit != nil && *limit < 1 {
return nil, &errors.FlagValidationError{
Flag: limitFlag,
Expand All @@ -107,7 +108,7 @@ func parseInput(cmd *cobra.Command) (*inputModel, error) {

return &inputModel{
GlobalFlagModel: globalFlags,
Limit: flags.FlagToInt64Pointer(cmd, limitFlag),
Limit: flags.FlagToInt64Pointer(p, cmd, limitFlag),
}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/instance/list/list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd)
model, err := parseInput(nil, cmd)
if err != nil {
if !tt.isValid {
return
Expand Down
13 changes: 7 additions & 6 deletions internal/cmd/argus/instance/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
),
RunE: func(cmd *cobra.Command, args []string) error {
ctx := context.Background()
model, err := parseInput(cmd, args)
model, err := parseInput(p, cmd, args)
if err != nil {
return err
}
Expand All @@ -70,6 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command {

instanceLabel, err := argusUtils.GetInstanceName(ctx, apiClient, model.InstanceId, model.ProjectId)
if err != nil || instanceLabel == "" {
p.Debug(print.ErrorLevel, "get instance name: %v", err)
instanceLabel = model.InstanceId
}

Expand Down Expand Up @@ -126,17 +127,17 @@ func configureFlags(cmd *cobra.Command) {
cmd.Flags().StringP(instanceNameFlag, "n", "", "Instance name")
}

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

globalFlags := globalflags.Parse(cmd)
globalFlags := globalflags.Parse(p, cmd)
if globalFlags.ProjectId == "" {
return nil, &cliErr.ProjectIdError{}
}

planId := flags.FlagToStringPointer(cmd, planIdFlag)
planName := flags.FlagToStringValue(cmd, planNameFlag)
instanceName := flags.FlagToStringPointer(cmd, instanceNameFlag)
planId := flags.FlagToStringPointer(p, cmd, planIdFlag)
planName := flags.FlagToStringValue(p, cmd, planNameFlag)
instanceName := flags.FlagToStringPointer(p, cmd, instanceNameFlag)

if planId != nil && (planName != "") {
return nil, &cliErr.ArgusInputPlanError{
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/argus/instance/update/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func TestParseInput(t *testing.T) {
t.Fatalf("error validating flags: %v", err)
}

model, err := parseInput(cmd, tt.argValues)
model, err := parseInput(nil, cmd, tt.argValues)
if err != nil {
if !tt.isValid {
return
Expand Down
Loading