Skip to content

Commit 23064ac

Browse files
committed
wip
1 parent 214f4d7 commit 23064ac

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

.golangci.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ linters:
77
rules:
88
- linters:
99
- bodyclose
10-
- dupword
1110
- errcheck
1211
- errchkjson
1312
- forbidigo
1413
- gocritic
1514
- gosec
1615
- govet
17-
- misspell
1816
- musttag
1917
- nilerr
2018
- noctx

api/datareading.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type DataReadingsPost struct {
1515

1616
// DataReading is the output of a DataGatherer.
1717
type DataReading struct {
18-
// ClusterID is optional as it can be infered from the agent
18+
// ClusterID is optional as it can be inferred from the agent
1919
// token when using basic authentication.
2020
ClusterID string `json:"cluster_id,omitempty"`
2121
DataGatherer string `json:"data-gatherer"`

cmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func init() {
4343
// Execute adds all child commands to the root command and sets flags appropriately.
4444
// This is called by main.main(). It only needs to happen once to the rootCmd.
4545
// If the root command or sub-command returns an error, the error message will
46-
// will be logged and the process will exit with status 1.
46+
// be logged and the process will exit with status 1.
4747
func Execute() {
4848
logs.AddFlags(rootCmd.PersistentFlags())
4949
ctx := klog.NewContext(context.Background(), klog.Background())

pkg/agent/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,11 +738,11 @@ func validateCredsAndCreateClient(log logr.Logger, flagCredentialsPath, flagClie
738738
var creds client.Credentials
739739

740740
if flagClientID != "" && flagCredentialsPath != "" {
741-
errs = multierror.Append(errs, fmt.Errorf("--client-id and --credentials-file cannot be used simultanously"))
741+
errs = multierror.Append(errs, fmt.Errorf("--client-id and --credentials-file cannot be used simultaneously"))
742742
break
743743
}
744744
if flagPrivateKeyPath != "" && flagCredentialsPath != "" {
745-
errs = multierror.Append(errs, fmt.Errorf("--private-key-path and --credentials-file cannot be used simultanously"))
745+
errs = multierror.Append(errs, fmt.Errorf("--private-key-path and --credentials-file cannot be used simultaneously"))
746746
break
747747
}
748748
if flagClientID == "" && flagPrivateKeyPath == "" && flagCredentialsPath == "" {

pkg/agent/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func Run(cmd *cobra.Command, args []string) (returnErr error) {
111111
}
112112

113113
// Health check endpoint. Since we haven't figured a good way of knowning
114-
// what "ready" means for the agent, we just return 200 OK inconditionally.
114+
// what "ready" means for the agent, we just return 200 OK unconditionally.
115115
// The goal is to satisfy some Kubernetes distributions, like OpenShift,
116116
// that require a liveness and health probe to be present for each pod.
117117
log.Info("Healthz endpoints enabled", "path", "/healthz")

pkg/client/client_venconn_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ func run_TestVenConnClient_PostDataReadingsWithOptions(ctx context.Context, rest
300300
// sub-test-has-special-chars-and-is-also-super-super-super-super-
301301
//
302302
// Only the last part of the test name is used.
303+
//
304+
// nolint:dupword
303305
func testNameToNamespace(t testing.TB) string {
304306
regex := regexp.MustCompile("[^a-zA-Z0-9-]")
305307

pkg/datagatherer/k8s/dynamic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ func RemoveUnstructuredKeys(excludeKeys []*regexp.Regexp, obj *unstructured.Unst
473473
return
474474
}
475475

476-
// The field may be nil since yaml.Unmarshal's omitempty might not be set on
476+
// The field may be nil since yaml.Unmarshal's omitempty might not be set
477477
// on this struct field.
478478
if annotsRaw == nil {
479479
return

0 commit comments

Comments
 (0)