Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix linting #15

Merged
merged 2 commits into from
Oct 9, 2024
Merged

chore: fix linting #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26039c1
chore: fix linting
basti1302 Oct 9, 2024
0540bcb
ci: udpate perses GH action and golangci-lint
basti1302 Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,17 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: perses/github-actions@v0.1.0
- uses: perses/github-actions@v0.6.0
- uses: ./.github/perses-ci/actions/setup_environment
with:
enable_go: true
enable_go_cache: false
enable_npm: false
- name: generate files
run: make generate
- name: golangci-lint
uses: golangci/golangci-lint-action@v3.7.0
uses: golangci/golangci-lint-action@v6.1.0
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.54.2
version: v1.61.0
args: --timeout 5m
4 changes: 2 additions & 2 deletions controllers/dashboard_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
dashboardcontroller "github.com/perses/perses-operator/controllers/dashboards"
internal "github.com/perses/perses-operator/internal/perses"
common "github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses/pkg/client/perseshttp"
persesv1 "github.com/perses/perses/pkg/model/api/v1"
persescommon "github.com/perses/perses/pkg/model/api/v1/common"
Expand Down Expand Up @@ -171,7 +171,7 @@ var _ = Describe("Dashboard controller", func() {
dashboardWithStatus := &persesv1alpha1.PersesDashboard{}
err = k8sClient.Get(ctx, dashboardNamespaceName, dashboardWithStatus)

if dashboardWithStatus.Status.Conditions == nil || len(dashboardWithStatus.Status.Conditions) == 0 {
if len(dashboardWithStatus.Status.Conditions) == 0 {
return fmt.Errorf("No status condition was added to the perses dashboard instance")
} else {
latestStatusCondition := dashboardWithStatus.Status.Conditions[len(dashboardWithStatus.Status.Conditions)-1]
Expand Down
4 changes: 2 additions & 2 deletions controllers/dashboards/dasboard_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
perseshttp "github.com/perses/perses/pkg/client/perseshttp"
"github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses/pkg/client/perseshttp"
persesv1 "github.com/perses/perses/pkg/model/api/v1"
logger "github.com/sirupsen/logrus"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
6 changes: 3 additions & 3 deletions controllers/dashboards/persesdashboard_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
common "github.com/perses/perses-operator/internal/perses/common"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/subreconciler"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -103,7 +103,7 @@ func (r *PersesDashboardReconciler) setStatusToUnknown(ctx context.Context, req
return r, err
}

if dashboard.Status.Conditions == nil || len(dashboard.Status.Conditions) == 0 {
if len(dashboard.Status.Conditions) == 0 {
meta.SetStatusCondition(&dashboard.Status.Conditions, metav1.Condition{Type: common.TypeAvailablePerses, Status: metav1.ConditionUnknown, Reason: "Reconciling", Message: "Starting reconciliation"})
if err := r.Status().Update(ctx, dashboard); err != nil {
log.WithError(err).Error("Failed to update Perses dashboard status")
Expand Down
4 changes: 2 additions & 2 deletions controllers/datasource_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
datasourcecontroller "github.com/perses/perses-operator/controllers/datasources"
internal "github.com/perses/perses-operator/internal/perses"
common "github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses/pkg/client/perseshttp"
persesv1 "github.com/perses/perses/pkg/model/api/v1"
persescommon "github.com/perses/perses/pkg/model/api/v1/common"
Expand Down Expand Up @@ -160,7 +160,7 @@ var _ = Describe("Datasource controller", func() {
datasourceWithStatus := &persesv1alpha1.PersesDatasource{}
err = k8sClient.Get(ctx, datasourceNamespaceName, datasourceWithStatus)

if datasourceWithStatus.Status.Conditions == nil || len(datasourceWithStatus.Status.Conditions) == 0 {
if len(datasourceWithStatus.Status.Conditions) == 0 {
return fmt.Errorf("No status condition was added to the perses datasource instance")
} else {
latestStatusCondition := datasourceWithStatus.Status.Conditions[len(datasourceWithStatus.Status.Conditions)-1]
Expand Down
4 changes: 2 additions & 2 deletions controllers/datasources/datasource_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
perseshttp "github.com/perses/perses/pkg/client/perseshttp"
"github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses/pkg/client/perseshttp"
persesv1 "github.com/perses/perses/pkg/model/api/v1"
logger "github.com/sirupsen/logrus"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
6 changes: 3 additions & 3 deletions controllers/datasources/persesdatasource_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
common "github.com/perses/perses-operator/internal/perses/common"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/subreconciler"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -103,7 +103,7 @@ func (r *PersesDatasourceReconciler) setStatusToUnknown(ctx context.Context, req
return r, err
}

if datasource.Status.Conditions == nil || len(datasource.Status.Conditions) == 0 {
if len(datasource.Status.Conditions) == 0 {
meta.SetStatusCondition(&datasource.Status.Conditions, metav1.Condition{Type: common.TypeAvailablePerses, Status: metav1.ConditionUnknown, Reason: "Reconciling", Message: "Starting reconciliation"})
if err := r.Status().Update(ctx, datasource); err != nil {
log.WithError(err).Error("Failed to update Perses datasource status")
Expand Down
4 changes: 2 additions & 2 deletions controllers/perses/configmap_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

"github.com/perses/perses-operator/api/v1alpha1"
common "github.com/perses/perses-operator/internal/perses/common"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/subreconciler"
logger "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions controllers/perses/deployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

"github.com/perses/perses-operator/api/v1alpha1"
common "github.com/perses/perses-operator/internal/perses/common"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/subreconciler"
logger "github.com/sirupsen/logrus"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
6 changes: 3 additions & 3 deletions controllers/perses/perses_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

"github.com/perses/perses-operator/api/v1alpha1"
common "github.com/perses/perses-operator/internal/perses/common"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/subreconciler"
logger "github.com/sirupsen/logrus"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -106,7 +106,7 @@ func (r *PersesReconciler) setStatusToUnknown(ctx context.Context, req ctrl.Requ
}

// Let's just set the status as Unknown when no status are available
if perses.Status.Conditions == nil || len(perses.Status.Conditions) == 0 {
if len(perses.Status.Conditions) == 0 {
meta.SetStatusCondition(&perses.Status.Conditions, metav1.Condition{Type: common.TypeAvailablePerses, Status: metav1.ConditionUnknown, Reason: "Reconciling", Message: "Starting reconciliation"})
if err := r.Status().Update(ctx, perses); err != nil {
log.WithError(err).Error("Failed to update Perses status")
Expand Down
4 changes: 2 additions & 2 deletions controllers/perses/service_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"time"

"github.com/perses/perses-operator/api/v1alpha1"
common "github.com/perses/perses-operator/internal/perses/common"
subreconciler "github.com/perses/perses-operator/internal/subreconciler"
"github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/subreconciler"
logger "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
6 changes: 3 additions & 3 deletions controllers/perses_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
. "github.com/onsi/gomega"
persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
persescontroller "github.com/perses/perses-operator/controllers/perses"
common "github.com/perses/perses-operator/internal/perses/common"
"github.com/perses/perses-operator/internal/perses/common"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -144,7 +144,7 @@ var _ = Describe("Perses controller", func() {

By("Checking the latest Status Condition added to the Perses instance")
Eventually(func() error {
if perses.Status.Conditions != nil && len(perses.Status.Conditions) != 0 {
if len(perses.Status.Conditions) != 0 {
latestStatusCondition := perses.Status.Conditions[len(perses.Status.Conditions)-1]
expectedLatestStatusCondition := metav1.Condition{Type: common.TypeAvailablePerses,
Status: metav1.ConditionTrue, Reason: "Reconciling",
Expand Down Expand Up @@ -184,7 +184,7 @@ var _ = Describe("Perses controller", func() {

By("Checking the latest Status Condition added to the Perses instance")
Eventually(func() error {
if perses.Status.Conditions != nil && len(perses.Status.Conditions) != 0 {
if len(perses.Status.Conditions) != 0 {
latestStatusCondition := perses.Status.Conditions[len(perses.Status.Conditions)-1]
expectedLatestStatusCondition := metav1.Condition{Type: common.TypeAvailablePerses,
Status: metav1.ConditionTrue, Reason: "Finalizing",
Expand Down
2 changes: 1 addition & 1 deletion internal/perses/common/perses_client_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

persesv1alpha1 "github.com/perses/perses-operator/api/v1alpha1"
v1 "github.com/perses/perses/pkg/client/api/v1"
perseshttp "github.com/perses/perses/pkg/client/perseshttp"
"github.com/perses/perses/pkg/client/perseshttp"
)

type PersesClientFactory interface {
Expand Down
Loading