Skip to content

Commit

Permalink
Fix existing master branch linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
darthhexx committed Nov 30, 2022
1 parent 9526bbc commit ade1cd6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ linters:
enable:
- gofmt
- unused
- deadcode
- gosimple
- govet
- staticcheck
Expand Down
1 change: 1 addition & 0 deletions cmd/aro/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ func (h *fileHook) Fire(entry *logrus.Entry) error {
return nil
}

//nolint:unused
func setupFileHook(baseDir string) func() {
if err := os.MkdirAll(baseDir, 0755); err != nil {
logrus.Fatal(errors.Wrap(err, "failed to create base directory for logs"))
Expand Down
2 changes: 1 addition & 1 deletion hack/licenses/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func applyGoLicense() error {
})
}

//returns the lists of files that don't have a license but should
// returns the lists of files that don't have a license but should
func validateGoLicenses(ignored map[string]bool, dirs []string) []string {
unlicensedFiles := make([]string, 0)
for _, dir := range dirs {
Expand Down
7 changes: 5 additions & 2 deletions pkg/util/pullsecret/pullsecret.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ type pullSecret struct {

// Unmarshal pull-secret data which is stored in corev1.Secret.Data
// the data has form:
// {"auths": {"secret key": {"auth": "secret value"}, "secret key": {"auth": "secret value"}}}
//
// {"auths": {"secret key": {"auth": "secret value"}, "secret key": {"auth": "secret value"}}}
//
// returns map of extracted secrets in a form:
// {"secret key": "secret value"}
//
// {"secret key": "secret value"}
//
// error is returned when parsing fails
func UnmarshalSecretData(ps *corev1.Secret) (map[string]string, error) {
var pullSecretData pullSecret
Expand Down

0 comments on commit ade1cd6

Please sign in to comment.