Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(backend): implement kafka connect grpc conect
Browse files Browse the repository at this point in the history
Extend kafka connect services to expose them in grpc connect and grpc
gateway so they get exposed via REST API

Signed-off-by: Santiago Jimenez Giraldo <[email protected]>
sago2k8 committed Nov 8, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 0ee20e3 commit 591a231
Showing 19 changed files with 1,016 additions and 759 deletions.
6 changes: 4 additions & 2 deletions backend/go.mod
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ require (
github.com/basgys/goxml2json v1.1.0
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
github.com/bufbuild/protovalidate-go v0.3.1
github.com/carlmjohnson/requests v0.23.5
github.com/cloudhut/common v0.10.0
github.com/cloudhut/connect-client v0.0.0-20230417124247-963e5bcdfee7
github.com/docker/docker v24.0.4+incompatible
@@ -22,6 +23,7 @@ require (
github.com/go-resty/resty/v2 v2.7.0
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.3
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.3.0
github.com/gorilla/schema v1.2.0
github.com/gorilla/websocket v1.5.0
@@ -68,7 +70,6 @@ require (
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-simplejson v0.5.0 // indirect
github.com/carlmjohnson/requests v0.23.5 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
@@ -89,7 +90,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/cel-go v0.18.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -160,3 +160,5 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace go.vallahaye.net/connect-gateway => github.com/birdayz/connect-gateway v0.0.0-20231031164214-a6a1a5702281
5 changes: 2 additions & 3 deletions backend/go.sum
Original file line number Diff line number Diff line change
@@ -88,6 +88,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/birdayz/connect-gateway v0.0.0-20231031164214-a6a1a5702281 h1:ws3FpNdLfQLaBjWGBq3AxgFYNci/bx2MvgyhBmqv8dQ=
github.com/birdayz/connect-gateway v0.0.0-20231031164214-a6a1a5702281/go.mod h1:KlT//qnfPeefsOvzg/5s/a4a20aWlpqXY/3O5HaPjJs=
github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
@@ -273,7 +275,6 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -658,8 +659,6 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
go.vallahaye.net/connect-gateway v0.3.0 h1:4QJ3+bIctIt+VuyLXcjfMkp8bwqoCSs4yx43QHNjwso=
go.vallahaye.net/connect-gateway v0.3.0/go.mod h1:aspehLu3zuVotIESKfJwzCoV6ViHEXEOieEfQnwDwRM=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
176 changes: 176 additions & 0 deletions backend/pkg/api/connect/service/kafkaconnect/mapper.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
// Copyright 2023 Redpanda Data, Inc.
//
// Use of this software is governed by the Business Source License
// included in the file licenses/BSL.md
//
// As of the Change Date specified in that file, in accordance with
// the Business Source License, use of this software will be governed
// by the Apache License, Version 2.0

// Package kafkaconnect implements the KafkaConnect interface for the Connect API.
package kafkaconnect

import (
"fmt"

con "github.com/cloudhut/connect-client"
"golang.org/x/exp/slices"

kafkaconnect "github.com/redpanda-data/console/backend/pkg/connect"
dataplanev1alpha1 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha1"
)

type mapper struct{}

func (m mapper) connectorsHTTPResponseToProto(httpResponse kafkaconnect.ClusterConnectors, request *dataplanev1alpha1.ListConnectorsRequest) (*dataplanev1alpha1.ListConnectorsResponse, error) {
connectors := make([]*dataplanev1alpha1.ListConnectorsResponse_ConnectorInfoStatus, len(httpResponse.Connectors))

for i, connector := range httpResponse.Connectors {
errors, enumErr := m.connectorErrorsToProto(connector.Errors)
if enumErr != nil {
return nil, enumErr
}

connectors[i] = &dataplanev1alpha1.ListConnectorsResponse_ConnectorInfoStatus{
Name: connector.Name,
HolisticState: m.holisticStateToProto(connector.Status),
Errors: errors,
}

if slices.Contains(request.Expand, "info") {
connectors[i].Info = &dataplanev1alpha1.ConnectorSpec{
Name: connector.Name,
Type: connector.Type,
Config: connector.Config,
Tasks: m.taskInfoListToProtoInfo(connector.Name, connector.Tasks),
}
}

if slices.Contains(request.Expand, "status") {
connectors[i].Status = &dataplanev1alpha1.ConnectorStatus{
Name: connector.Name,
Connector: &dataplanev1alpha1.ConnectorStatus_Connector{
State: connector.State,
WorkerId: connector.WorkerID,
},
Tasks: m.taskInfoListToProtoStatus(connector.Tasks),
Type: connector.Type,
Trace: connector.Trace,
}
}
}

return &dataplanev1alpha1.ListConnectorsResponse{
Connectors: connectors,
}, nil
}

func (m mapper) taskInfoListToProtoInfo(connectorName string, taskInfoList []kafkaconnect.ClusterConnectorTaskInfo) []*dataplanev1alpha1.TaskInfo {
tasks := make([]*dataplanev1alpha1.TaskInfo, len(taskInfoList))
for i, task := range taskInfoList {
tasks[i] = m.taskToProto(connectorName, task.TaskID)
}
return tasks
}

func (m mapper) connectorTaskIDToProto(connectorName string, taskInfoList []con.ConnectorTaskID) []*dataplanev1alpha1.TaskInfo {
tasks := make([]*dataplanev1alpha1.TaskInfo, len(taskInfoList))
for i, task := range taskInfoList {
tasks[i] = m.taskToProto(connectorName, task.Task)
}
return tasks
}

func (mapper) taskToProto(name string, taskID int) *dataplanev1alpha1.TaskInfo {
return &dataplanev1alpha1.TaskInfo{
Connector: name,
Task: int32(taskID),
}
}

func (mapper) taskInfoListToProtoStatus(taskInfoList []kafkaconnect.ClusterConnectorTaskInfo) []*dataplanev1alpha1.TaskStatus {
tasks := make([]*dataplanev1alpha1.TaskStatus, len(taskInfoList))
for i, task := range taskInfoList {
tasks[i] = &dataplanev1alpha1.TaskStatus{
Id: int32(task.TaskID),
State: task.State,
WorkerId: task.WorkerID,
Trace: task.Trace,
}
}
return tasks
}

func (mapper) holisticStateToProto(state string) dataplanev1alpha1.HolisticState {
switch state {
case kafkaconnect.ConnectorStatusPaused:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_PAUSED
case kafkaconnect.ConnectorStatusStopped:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_STOPPED
case kafkaconnect.ConnectorStatusRestarting:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_RESTARTING
case kafkaconnect.ConnectorStatusDestroyed:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_DESTROYED
case kafkaconnect.ConnectorStatusUnassigned:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_UNASSIGNED
case kafkaconnect.ConnectorStatusHealthy:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_HEALTHY
case kafkaconnect.ConnectorStatusUnhealthy:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_UNHEALTHY
case kafkaconnect.ConnectorStatusDegraded:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_DEGRADED
default:
return dataplanev1alpha1.HolisticState_HOLISTIC_STATE_UNKNOWN
}
}

func (m mapper) connectorErrorsToProto(errors []kafkaconnect.ClusterConnectorInfoError) ([]*dataplanev1alpha1.ConnectorError, error) {
connectErrors := make([]*dataplanev1alpha1.ConnectorError, len(errors))
for i, err := range errors {
errorType, enumErr := m.connectorErrorTypeToProto(err.Type)
if enumErr != nil {
return nil, enumErr
}
connectErrors[i] = &dataplanev1alpha1.ConnectorError{
Title: err.Title,
Content: err.Content,
Type: errorType,
}
}
return connectErrors, nil
}

func (mapper) connectorErrorTypeToProto(errorType string) (dataplanev1alpha1.ConnectorError_Type, error) {
switch errorType {
case "ERROR":
return dataplanev1alpha1.ConnectorError_TYPE_ERROR, nil
case "WARNING":
return dataplanev1alpha1.ConnectorError_TYPE_WARNING, nil
default:
return dataplanev1alpha1.ConnectorError_TYPE_UNSPECIFIED, fmt.Errorf("failed to map given error type %q to proto", errorType)
}
}

func (mapper) createConnectorProtoToClientRequest(createConnector *dataplanev1alpha1.CreateConnectorRequest) (*con.CreateConnectorRequest, error) {
if createConnector == nil || createConnector.Connector == nil {
return nil, fmt.Errorf("create connector request is nil")
}

if len(createConnector.Connector.Config) == 0 {
return nil, fmt.Errorf("create connector request config is empty")
}

return &con.CreateConnectorRequest{
Name: createConnector.Connector.Name,
Config: ConvertStringMapToInterfaceMap(createConnector.Connector.Config),
}, nil
}

// ConvertStringMapToInterfaceMap converts interface map to string map
func ConvertStringMapToInterfaceMap(stringMap map[string]string) map[string]interface{} {
interfaceMap := make(map[string]interface{}, len(stringMap))
for key, value := range stringMap {
interfaceMap[key] = value
}
return interfaceMap
}
Loading

0 comments on commit 591a231

Please sign in to comment.