Skip to content

Commit b99aab0

Browse files
committed
fix linting
1 parent b4a5604 commit b99aab0

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

internal/controller/postgrescluster/pgbackrest_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2774,7 +2774,7 @@ func TestGenerateRepoHostIntent(t *testing.T) {
27742774
})
27752775

27762776
t.Run("Environment From Secret", func(t *testing.T) {
2777-
secretName := "my-pgbackrest-env-secret"
2777+
secretName := "my-pgbackrest-env-secret" // #nosec G101
27782778
cluster := &v1beta1.PostgresCluster{
27792779
Spec: v1beta1.PostgresClusterSpec{
27802780
Backups: v1beta1.Backups{

internal/pgbackrest/reconcile_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -930,14 +930,14 @@ func TestAddServerToRepoPod(t *testing.T) {
930930
break
931931
}
932932
}
933-
933+
934934
assert.Assert(t, pgBackRestContainer != nil, "pgbackrest container not found")
935-
assert.Assert(t, len(pgBackRestContainer.EnvFrom) == 1,
935+
assert.Assert(t, len(pgBackRestContainer.EnvFrom) == 1,
936936
"expected 1 EnvFrom reference, got %d", len(pgBackRestContainer.EnvFrom))
937-
assert.Assert(t, pgBackRestContainer.EnvFrom[0].SecretRef != nil,
937+
assert.Assert(t, pgBackRestContainer.EnvFrom[0].SecretRef != nil,
938938
"expected SecretRef to be set")
939939
assert.Equal(t, pgBackRestContainer.EnvFrom[0].SecretRef.Name, secretName,
940-
"expected secret name to be %q, got %q",
940+
"expected secret name to be %q, got %q",
941941
secretName, pgBackRestContainer.EnvFrom[0].SecretRef.Name)
942942
})
943943
}

internal/postgres/reconcile_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ volumes:
710710
})
711711

712712
t.Run("WithEnvFromSecret", func(t *testing.T) {
713-
secretName := "postgres-env-secret"
713+
secretName := "postgres-env-secret" // #nosec G101
714714
envFromInstance := new(v1beta1.PostgresInstanceSetSpec)
715715
envFromInstance.EnvFromSecret = &secretName
716716

@@ -727,12 +727,12 @@ volumes:
727727
}
728728

729729
assert.Assert(t, databaseContainer != nil, "database container not found")
730-
assert.Equal(t, len(databaseContainer.EnvFrom), 1,
730+
assert.Equal(t, len(databaseContainer.EnvFrom), 1,
731731
"expected 1 EnvFrom reference, got %d", len(databaseContainer.EnvFrom))
732-
assert.Assert(t, databaseContainer.EnvFrom[0].SecretRef != nil,
732+
assert.Assert(t, databaseContainer.EnvFrom[0].SecretRef != nil,
733733
"expected SecretRef to be set")
734734
assert.Equal(t, databaseContainer.EnvFrom[0].SecretRef.Name, secretName,
735-
"expected secret name to be %q, got %q",
735+
"expected secret name to be %q, got %q",
736736
secretName, databaseContainer.EnvFrom[0].SecretRef.Name)
737737
})
738738
}

percona/controller/pgcluster/controller.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
335335
cr.Annotations = make(map[string]string)
336336
}
337337

338-
339338
if patroniVersion, ok := cr.Annotations[pNaming.AnnotationCustomPatroniVersion]; ok {
340339
cr.Annotations[pNaming.AnnotationPatroniVersion] = patroniVersion
341340
return nil

percona/naming/annotations.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const (
4040

4141
AnnotationPatroniVersion = PrefixPerconaPGV2 + "patroni-version"
4242

43-
4443
// Special annotation to disable `patroni-version-check` by overriding the patroni version with a custom value.
4544
AnnotationCustomPatroniVersion = PrefixPerconaPGV2 + "custom-patroni-version"
4645
)

0 commit comments

Comments
 (0)