Skip to content

Commit f5921b1

Browse files
author
Paval Kasko
authored
Fix linter warnings
1 parent cde571f commit f5921b1

File tree

14 files changed

+85
-67
lines changed

14 files changed

+85
-67
lines changed

Diff for: ‎e2e-tests/users/run

+12-13
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ psmdb="some-name"
1818
cluster="some-name-rs0"
1919

2020
kubectl_bin apply -f "${conf_dir}/client.yml" \
21-
-f "${conf_dir}/secrets.yml" \
22-
-f "${conf_dir}/cloud-secret.yml" \
23-
-f "${conf_dir}/minio-secret.yml"
21+
-f "${conf_dir}/secrets.yml" \
22+
-f "${conf_dir}/cloud-secret.yml" \
23+
-f "${conf_dir}/minio-secret.yml"
2424

2525
apply_cluster $test_dir/conf/$cluster.yml
2626
desc 'Check if all 3 Pods started'
@@ -31,7 +31,7 @@ backup_name_aws="backup-aws-s3"
3131
desc 'Change MONGODB_BACKUP_PASSWORD'
3232
patch_secret "some-users" "MONGODB_BACKUP_PASSWORD" "$newpassencrypted"
3333
sleep 25
34-
wait_cluster_consistency $psmdb
34+
wait_cluster_consistency $psmdb
3535
sleep 15
3636
user=$(getSecretData "some-users" "MONGODB_BACKUP_USER")
3737
check_mongo_auth "$user:$newpass@$cluster-0.$cluster.$namespace"
@@ -42,12 +42,12 @@ desc 'Change MONGODB_BACKUP_USER'
4242
newnameencrypted=$(echo -n "backup2" | base64)
4343
patch_secret "some-users" "MONGODB_BACKUP_USER" "$newnameencrypted"
4444
sleep 25
45-
wait_cluster_consistency $psmdb
45+
46+
wait_cluster_consistency $psmdb
4647
user=$(getSecretData "some-users" "MONGODB_BACKUP_USER")
4748
check_mongo_auth "$user:$newpass@$cluster-0.$cluster.$namespace"
4849
check_mongo_auth "$user:$newpass@$cluster-1.$cluster.$namespace"
4950
check_mongo_auth "$user:$newpass@$cluster-2.$cluster.$namespace"
50-
5151
sleep 120
5252

5353
desc 'Run backup'
@@ -57,19 +57,18 @@ wait_backup "$backup_name_aws"
5757
desc 'Change MONGODB_USER_ADMIN_PASSWORD'
5858
patch_secret "some-users" "MONGODB_USER_ADMIN_PASSWORD" "$newpassencrypted"
5959
sleep 25
60-
wait_cluster_consistency $psmdb
60+
wait_cluster_consistency $psmdb
6161
sleep 15
6262
user=$(getSecretData "some-users" "MONGODB_USER_ADMIN_USER")
6363
check_mongo_auth "$user:$newpass@$cluster-0.$cluster.$namespace"
6464
check_mongo_auth "$user:$newpass@$cluster-1.$cluster.$namespace"
6565
check_mongo_auth "$user:$newpass@$cluster-2.$cluster.$namespace"
6666

