GCP Pub Scaler should not panic (kedacore#873)

Signed-off-by: Zbynek Roubalik <zroubali@redhat.com>
tbickford · Jun 21, 2020 · 42bfa1c · 42bfa1c
1 parent 0462650
commit 42bfa1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/scalers/gcp_pub_sub_scaler.go b/pkg/scalers/gcp_pub_sub_scaler.go
@@ -85,7 +85,7 @@ func (s *pubsubScaler) IsActive(ctx context.Context) (bool, error) {
 	size, err := s.GetSubscriptionSize(ctx)
 
 	if err != nil {
-		gcpPubSubLog.Error(err, "error")
+		gcpPubSubLog.Error(err, "error getting Active Status")
 		return false, err
 	}
 

diff --git a/pkg/scalers/stackdriver_client.go b/pkg/scalers/stackdriver_client.go
@@ -26,13 +26,12 @@ func NewStackDriverClient(ctx context.Context, credentials string) (*StackDriver
 	var gcpCredentials GoogleApplicationCredentials
 
 	if err := json.Unmarshal([]byte(credentials), &gcpCredentials); err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	clientOption := option.WithCredentialsJSON([]byte(credentials))
 
 	client, err := monitoring.NewMetricClient(ctx, clientOption)
-
 	if err != nil {
 		return nil, err
 	}