Skip to content

Enable staticcheck #604

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
openshift-merge-robot merged 1 commit into from
Jun 25, 2021
Merged

Enable staticcheck #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ linters:
- gosimple
- govet
- ineffassign
# - staticcheck
- staticcheck
- structcheck
- typecheck
- unused
Expand Down
2 changes: 1 addition & 1 deletion cmd/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ func runImageCmd(cmd *cobra.Command, args []string) {
if err != nil {
klog.Fatalf("error: %v", err)
}
fmt.Printf(image)
fmt.Print(image)
Copy link
Contributor Author

@arjunrn arjunrn Jun 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no formatting of the strings required here.

}
12 changes: 5 additions & 7 deletions pkg/cvo/egress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ func (optr *Operator) getHTTPSProxyURL() (*url.URL, error) {
return nil, err
}

if &proxy.Spec != nil {
Copy link
Contributor Author

@arjunrn arjunrn Jun 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

proxy is referenced and compared to nil. Since proxy is a value type this check will never be false.

Copy link

@vrutkovs vrutkovs Jun 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but I'm not entirely sure if these are equivalent.

/cc @jottofar @wking

Copy link
Contributor Author

@arjunrn arjunrn Jun 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't change the check. I removed it and what you see now is the inner-check. The outer-check was superfluous for the reason mentioned above.

if proxy.Spec.HTTPSProxy != "" {
proxyURL, err := url.Parse(proxy.Spec.HTTPSProxy)
if err != nil {
return nil, err
}
return proxyURL, nil
if proxy.Spec.HTTPSProxy != "" {
proxyURL, err := url.Parse(proxy.Spec.HTTPSProxy)
if err != nil {
return nil, err
}
return proxyURL, nil
}
return nil, nil
}
Expand Down