fix: more resilient check for missing configs

jippi · Aug 30, 2024 · 32a5a32 · 32a5a32
1 parent 0e94cc9
commit 32a5a32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/cmd/gitlab_server_handlers.go b/cmd/gitlab_server_handlers.go
@@ -111,6 +111,13 @@ func GitLabWebhookHandler(ctx context.Context, webhookSecret string) http.Handle
 			return
 		}
 
+		// Check if there exists scm-config file in the repo before moving forward
+		if _, err := client.MergeRequests().GetRemoteConfig(ctx, state.ConfigFilePath(ctx), ""); err != nil {
+			errHandler(ctx, w, http.StatusOK, err)
+
+			return
+		}
+
 		// Process the MR
 		if err := ProcessMR(ctx, client, nil, fullEventPayload); err != nil {
 			errHandler(ctx, w, http.StatusOK, err)

diff --git a/pkg/scm/gitlab/client_merge_request.go b/pkg/scm/gitlab/client_merge_request.go
@@ -54,7 +54,13 @@ func (client *MergeRequestClient) GetRemoteConfig(ctx context.Context, filename,
 		return nil, fmt.Errorf("could not parse project id: %w", err)
 	}
 
-	file, _, err := client.client.wrapped.RepositoryFiles.GetRawFile(project, filename, &go_gitlab.GetRawFileOptions{Ref: scm.Ptr(ref)})
+	var refPtr *string
+
+	if len(ref) != 0 {
+		refPtr = scm.Ptr(ref)
+	}
+
+	file, _, err := client.client.wrapped.RepositoryFiles.GetRawFile(project, filename, &go_gitlab.GetRawFileOptions{Ref: refPtr})
 	if err != nil {
 		return nil, fmt.Errorf("failed to read remote raw file: %w", err)
 	}