fix: invalid memory address or nil pointer dereference during cluster… (

argoproj#7445) Signed-off-by: May Zhang <[email protected]>
PaytmLabs · Oct 17, 2021 · f0cd21a · f0cd21a
1 parent d7d8fe3
commit f0cd21a
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -83,21 +83,26 @@ func (s *Server) Create(ctx context.Context, q *cluster.ClusterCreateRequest) (*
 	}
 
 	clust, err := s.db.CreateCluster(ctx, c)
-	if status.Convert(err).Code() == codes.AlreadyExists {
-		// act idempotent if existing spec matches new spec
-		existing, getErr := s.db.GetCluster(ctx, c.Server)
-		if getErr != nil {
-			return nil, status.Errorf(codes.Internal, "unable to check existing cluster details: %v", getErr)
-		}
+	if err != nil {
+		if status.Convert(err).Code() == codes.AlreadyExists {
+			// act idempotent if existing spec matches new spec
+			existing, getErr := s.db.GetCluster(ctx, c.Server)
+			if getErr != nil {
+				return nil, status.Errorf(codes.Internal, "unable to check existing cluster details: %v", getErr)
+			}
 
-		if existing.Equals(c) {
-			clust = existing
-		} else if q.Upsert {
-			return s.Update(ctx, &cluster.ClusterUpdateRequest{Cluster: c})
+			if existing.Equals(c) {
+				clust = existing
+			} else if q.Upsert {
+				return s.Update(ctx, &cluster.ClusterUpdateRequest{Cluster: c})
+			} else {
+				return nil, status.Errorf(codes.InvalidArgument, argo.GenerateSpecIsDifferentErrorMessage("cluster", existing, c))
+			}
 		} else {
-			return nil, status.Errorf(codes.InvalidArgument, argo.GenerateSpecIsDifferentErrorMessage("cluster", existing, c))
+			return nil, err
 		}
 	}
+
 	err = s.cache.SetClusterInfo(c.Server, &appv1.ClusterInfo{
 		ServerVersion: serverVersion,
 		ConnectionState: appv1.ConnectionState{