fix: nil pointer to ProcessCache

snapp-incubator · Aug 23, 2023 · 814b208 · 814b208
1 parent c0e30ab
commit 814b208
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/controllers/accesstoken_controller.go b/controllers/accesstoken_controller.go
@@ -31,7 +31,7 @@ import (
 type AccessTokenReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
-	Cache  *ProcessCache
+	Cache  ProcessCache
 }
 
 //+kubebuilder:rbac:groups=cerberus.snappcloud.io,resources=accesstokens,verbs=get;list;watch;create;update;patch;delete
@@ -50,7 +50,7 @@ type AccessTokenReconciler struct {
 func (r *AccessTokenReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = log.FromContext(ctx)
 
-	err := (*r.Cache).UpdateCache(r.Client, ctx)
+	err := r.Cache.UpdateCache(r.Client, ctx)
 
 	return ctrl.Result{}, err
 }

diff --git a/controllers/webservice_controller.go b/controllers/webservice_controller.go
@@ -31,7 +31,7 @@ import (
 type WebServiceReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
-	Cache  *ProcessCache
+	Cache  ProcessCache
 }
 
 //+kubebuilder:rbac:groups=cerberus.snappcloud.io,resources=webservices,verbs=get;list;watch;create;update;patch;delete
@@ -50,7 +50,7 @@ type WebServiceReconciler struct {
 func (r *WebServiceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = log.FromContext(ctx)
 
-	err := (*r.Cache).UpdateCache(r.Client, ctx)
+	err := r.Cache.UpdateCache(r.Client, ctx)
 
 	return ctrl.Result{}, err
 }

diff --git a/controllers/webserviceaccessbinding_controller.go b/controllers/webserviceaccessbinding_controller.go
@@ -31,7 +31,7 @@ import (
 type WebserviceAccessBindingReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
-	Cache  *ProcessCache
+	Cache  ProcessCache
 }
 
 //+kubebuilder:rbac:groups=cerberus.snappcloud.io,resources=webserviceaccessbindings,verbs=get;list;watch;create;update;patch;delete
@@ -50,7 +50,7 @@ type WebserviceAccessBindingReconciler struct {
 func (r *WebserviceAccessBindingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = log.FromContext(ctx)
 
-	err := (*r.Cache).UpdateCache(r.Client, ctx)
+	err := r.Cache.UpdateCache(r.Client, ctx)
 
 	return ctrl.Result{}, err
 }

diff --git a/main.go b/main.go
@@ -74,7 +74,13 @@ func main() {
 	flag.Parse()
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
-	mgr, err := setupManager(metricsAddr, probeAddr, enableLeaderElection)
+	listener, srv, authenticator, err := setupAuthenticationServer(authAddr)
+	if err != nil {
+		setupLog.Error(err, "unable to set up authentication server")
+		os.Exit(1)
+	}
+
+	mgr, err := setupManager(metricsAddr, probeAddr, enableLeaderElection, authenticator)
 	if err != nil {
 		setupLog.Error(err, "unable to set up manager")
 		os.Exit(1)
@@ -88,12 +94,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	listener, srv, err := setupAuthenticationServer(authAddr, mgr)
-	if err != nil {
-		setupLog.Error(err, "unable to set up authentication server")
-		os.Exit(1)
-	}
-
 	errChan := make(chan error)
 	ctx := ctrl.SetupSignalHandler()
 
@@ -109,7 +109,12 @@ func main() {
 	}
 }
 
-func setupManager(metricsAddr string, probeAddr string, enableLeaderElection bool) (ctrl.Manager, error) {
+func setupManager(
+	metricsAddr string,
+	probeAddr string,
+	enableLeaderElection bool,
+	authenticator *auth.Authenticator,
+) (ctrl.Manager, error) {
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
 		MetricsBindAddress:     metricsAddr,
@@ -137,20 +142,23 @@ func setupManager(metricsAddr string, probeAddr string, enableLeaderElection boo
 	if err = (&controllers.AccessTokenReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
+		Cache:  authenticator,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "AccessToken")
 		return nil, err
 	}
 	if err = (&controllers.WebServiceReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
+		Cache:  authenticator,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "WebService")
 		return nil, err
 	}
 	if err = (&controllers.WebserviceAccessBindingReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
+		Cache:  authenticator,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "WebserviceAccessBinding")
 		return nil, err
@@ -171,11 +179,11 @@ func setupHealthChecks(mgr ctrl.Manager) error {
 	return nil
 }
 
-func setupAuthenticationServer(listenAddress string, mgr ctrl.Manager) (net.Listener, *grpc.Server, error) {
+func setupAuthenticationServer(listenAddress string) (net.Listener, *grpc.Server, *auth.Authenticator, error) {
 	listener, err := net.Listen("tcp", listenAddress)
 	if err != nil {
 		setupLog.Error(err, "problem in binding authorization service")
-		return nil, nil, err
+		return nil, nil, nil, err
 	}
 
 	grpcOpts := []grpc.ServerOption{
@@ -189,10 +197,10 @@ func setupAuthenticationServer(listenAddress string, mgr ctrl.Manager) (net.List
 	)
 	if err != nil {
 		setupLog.Error(err, "unable to create and update authenticator")
-		return nil, nil, err
+		return nil, nil, nil, err
 	}
 	auth.RegisterServer(srv, authenticator)
-	return listener, srv, nil
+	return listener, srv, authenticator, nil
 }
 
 func runAuthenticationServer(ctx context.Context, listener net.Listener, srv *grpc.Server, errChan chan error) {