67-
6867
desc 'Change MONGODB_USER_ADMIN_USER'
6968
newnameencrypted=$(echo -n "userAdmin2" | base64)
7069
patch_secret "some-users" "MONGODB_USER_ADMIN_USER" "$newnameencrypted"
7170
sleep 25
72-
wait_cluster_consistency $psmdb
71+
wait_cluster_consistency $psmdb
7372
sleep 15
7473
user=$(getSecretData "some-users" "MONGODB_USER_ADMIN_USER")
7574
check_mongo_auth "$user:$newpass@$cluster-0.$cluster.$namespace"
@@ -79,7 +78,7 @@ check_mongo_auth "$user:$newpass@$cluster-2.$cluster.$namespace"
7978
desc 'Change MONGODB_CLUSTER_ADMIN_PASSWORD'
8079
patch_secret "some-users" "MONGODB_CLUSTER_ADMIN_PASSWORD" "$newpassencrypted"
8180
sleep 25
82-
wait_cluster_consistency $psmdb
81+
wait_cluster_consistency $psmdb
8382
sleep 15
8483
user=$(getSecretData "some-users" "MONGODB_CLUSTER_ADMIN_USER")
8584
check_mongo_auth "$user:$newpass@$cluster-0.$cluster.$namespace"
@@ -89,7 +88,7 @@ check_mongo_auth "$user:$newpass@$cluster-2.$cluster.$namespace"
8988
desc 'Change MONGODB_CLUSTER_MONITOR_PASSWORD'
9089
patch_secret "some-users" "MONGODB_CLUSTER_MONITOR_PASSWORD" "$newpassencrypted"
9190
sleep 25
92-
wait_cluster_consistency $psmdb
91+
wait_cluster_consistency $psmdb
9392
sleep 15
9493
user=$(getSecretData "some-users" "MONGODB_CLUSTER_MONITOR_USER")
9594
check_mongo_auth "$user:$newpass@$cluster-0.$cluster.$namespace"
@@ -99,7 +98,7 @@ check_mongo_auth "$user:$newpass@$cluster-2.$cluster.$namespace"
9998
desc 'Remove users secret'
10099
kubectl_bin delete secret some-users
101100
sleep 25
102-
wait_cluster_consistency $psmdb
101+
wait_cluster_consistency $psmdb
103102
sleep 15
104103
user=$(getSecretData "some-users" "MONGODB_USER_ADMIN_USER")
105104
pass=$(getSecretData "some-users" "MONGODB_USER_ADMIN_PASSWORD")
@@ -110,7 +109,7 @@ check_mongo_auth "$user:$pass@$cluster-2.$cluster.$namespace"
110109
desc 'Update all users'
111110
kubectl_bin apply -f "${conf_dir}/secrets.yml"
112111
sleep 25
113-
wait_cluster_consistency $psmdb
112+
wait_cluster_consistency $psmdb
114113
sleep 15
115114
user=$(getSecretData "some-users" "MONGODB_USER_ADMIN_USER")
116115
pass=$(getSecretData "some-users" "MONGODB_USER_ADMIN_PASSWORD")

Diff for: ‎pkg/apis/psmdb/v1/psmdb_defaults.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func (cr *PerconaServerMongoDB) CheckNSetDefaults(platform version.Platform, log
229229
}
230230

