From fd070483688b68ab7c0fef4bfbf2cdc2defd5f63 Mon Sep 17 00:00:00 2001
From: Denys Fedoryshchenko <denys.f@collabora.com>
Date: Mon, 30 Jun 2025 17:15:48 +0300
Subject: kcidb: convert from Google PubSub to plain REST interface

KCIDB removing Google PubSub and start to accept REST submissions.
This will require new configuration options, such as REST URL and
 token.

Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
---
 pkg/kcidb/client.go | 62 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 22 deletions(-)

(limited to 'pkg/kcidb/client.go')

diff --git a/pkg/kcidb/client.go b/pkg/kcidb/client.go
index c733aa910..bba811c7e 100644
--- a/pkg/kcidb/client.go
+++ b/pkg/kcidb/client.go
@@ -8,22 +8,21 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"os"
 	"os/exec"
 	"strings"
 	"time"
 
-	"cloud.google.com/go/pubsub"
 	"github.com/google/syzkaller/dashboard/dashapi"
 	"github.com/google/syzkaller/sys/targets"
-	"google.golang.org/api/option"
 )
 
 type Client struct {
-	ctx    context.Context
-	origin string
-	client *pubsub.Client
-	topic  *pubsub.Topic
+	ctx     context.Context
+	origin  string
+	resturi string
+	token   string
 }
 
 // NewClient creates a new client to send pubsub messages to Kcidb.
@@ -31,23 +30,40 @@ type Client struct {
 // Project is Kcidb GCE project name, e.g. "kernelci-production".
 // Topic is pubsub topic to publish messages to, e.g. "playground_kernelci_new".
 // Credentials is Google application credentials file contents to use for authorization.
-func NewClient(ctx context.Context, origin, project, topic string, credentials []byte) (*Client, error) {
-	client, err := pubsub.NewClient(ctx, project, option.WithCredentialsJSON(credentials))
-	if err != nil {
-		return nil, err
-	}
+func NewClient(ctx context.Context, origin, resturi, token string) (*Client, error) {
 	c := &Client{
-		ctx:    ctx,
-		origin: origin,
-		client: client,
-		topic:  client.Topic(topic),
+		ctx:     ctx,
+		origin:  origin,
+		resturi: resturi,
+		token:   token,
 	}
-	return c, err
+	return c, nil
 }
 
 func (c *Client) Close() error {
-	c.topic.Stop()
-	return c.client.Close()
+	return nil
+}
+
+func (c *Client) RESTSubmit(data []byte) error {
+	if c.resturi == "" {
+		return fmt.Errorf("resturi is not set")
+	}
+	req, err := http.NewRequest("POST", c.resturi, bytes.NewReader(data))
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Authorization", "Bearer "+c.token)
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to send request: %w", err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("unexpected response status: %s", resp.Status)
+	}
+	return nil
 }
 
 func (c *Client) Publish(bug *dashapi.BugReport) error {
@@ -62,7 +78,9 @@ func (c *Client) Publish(bug *dashapi.BugReport) error {
 	if err := kcidbValidate(data); err != nil {
 		return err
 	}
-	_, err = c.topic.Publish(c.ctx, &pubsub.Message{Data: data}).Get(c.ctx)
+	if err := c.RESTSubmit(data); err != nil {
+		return fmt.Errorf("failed to submit kcidb json: %w", err)
+	}
 	return err
 }
 
@@ -100,8 +118,8 @@ func (c *Client) convert(target *targets.Target, bug *dashapi.BugReport) *Kcidb
 				GitRepositoryURL:    normalizeRepo(bug.KernelRepo),
 				GitCommitHash:       bug.KernelCommit,
 				GitRepositoryBranch: bug.KernelBranch,
-				Comment:         bug.KernelCommitTitle,
-				StartTime:       bug.BuildTime.Format(time.RFC3339),
+				Comment:             bug.KernelCommitTitle,
+				StartTime:           bug.BuildTime.Format(time.RFC3339),
 				Valid:               true,
 			},
 		},
@@ -155,7 +173,7 @@ func (c *Client) convert(target *targets.Target, bug *dashapi.BugReport) *Kcidb
 				Path:        "syzkaller",
 				StartTime:   bug.CrashTime.Format(time.RFC3339),
 				OutputFiles: outputFiles,
-				Comment: bug.Title,
+				Comment:     bug.Title,
 				Status:      "FAIL",
 				Misc: &TestMisc{
 					OriginURL:       bug.Link,
-- 
cgit mrf-deployment