Skip to content

Commit 2ae51fb

Browse files
FxKuFxKu
authored
reflect linter feedback, remove unused argumnents and redundant type from arrays (#2739)
* reflect linter feedback, remove unused argumnents and redundant literal definitions * add logical backup to TestCreate unit test
1 parent a08d167 commit 2ae51fb

10 files changed

+72
-74
lines changed

‎pkg/cluster/cluster_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ var cl = New(
7171
Spec: acidv1.PostgresSpec{
7272
EnableConnectionPooler: util.True(),
7373
Streams: []acidv1.Stream{
74-
acidv1.Stream{
74+
{
7575
ApplicationId: "test-app",
7676
Database: "test_db",
7777
Tables: map[string]acidv1.StreamTable{
78-
"test_table": acidv1.StreamTable{
78+
"test_table": {
7979
EventType: "test-app.test",
8080
},
8181
},
@@ -95,6 +95,7 @@ func TestCreate(t *testing.T) {
9595

9696
client := k8sutil.KubernetesClient{
9797
DeploymentsGetter: clientSet.AppsV1(),
98+
CronJobsGetter: clientSet.BatchV1(),
9899
EndpointsGetter: clientSet.CoreV1(),
99100
PersistentVolumeClaimsGetter: clientSet.CoreV1(),
100101
PodDisruptionBudgetsGetter: clientSet.PolicyV1(),
@@ -111,6 +112,7 @@ func TestCreate(t *testing.T) {
111112
Namespace: clusterNamespace,
112113
},
113114
Spec: acidv1.PostgresSpec{
115+
EnableLogicalBackup: true,
114116
Volume: acidv1.Volume{
115117
Size: "1Gi",
116118
},
@@ -1504,7 +1506,7 @@ func newCronJob(image, schedule string, vars []v1.EnvVar, mounts []v1.VolumeMoun
15041506
Template: v1.PodTemplateSpec{
15051507
Spec: v1.PodSpec{
15061508
Containers: []v1.Container{
1507-
v1.Container{
1509+
{
15081510
Name: "logical-backup",
15091511
Image: image,
15101512
Env: vars,

‎pkg/cluster/connection_pooler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ func TestPoolerTLS(t *testing.T) {
969969
TLS: &acidv1.TLSDescription{
970970
SecretName: tlsSecretName, CAFile: "ca.crt"},
971971
AdditionalVolumes: []acidv1.AdditionalVolume{
972-
acidv1.AdditionalVolume{
972+
{
973973
Name: tlsSecretName,
974974
MountPath: mountPath,
975975
VolumeSource: v1.VolumeSource{

‎pkg/cluster/k8sres.go

+6-8
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ func (c *Cluster) generateSidecarContainers(sidecars []acidv1.Sidecar,
739739
}
740740

741741
// adds common fields to sidecars
742-
func patchSidecarContainers(in []v1.Container, volumeMounts []v1.VolumeMount, superUserName string, credentialsSecretName string, logger *logrus.Entry) []v1.Container {
742+
func patchSidecarContainers(in []v1.Container, volumeMounts []v1.VolumeMount, superUserName string, credentialsSecretName string) []v1.Container {
743743
result := []v1.Container{}
744744

745745
for _, container := range in {
@@ -1444,7 +1444,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
14441444
containerName, containerName)
14451445
}
14461446

1447-
sidecarContainers = patchSidecarContainers(sidecarContainers, volumeMounts, c.OpConfig.SuperUsername, c.credentialSecretName(c.OpConfig.SuperUsername), c.logger)
1447+
sidecarContainers = patchSidecarContainers(sidecarContainers, volumeMounts, c.OpConfig.SuperUsername, c.credentialSecretName(c.OpConfig.SuperUsername))
14481448

14491449
tolerationSpec := tolerations(&spec.Tolerations, c.OpConfig.PodToleration)
14501450
effectivePodPriorityClassName := util.Coalesce(spec.PodPriorityClassName, c.OpConfig.PodPriorityClassName)
@@ -1598,7 +1598,7 @@ func (c *Cluster) generatePodAnnotations(spec *acidv1.PostgresSpec) map[string]s
15981598
for k, v := range c.OpConfig.CustomPodAnnotations {
15991599
annotations[k] = v
16001600
}
1601-
if spec != nil || spec.PodAnnotations != nil {
1601+
if spec.PodAnnotations != nil {
16021602
for k, v := range spec.PodAnnotations {
16031603
annotations[k] = v
16041604
}
@@ -1875,18 +1875,16 @@ func (c *Cluster) generatePersistentVolumeClaimTemplate(volumeSize, volumeStorag
18751875

18761876
func (c *Cluster) generateUserSecrets() map[string]*v1.Secret {
18771877
secrets := make(map[string]*v1.Secret, len(c.pgUsers)+len(c.systemUsers))
1878-
namespace := c.Namespace
18791878
for username, pgUser := range c.pgUsers {
18801879
//Skip users with no password i.e. human users (they'll be authenticated using pam)
1881-
secret := c.generateSingleUserSecret(pgUser.Namespace, pgUser)
1880+
secret := c.generateSingleUserSecret(pgUser)
18821881
if secret != nil {
18831882
secrets[username] = secret
18841883
}
1885-
namespace = pgUser.Namespace
18861884
}
18871885
/* special case for the system user */
18881886
for _, systemUser := range c.systemUsers {
1889-
secret := c.generateSingleUserSecret(namespace, systemUser)
1887+
secret := c.generateSingleUserSecret(systemUser)
18901888
if secret != nil {
18911889
secrets[systemUser.Name] = secret
18921890
}
@@ -1895,7 +1893,7 @@ func (c *Cluster) generateUserSecrets() map[string]*v1.Secret {
18951893
return secrets
18961894
}
18971895

1898-
func (c *Cluster) generateSingleUserSecret(namespace string, pgUser spec.PgUser) *v1.Secret {
1896+
func (c *Cluster) generateSingleUserSecret(pgUser spec.PgUser) *v1.Secret {
18991897
//Skip users with no password i.e. human users (they'll be authenticated using pam)
19001898
if pgUser.Password == "" {
19011899
if pgUser.Origin != spec.RoleOriginTeamsAPI {

‎pkg/cluster/k8sres_test.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -1451,9 +1451,9 @@ func TestNodeAffinity(t *testing.T) {
14511451
nodeAff := &v1.NodeAffinity{
14521452
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
14531453
NodeSelectorTerms: []v1.NodeSelectorTerm{
1454-
v1.NodeSelectorTerm{
1454+
{
14551455
MatchExpressions: []v1.NodeSelectorRequirement{
1456-
v1.NodeSelectorRequirement{
1456+
{
14571457
Key: "test-label",
14581458
Operator: v1.NodeSelectorOpIn,
14591459
Values: []string{
@@ -1673,7 +1673,7 @@ func TestTLS(t *testing.T) {
16731673
TLS: &acidv1.TLSDescription{
16741674
SecretName: tlsSecretName, CAFile: "ca.crt"},
16751675
AdditionalVolumes: []acidv1.AdditionalVolume{
1676-
acidv1.AdditionalVolume{
1676+
{
16771677
Name: tlsSecretName,
16781678
MountPath: mountPath,
16791679
VolumeSource: v1.VolumeSource{
@@ -2162,17 +2162,17 @@ func TestSidecars(t *testing.T) {
21622162
Size: "1G",
21632163
},
21642164
Sidecars: []acidv1.Sidecar{
2165-
acidv1.Sidecar{
2165+
{
21662166
Name: "cluster-specific-sidecar",
21672167
},
2168-
acidv1.Sidecar{
2168+
{
21692169
Name: "cluster-specific-sidecar-with-resources",
21702170
Resources: &acidv1.Resources{
21712171
ResourceRequests: acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("210m"), Memory: k8sutil.StringToPointer("0.8Gi")},
21722172
ResourceLimits: acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("510m"), Memory: k8sutil.StringToPointer("1.4Gi")},
21732173
},
21742174
},
2175-
acidv1.Sidecar{
2175+
{
21762176
Name: "replace-sidecar",
21772177
DockerImage: "override-image",
21782178
},
@@ -2200,11 +2200,11 @@ func TestSidecars(t *testing.T) {
22002200
"deprecated-global-sidecar": "image:123",
22012201
},
22022202
SidecarContainers: []v1.Container{
2203-
v1.Container{
2203+
{
22042204
Name: "global-sidecar",
22052205
},
22062206
// will be replaced by a cluster specific sidecar with the same name
2207-
v1.Container{
2207+
{
22082208
Name: "replace-sidecar",
22092209
Image: "replaced-image",
22102210
},
@@ -2259,7 +2259,7 @@ func TestSidecars(t *testing.T) {
22592259
},
22602260
}
22612261
mounts := []v1.VolumeMount{
2262-
v1.VolumeMount{
2262+
{
22632263
Name: "pgdata",
22642264
MountPath: "/home/postgres/pgdata",
22652265
},
@@ -2516,17 +2516,17 @@ func TestGenerateService(t *testing.T) {
25162516
Size: "1G",
25172517
},
25182518
Sidecars: []acidv1.Sidecar{
2519-
acidv1.Sidecar{
2519+
{
25202520
Name: "cluster-specific-sidecar",
25212521
},
2522-
acidv1.Sidecar{
2522+
{
25232523
Name: "cluster-specific-sidecar-with-resources",
25242524
Resources: &acidv1.Resources{
25252525
ResourceRequests: acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("210m"), Memory: k8sutil.StringToPointer("0.8Gi")},
25262526
ResourceLimits: acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("510m"), Memory: k8sutil.StringToPointer("1.4Gi")},
25272527
},
25282528
},
2529-
acidv1.Sidecar{
2529+
{
25302530
Name: "replace-sidecar",
25312531
DockerImage: "override-image",
25322532
},
@@ -2555,11 +2555,11 @@ func TestGenerateService(t *testing.T) {
25552555
"deprecated-global-sidecar": "image:123",
25562556
},
25572557
SidecarContainers: []v1.Container{
2558-
v1.Container{
2558+
{
25592559
Name: "global-sidecar",
25602560
},
25612561
// will be replaced by a cluster specific sidecar with the same name
2562-
v1.Container{
2562+
{
25632563
Name: "replace-sidecar",
25642564
Image: "replaced-image",
25652565
},
@@ -2654,27 +2654,27 @@ func newLBFakeClient() (k8sutil.KubernetesClient, *fake.Clientset) {
26542654

26552655
func getServices(serviceType v1.ServiceType, sourceRanges []string, extTrafficPolicy, clusterName string) []v1.ServiceSpec {
26562656
return []v1.ServiceSpec{
2657-
v1.ServiceSpec{
2657+
{
26582658
ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyType(extTrafficPolicy),
26592659
LoadBalancerSourceRanges: sourceRanges,
26602660
Ports: []v1.ServicePort{{Name: "postgresql", Port: 5432, TargetPort: intstr.IntOrString{IntVal: 5432}}},
26612661
Type: serviceType,
26622662
},
2663-
v1.ServiceSpec{
2663+
{
26642664
ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyType(extTrafficPolicy),
26652665
LoadBalancerSourceRanges: sourceRanges,
26662666
Ports: []v1.ServicePort{{Name: clusterName + "-pooler", Port: 5432, TargetPort: intstr.IntOrString{IntVal: 5432}}},
26672667
Selector: map[string]string{"connection-pooler": clusterName + "-pooler"},
26682668
Type: serviceType,
26692669
},
2670-
v1.ServiceSpec{
2670+
{
26712671
ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyType(extTrafficPolicy),
26722672
LoadBalancerSourceRanges: sourceRanges,
26732673
Ports: []v1.ServicePort{{Name: "postgresql", Port: 5432, TargetPort: intstr.IntOrString{IntVal: 5432}}},
26742674
Selector: map[string]string{"spilo-role": "replica", "application": "spilo", "cluster-name": clusterName},
26752675
Type: serviceType,
26762676
},
2677-
v1.ServiceSpec{
2677+
{
26782678
ExternalTrafficPolicy: v1.ServiceExternalTrafficPolicyType(extTrafficPolicy),
26792679
LoadBalancerSourceRanges: sourceRanges,
26802680
Ports: []v1.ServicePort{{Name: clusterName + "-pooler-repl", Port: 5432, TargetPort: intstr.IntOrString{IntVal: 5432}}},
@@ -2894,7 +2894,7 @@ func TestGenerateResourceRequirements(t *testing.T) {
28942894
},
28952895
Spec: acidv1.PostgresSpec{
28962896
Sidecars: []acidv1.Sidecar{
2897-
acidv1.Sidecar{
2897+
{
28982898
Name: sidecarName,
28992899
},
29002900
},
@@ -3095,7 +3095,7 @@ func TestGenerateResourceRequirements(t *testing.T) {
30953095
},
30963096
Spec: acidv1.PostgresSpec{
30973097
Sidecars: []acidv1.Sidecar{
3098-
acidv1.Sidecar{
3098+
{
30993099
Name: sidecarName,
31003100
Resources: &acidv1.Resources{
31013101
ResourceRequests: acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("10m"), Memory: k8sutil.StringToPointer("10Mi")},
@@ -3184,7 +3184,7 @@ func TestGenerateResourceRequirements(t *testing.T) {
31843184
},
31853185
Spec: acidv1.PostgresSpec{
31863186
Sidecars: []acidv1.Sidecar{
3187-
acidv1.Sidecar{
3187+
{
31883188
Name: sidecarName,
31893189
Resources: &acidv1.Resources{
31903190
ResourceRequests: acidv1.ResourceDescription{CPU: k8sutil.StringToPointer("10m"), Memory: k8sutil.StringToPointer("10Mi")},

‎pkg/cluster/streams.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (c *Cluster) generateFabricEventStream(appId string) *zalandov1.FabricEvent
185185
}
186186
for tableName, table := range stream.Tables {
187187
streamSource := c.getEventStreamSource(stream, tableName, table.IdColumn)
188-
streamFlow := getEventStreamFlow(stream, table.PayloadColumn)
188+
streamFlow := getEventStreamFlow(table.PayloadColumn)
189189
streamSink := getEventStreamSink(stream, table.EventType)
190190
streamRecovery := getEventStreamRecovery(stream, table.RecoveryEventType, table.EventType)
191191

@@ -232,7 +232,7 @@ func (c *Cluster) getEventStreamSource(stream acidv1.Stream, tableName string, i
232232
}
233233
}
234234

235-
func getEventStreamFlow(stream acidv1.Stream, payloadColumn *string) zalandov1.EventStreamFlow {
235+
func getEventStreamFlow(payloadColumn *string) zalandov1.EventStreamFlow {
236236
return zalandov1.EventStreamFlow{
237237
Type: constants.EventStreamFlowPgGenericType,
238238
PayloadColumn: payloadColumn,

0 commit comments

Comments
 (0)