From e420ff1725a97032db11a4461230adb4df5371e3 Mon Sep 17 00:00:00 2001 From: kerenlahav <45451976+kerenlahav@users.noreply.github.com> Date: Sun, 17 Dec 2023 12:04:21 +0200 Subject: [PATCH] better error message for invalid Service Manager credentials (#376) --- Dockerfile | 2 +- controllers/base_controller.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a695d544..489e1d7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.21.4-alpine as builder +FROM --platform=$BUILDPLATFORM golang:1.21.5-alpine as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/controllers/base_controller.go b/controllers/base_controller.go index 5944dd80..9ee69908 100644 --- a/controllers/base_controller.go +++ b/controllers/base_controller.go @@ -108,6 +108,12 @@ func (r *BaseReconciler) getSMClient(ctx context.Context, object api.SAPBTPResou } } + if len(cfg.ClientID) == 0 || + len(cfg.ClientSecret) == 0 || + len(cfg.URL) == 0 || + len(cfg.TokenURL) == 0 { + return nil, fmt.Errorf("invalid Service-Manager credentials, contact your cluster administrator") + } cl, err := sm.NewClient(ctx, cfg, nil) return cl, err }