refactor: bsr - Deduplicate the importation of v1beta1 in grafanaFolder

aboulay-numspot · aboulay-numspot · commit d5a7194d5ad5 · 2024-07-04T16:11:17.000+02:00
diff --git a/controllers/grafanafolder_controller.go b/controllers/grafanafolder_controller.go
@@ -39,7 +39,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/grafana/grafana-operator/v5/api/v1beta1"
 	grafanav1beta1 "github.com/grafana/grafana-operator/v5/api/v1beta1"
 )
 
@@ -412,7 +411,7 @@ func (r *GrafanaFolderReconciler) retrieveParentFolderUID(ctx context.Context, c
 		return "", fmt.Errorf("error folderRef and folderUID cannot be declared at the same time in the CR %s (%s)", cr.Name, cr.Namespace)
 	}
 	if cr.Spec.ParentFolderRef != "" {
-		folder := &v1beta1.GrafanaFolder{}
+		folder := &grafanav1beta1.GrafanaFolder{}
 
 		err := r.Client.Get(ctx, client.ObjectKey{
 			Namespace: cr.Namespace,

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ import (`
`39`	`39`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`40`	`40`	`"sigs.k8s.io/controller-runtime/pkg/log"`
`41`	`41`
`42`		`- "github.com/grafana/grafana-operator/v5/api/v1beta1"`
`43`	`42`	`grafanav1beta1 "github.com/grafana/grafana-operator/v5/api/v1beta1"`
`44`	`43`	`)`
`45`	`44`
`@@ -412,7 +411,7 @@ func (r *GrafanaFolderReconciler) retrieveParentFolderUID(ctx context.Context, c`
`412`	`411`	`return "", fmt.Errorf("error folderRef and folderUID cannot be declared at the same time in the CR %s (%s)", cr.Name, cr.Namespace)`
`413`	`412`	`}`
`414`	`413`	`if cr.Spec.ParentFolderRef != "" {`
`415`		`- folder := &v1beta1.GrafanaFolder{}`
	`414`	`+ folder := &grafanav1beta1.GrafanaFolder{}`
`416`	`415`
`417`	`416`	`err := r.Client.Get(ctx, client.ObjectKey{`
`418`	`417`	`Namespace: cr.Namespace,`