fix golangci-lint issues (zalando#2715)

fahedouch · fahed dorgaa · macedigital · web-flow · commit aad03f71eac1 · 2024-08-14T12:54:44.000+02:00
Signed-off-by: fahed dorgaa &lt;fahed.dorgaa@gmail.com&gt;
Co-authored-by: fahed dorgaa &lt;fahed.dorgaa.ext@corp.ovh.com&gt;
Co-authored-by: Matthias Adler &lt;macedigital@users.noreply.github.com&gt;
diff --git a/pkg/apis/acid.zalan.do/v1/postgresql_type.go b/pkg/apis/acid.zalan.do/v1/postgresql_type.go
@@ -133,7 +133,7 @@ type Volume struct {
 	Size          string                `json:"size"`
 	StorageClass  string                `json:"storageClass,omitempty"`
 	SubPath       string                `json:"subPath,omitempty"`
-	IsSubPathExpr *bool                 `json:"isSubPathExpr,omitemtpy"`
+	IsSubPathExpr *bool                 `json:"isSubPathExpr,omitempty"`
 	Iops          *int64                `json:"iops,omitempty"`
 	Throughput    *int64                `json:"throughput,omitempty"`
 	VolumeType    string                `json:"type,omitempty"`
@@ -144,7 +144,7 @@ type AdditionalVolume struct {
 	Name             string          `json:"name"`
 	MountPath        string          `json:"mountPath"`
 	SubPath          string          `json:"subPath,omitempty"`
-	IsSubPathExpr    *bool           `json:"isSubPathExpr,omitemtpy"`
+	IsSubPathExpr    *bool           `json:"isSubPathExpr,omitempty"`
 	TargetContainers []string        `json:"targetContainers"`
 	VolumeSource     v1.VolumeSource `json:"volumeSource"`
 }
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -668,7 +668,7 @@ func compareEnv(a, b []v1.EnvVar) bool {
 	if len(a) != len(b) {
 		return false
 	}
-	equal := true
+	var equal bool
 	for _, enva := range a {
 		hasmatch := false
 		for _, envb := range b {
diff --git a/pkg/cluster/exec.go b/pkg/cluster/exec.go
@@ -15,7 +15,7 @@ import (
 	"github.com/zalando/postgres-operator/pkg/util/constants"
 )
 
-//ExecCommand executes arbitrary command inside the pod
+// ExecCommand executes arbitrary command inside the pod
 func (c *Cluster) ExecCommand(podName *spec.NamespacedName, command ...string) (string, error) {
 	c.setProcessName("executing command %q", strings.Join(command, " "))
 
@@ -59,7 +59,7 @@ func (c *Cluster) ExecCommand(podName *spec.NamespacedName, command ...string) (
 		return "", fmt.Errorf("failed to init executor: %v", err)
 	}
 
-	err = exec.Stream(remotecommand.StreamOptions{
+	err = exec.StreamWithContext(context.TODO(), remotecommand.StreamOptions{
 		Stdout: &execOut,
 		Stderr: &execErr,
 		Tty:    false,
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
@@ -47,11 +47,6 @@ const (
 	operatorPort                   = 8080
 )
 
-type pgUser struct {
-	Password string   `json:"password"`
-	Options  []string `json:"options"`
-}
-
 type patroniDCS struct {
 	TTL                      uint32                       `json:"ttl,omitempty"`
 	LoopWait                 uint32                       `json:"loop_wait,omitempty"`
diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go
@@ -449,10 +449,6 @@ func (c *Cluster) _waitPodLabelsReady(anyReplica bool) error {
 	return err
 }
 
-func (c *Cluster) waitForAnyReplicaLabelReady() error {
-	return c._waitPodLabelsReady(true)
-}
-
 func (c *Cluster) waitForAllPodsLabelReady() error {
 	return c._waitPodLabelsReady(false)
 }
diff --git a/pkg/controller/util.go b/pkg/controller/util.go
@@ -80,7 +80,7 @@ func (c *Controller) createOperatorCRD(desiredCrd *apiextv1.CustomResourceDefini
 		c.logger.Infof("customResourceDefinition %q has been registered", crd.Name)
 	}
 
-	return wait.Poll(c.config.CRDReadyWaitInterval, c.config.CRDReadyWaitTimeout, func() (bool, error) {
+	return wait.PollUntilContextTimeout(context.TODO(), c.config.CRDReadyWaitInterval, c.config.CRDReadyWaitTimeout, false, func(ctx context.Context) (bool, error) {
 		c, err := c.KubeClient.CustomResourceDefinitions().Get(context.TODO(), desiredCrd.Name, metav1.GetOptions{})
 		if err != nil {
 			return false, err
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -35,7 +35,7 @@ const (
 var passwordChars = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
 
 func init() {
-	rand.Seed(time.Now().Unix())
+	rand.New(rand.NewSource(time.Now().Unix()))
 }
 
 // helper function to get bool pointers

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ func compareEnv(a, b []v1.EnvVar) bool {`
`668`	`668`	`if len(a) != len(b) {`
`669`	`669`	`return false`
`670`	`670`	`}`
`671`		`- equal := true`
	`671`	`+ var equal bool`
`672`	`672`	`for _, enva := range a {`
`673`	`673`	`hasmatch := false`
`674`	`674`	`for _, envb := range b {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/zalando/postgres-operator/pkg/util/constants"`
`16`	`16`	`)`
`17`	`17`
`18`		`-//ExecCommand executes arbitrary command inside the pod`
	`18`	`+// ExecCommand executes arbitrary command inside the pod`
`19`	`19`	`func (c Cluster) ExecCommand(podName spec.NamespacedName, command ...string) (string, error) {`
`20`	`20`	`c.setProcessName("executing command %q", strings.Join(command, " "))`
`21`	`21`
`@@ -59,7 +59,7 @@ func (c Cluster) ExecCommand(podName spec.NamespacedName, command ...string) (`
`59`	`59`	`return "", fmt.Errorf("failed to init executor: %v", err)`
`60`	`60`	`}`
`61`	`61`
`62`		`- err = exec.Stream(remotecommand.StreamOptions{`
	`62`	`+ err = exec.StreamWithContext(context.TODO(), remotecommand.StreamOptions{`
`63`	`63`	`Stdout: &execOut,`
`64`	`64`	`Stderr: &execErr,`
`65`	`65`	`Tty: false,`
Original file line number	Diff line number	Diff line change
`@@ -449,10 +449,6 @@ func (c *Cluster) _waitPodLabelsReady(anyReplica bool) error {`
`449`	`449`	`return err`
`450`	`450`	`}`
`451`	`451`
`452`		`-func (c *Cluster) waitForAnyReplicaLabelReady() error {`
`453`		`- return c._waitPodLabelsReady(true)`
`454`		`-}`
`455`		`-`
`456`	`452`	`func (c *Cluster) waitForAllPodsLabelReady() error {`
`457`	`453`	`return c._waitPodLabelsReady(false)`
`458`	`454`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (c Controller) createOperatorCRD(desiredCrd apiextv1.CustomResourceDefini`
`80`	`80`	`c.logger.Infof("customResourceDefinition %q has been registered", crd.Name)`
`81`	`81`	`}`
`82`	`82`
`83`		`- return wait.Poll(c.config.CRDReadyWaitInterval, c.config.CRDReadyWaitTimeout, func() (bool, error) {`
	`83`	`+ return wait.PollUntilContextTimeout(context.TODO(), c.config.CRDReadyWaitInterval, c.config.CRDReadyWaitTimeout, false, func(ctx context.Context) (bool, error) {`
`84`	`84`	`c, err := c.KubeClient.CustomResourceDefinitions().Get(context.TODO(), desiredCrd.Name, metav1.GetOptions{})`
`85`	`85`	`if err != nil {`
`86`	`86`	`return false, err`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ const (`
`35`	`35`	`var passwordChars = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")`
`36`	`36`
`37`	`37`	`func init() {`
`38`		`- rand.Seed(time.Now().Unix())`
	`38`	`+ rand.New(rand.NewSource(time.Now().Unix()))`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// helper function to get bool pointers`