231231
var fsgroup *int64
232-
if platform == PlatformKubernetes {
232+
if platform == version.PlatformKubernetes {
233233
var tp int64 = 1001
234234
fsgroup = &tp
235235
}
@@ -285,7 +285,7 @@ func (rs *ReplsetSpec) SetDefauts(platform version.Platform, unsafe bool, log lo
285285
}
286286

287287
var fsgroup *int64
288-
if platform == PlatformKubernetes {
288+
if platform == version.PlatformKubernetes {
289289
var tp int64 = 1001
290290
fsgroup = &tp
291291
}
@@ -347,10 +347,10 @@ func (m *MultiAZ) reconcileOpts() {
347347
}
348348

349349
var affinityValidTopologyKeys = map[string]struct{}{
350-
AffinityOff: struct{}{},
351-
"kubernetes.io/hostname": struct{}{},
352-
"failure-domain.beta.kubernetes.io/zone": struct{}{},
353-
"failure-domain.beta.kubernetes.io/region": struct{}{},
350+
AffinityOff: {},
351+
"kubernetes.io/hostname": {},
352+
"failure-domain.beta.kubernetes.io/zone": {},
353+
"failure-domain.beta.kubernetes.io/region": {},
354354
}
355355

356356
var defaultAffinityTopologyKey = "kubernetes.io/hostname"

Diff for: ‎pkg/apis/psmdb/v1/psmdb_types.go

+12-20
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ type AppState string
9797

9898
const (
9999
AppStatePending AppState = "pending"
100-
AppStateInit = "initializing"
101-
AppStateReady = "ready"
102-
AppStateError = "error"
100+
AppStateInit AppState = "initializing"
101+
AppStateReady AppState = "ready"
102+
AppStateError AppState = "error"
103103
)
104104

105105
type UpgradeStrategy string
@@ -132,18 +132,18 @@ type ConditionStatus string
132132

133133
const (
134134
ConditionTrue ConditionStatus = "True"
135-
ConditionFalse = "False"
136-
ConditionUnknown = "Unknown"
135+
ConditionFalse ConditionStatus = "False"
136+
ConditionUnknown ConditionStatus = "Unknown"
137137
)
138138

139139
type ClusterConditionType string
140140

141141
const (
142142
ClusterReady ClusterConditionType = "ClusterReady"
143-
ClusterInit = "ClusterInitializing"
144-
ClusterRSInit = "ReplsetInitialized"
145-
ClusterRSReady = "ReplsetReady"
146-
ClusterError = "Error"
143+
ClusterInit ClusterConditionType = "ClusterInitializing"
144+
ClusterRSInit ClusterConditionType = "ReplsetInitialized"
145+
ClusterRSReady ClusterConditionType = "ReplsetReady"
146+
ClusterError ClusterConditionType = "Error"
147147
)
148148

149149
type ClusterCondition struct {
@@ -277,8 +277,8 @@ type MongodChiperMode string
277277

278278
const (
279279
MongodChiperModeUnset MongodChiperMode = ""
280-
MongodChiperModeCBC = "AES256-CBC"
281-
MongodChiperModeGCM = "AES256-GCM"
280+
MongodChiperModeCBC MongodChiperMode = "AES256-CBC"
281+
MongodChiperModeGCM MongodChiperMode = "AES256-GCM"
282282
)
283283

284284
type MongodSpecSecurity struct {
@@ -433,17 +433,9 @@ type Expose struct {
433433
ExposeType corev1.ServiceType `json:"exposeType,omitempty"`
434434
}
435435

436-
type Platform string
437-
438-
const (
439-
PlatformUndef Platform = ""
440-
PlatformKubernetes = "kubernetes"
441-
PlatformOpenshift = "openshift"
442-
)
443-
444436
// ServerVersion represents info about k8s / openshift server version
445437
type ServerVersion struct {
446-
Platform Platform
438+
Platform version.Platform
447439
Info k8sversion.Info
448440
}
449441

Diff for: ‎pkg/apis/psmdb/v1/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package v1
77

88
import (
99
"k8s.io/apimachinery/pkg/runtime/schema"
10-
"sigs.k8s.io/controller-runtime/pkg/runtime/scheme"
10+
"sigs.k8s.io/controller-runtime/pkg/scheme"
1111
)
1212

1313
var (

Diff for: ‎pkg/controller/perconaservermongodb/mgo.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ func (r *ReconcilePerconaServerMongoDB) reconcileCluster(cr *api.PerconaServerMo
6060
}
6161
}
6262

63-
defer session.Disconnect(context.TODO())
63+
defer func() {
64+
err := session.Disconnect(context.TODO())
65+
if err != nil {
66+
log.Error(err, "failed to close connection")
67+
}
68+
}()
6469

6570
cnf, err := mongo.ReadConfig(context.TODO(), session)
6671
if err != nil {

Diff for: ‎pkg/controller/perconaservermongodb/psmdb_controller.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
3333
"sigs.k8s.io/controller-runtime/pkg/controller"
3434
"sigs.k8s.io/controller-runtime/pkg/handler"
35+
logf "sigs.k8s.io/controller-runtime/pkg/log"
3536
"sigs.k8s.io/controller-runtime/pkg/manager"
3637
"sigs.k8s.io/controller-runtime/pkg/reconcile"
37-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
3838
"sigs.k8s.io/controller-runtime/pkg/source"
3939
)
4040

@@ -467,11 +467,10 @@ func (r *ReconcilePerconaServerMongoDB) reconcileStatefulSet(arbiter bool, cr *a
467467
sfsSpec.Template.Annotations = make(map[string]string)
468468
}
469469

470-
if sfsTemplateAnnotations != nil {
471-
for k, v := range sfsTemplateAnnotations {
472-
sfsSpec.Template.Annotations[k] = v
473-
}
470+
for k, v := range sfsTemplateAnnotations {
471+
sfsSpec.Template.Annotations[k] = v
474472
}
473+
475474
// add TLS/SSL Volume
476475
t := true
477476
sfsSpec.Template.Spec.Volumes = append(sfsSpec.Template.Spec.Volumes,

Diff for: ‎pkg/controller/perconaservermongodb/smart.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,13 @@ func (r *ReconcilePerconaServerMongoDB) smartUpdate(cr *api.PerconaServerMongoDB
7070
if err != nil {
7171
return fmt.Errorf("failed to get mongo client: %v", err)
7272
}
73-
defer client.Disconnect(context.TODO())
73+
74+
defer func() {
75+
err := client.Disconnect(context.TODO())
76+
if err != nil {
77+
log.Error(err, "failed to close connection")
78+
}
79+
}()
7480

7581
primary, err := r.getPrimaryPod(client)
7682
if err != nil {

Diff for: ‎pkg/controller/perconaservermongodb/status.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (r *ReconcilePerconaServerMongoDB) updateStatus(cr *api.PerconaServerMongoD
3232
LastTransitionTime: metav1.NewTime(time.Now()),
3333
}
3434
if reconcileErr != nil {
35-
if cr.Status.State != api.ClusterError {
35+
if cr.Status.State != api.AppStateError {
3636
clusterCondition = api.ClusterCondition{
3737
Status: api.ConditionTrue,
3838
Type: api.ClusterError,
@@ -44,7 +44,7 @@ func (r *ReconcilePerconaServerMongoDB) updateStatus(cr *api.PerconaServerMongoD
4444
}
4545

4646
cr.Status.Message = "Error: " + reconcileErr.Error()
47-
cr.Status.State = api.ClusterError
47+
cr.Status.State = api.AppStateError
4848

4949
return r.writeStatus(cr)
5050
}
@@ -115,14 +115,14 @@ func (r *ReconcilePerconaServerMongoDB) updateStatus(cr *api.PerconaServerMongoD
115115
Type: api.ClusterInit,
116116
LastTransitionTime: metav1.NewTime(time.Now()),
117117
}
118-
cr.Status.State = api.ClusterInit
118+
cr.Status.State = api.AppStateInit
119119
} else {
120120
clusterCondition = api.ClusterCondition{
121121
Status: api.ConditionTrue,
122122
Type: api.ClusterError,
123123
LastTransitionTime: metav1.NewTime(time.Now()),
124124
}
125-
cr.Status.State = api.ClusterError
125+
cr.Status.State = api.AppStateError
126126
}
127127

128128
if len(cr.Status.Conditions) == 0 {

Diff for: ‎pkg/controller/perconaservermongodb/users.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ func (su *systemUsers) add(nameKey, passKey string) (changed bool, err error) {
126126
}
127127

128128
// no changes, nothing to do with that user
129-
if bytes.Compare(su.newData[nameKey], su.currData[nameKey]) == 0 && bytes.Compare(su.newData[passKey], su.currData[passKey]) == 0 {
129+
if bytes.Equal(su.newData[nameKey], su.currData[nameKey]) &&
130+
bytes.Equal(su.newData[passKey], su.currData[passKey]) {
130131
return false, nil
131132
}
132133
if nameKey == envPMMServerUser {
@@ -243,7 +244,12 @@ func (r *ReconcilePerconaServerMongoDB) updateUsers(cr *api.PerconaServerMongoDB
243244
return errors.Wrap(err, "dial:")
244245
}
245246
}
246-
defer client.Disconnect(context.TODO())
247+
defer func() {
248+
err := client.Disconnect(context.TODO())
249+
if err != nil {
250+
log.Error(err, "failed to close connection")
251+
}
252+
}()
247253

248254
for _, user := range users {
249255
err := user.updateMongo(client)
@@ -257,7 +263,7 @@ func (r *ReconcilePerconaServerMongoDB) updateUsers(cr *api.PerconaServerMongoDB
257263
}
258264

259265
func (u *systemUser) updateMongo(c *mongod.Client) error {
260-
if bytes.Compare(u.currName, u.name) == 0 {
266+
if bytes.Equal(u.currName, u.name) {
261267
err := mongo.UpdateUserPass(context.TODO(), c, string(u.name), string(u.pass))
262268
return errors.Wrapf(err, "change password for user %s", u.name)
263269
}

Diff for: ‎pkg/controller/perconaservermongodb/version.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,12 @@ func (r *ReconcilePerconaServerMongoDB) fetchVersionFromMongo(cr *api.PerconaSer
194194
return errors.Wrap(err, "dial")
195195
}
196196

197-
defer session.Disconnect(context.TODO())
197+
defer func() {
198+
err := session.Disconnect(context.TODO())
199+
if err != nil {
200+
log.Error(err, "failed to close connection")
201+
}
202+
}()
198203

199204
info, err := mongo.RSBuildInfo(context.Background(), session)
200205
if err != nil {

Diff for: ‎pkg/controller/perconaservermongodbbackup/perconaservermongodbbackup_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414
"sigs.k8s.io/controller-runtime/pkg/controller"
1515
"sigs.k8s.io/controller-runtime/pkg/handler"
16+
logf "sigs.k8s.io/controller-runtime/pkg/log"
1617
"sigs.k8s.io/controller-runtime/pkg/manager"
1718
"sigs.k8s.io/controller-runtime/pkg/reconcile"
18-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
1919
"sigs.k8s.io/controller-runtime/pkg/source"
2020

2121
api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"

Diff for: ‎pkg/controller/perconaservermongodbrestore/perconaservermongodbrestore_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"sigs.k8s.io/controller-runtime/pkg/client"
1616
"sigs.k8s.io/controller-runtime/pkg/controller"
1717
"sigs.k8s.io/controller-runtime/pkg/handler"
18+
logf "sigs.k8s.io/controller-runtime/pkg/log"
1819
"sigs.k8s.io/controller-runtime/pkg/manager"
1920
"sigs.k8s.io/controller-runtime/pkg/reconcile"
20-
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
2121
"sigs.k8s.io/controller-runtime/pkg/source"
2222

2323
psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"

Diff for: ‎pkg/psmdb/mongo/mongo.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ import (
1313
"go.mongodb.org/mongo-driver/mongo/options"
1414
"go.mongodb.org/mongo-driver/mongo/readpref"
1515
"go.mongodb.org/mongo-driver/mongo/writeconcern"
16+
logf "sigs.k8s.io/controller-runtime/pkg/log"
1617
)
1718

19+
var log = logf.Log.WithName("mongo")
20+
1821
func Dial(addrs []string, replset, username, password string, useTLS bool) (*mongo.Client, error) {
1922
ctx, connectcancel := context.WithTimeout(context.Background(), 3*time.Second)
2023
defer connectcancel()
@@ -41,7 +44,10 @@ func Dial(addrs []string, replset, username, password string, useTLS bool) (*mon
4144

4245
defer func() {
4346
if err != nil {
44-
_ = client.Disconnect(ctx)
47+
derr := client.Disconnect(ctx)
48+
if derr != nil {
49+
log.Error(err, "failed to disconnect")
50+
}
4551
}
4652
}()
4753

0 commit comments

Comments
 (0)