Forward connector utilities address and token to plugin executable (#112

)

Makefile

@@ -2,6 +2,10 @@
 test:
 	go test $(GOTEST_FLAGS) -race ./...
 
+.PHONY: fmt
+fmt:
+	gofumpt -l -w .
+
 .PHONY: lint
 lint:
 	golangci-lint run

go.mod

@@ -13,6 +13,7 @@ require (
 	go.uber.org/mock v0.4.0
 	google.golang.org/grpc v1.65.0
 	google.golang.org/protobuf v1.34.2
+	mvdan.cc/gofumpt v0.6.0
 )
 
 require (
@@ -257,6 +258,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	honnef.co/go/tools v0.4.7 // indirect
-	mvdan.cc/gofumpt v0.6.0 // indirect
 	mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
 )

pconduit/context.go

@@ -14,7 +14,11 @@
 
 package pconduit
 
-import "context"
+import (
+	"context"
+)
+
+// -- Connector token ----------------------------------------------------------
 
 type connectorTokenCtxKey struct{}
 

pconduit/context_test.go

@@ -0,0 +1,33 @@
+// Copyright © 2024 Meroxa, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pconduit
+
+import (
+	"context"
+	"testing"
+
+	"github.com/matryer/is"
+)
+
+func TestContextUtils_ConnectorToken(t *testing.T) {
+	is := is.New(t)
+	ctx := context.Background()
+
+	want := "test-token"
+	ctx = ContextWithConnectorToken(ctx, want)
+	got := ConnectorTokenFromContext(ctx)
+
+	is.Equal(want, got)
+}

pconduit/env_vars.go

@@ -16,5 +16,7 @@ package pconduit
 
 const (
 	EnvConduitConnectorUtilitiesGRPCTarget = "CONDUIT_CONNECTOR_UTILITIES_GRPC_TARGET"
-	EnvConduitConnectorSchemaToken         = "CONDUIT_CONNECTOR_SCHEMA_TOKEN"
+	EnvConduitConnectorSchemaToken         = "CONDUIT_CONNECTOR_TOKEN"
+	EnvConduitConnectorID                  = "CONDUIT_CONNECTOR_ID"
+	EnvConduitLogLevel                     = "CONDUIT_LOG_LEVEL"
 )

pconduit/v1/client/schema.go

@@ -32,7 +32,9 @@ type SchemaServiceClient struct {
 var _ pconduit.SchemaService = (*SchemaServiceClient)(nil)
 
 func NewSchemaServiceClient(cc *grpc.ClientConn) *SchemaServiceClient {
-	return &SchemaServiceClient{grpcClient: conduitv1.NewSchemaServiceClient(cc)}
+	return &SchemaServiceClient{
+		grpcClient: conduitv1.NewSchemaServiceClient(cc),
+	}
 }
 
 func (c *SchemaServiceClient) CreateSchema(ctx context.Context, request pconduit.CreateSchemaRequest) (pconduit.CreateSchemaResponse, error) {

pconnector/client/option.go

@@ -15,6 +15,7 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 	"net"
 	"os/exec"
@@ -76,6 +77,17 @@ func WithDelve(port int) Option {
 	})
 }
 
+func WithEnvVar(key, value string) Option {
+	return serveConfigFunc(func(in *plugin.ClientConfig) error {
+		if in.Cmd == nil {
+			return errors.New("plugin client config has no Cmd set (tip: check if WithReattachConfig is used)")
+		}
+
+		in.Cmd.Env = append(in.Cmd.Env, key+"="+value)
+		return nil
+	})
+}
+
 func getFreePort() int {
 	// Excerpt from net.Listen godoc:
 	// If the port in the address parameter is empty or "0", as in

pconnector/client/option_test.go

@@ -0,0 +1,42 @@
+// Copyright © 2024 Meroxa, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package client
+
+import (
+	"os/exec"
+	"testing"
+
+	"github.com/conduitio/conduit-connector-protocol/pconduit"
+	"github.com/hashicorp/go-plugin"
+	"github.com/matryer/is"
+)
+
+func TestOption_WithEnvVar(t *testing.T) {
+	is := is.New(t)
+	cmd := exec.Command("test-path")
+	cmd.Env = []string{"FOO=BAR"}
+	cc := &plugin.ClientConfig{Cmd: cmd}
+
+	underTest := WithEnvVar(pconduit.EnvConduitConnectorUtilitiesGRPCTarget, "localhost:12345")
+
+	err := underTest.ApplyOption(cc)
+	is.NoErr(err)
+
+	want := []string{
+		"FOO=BAR",
+		pconduit.EnvConduitConnectorUtilitiesGRPCTarget + "=localhost:12345",
+	}
+	is.Equal(want, cc.Cmd.Env)
+}

pconnector/config.go

@@ -0,0 +1,21 @@
+// Copyright © 2024 Meroxa, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pconnector
+
+type PluginConfig struct {
+	Token       string
+	ConnectorID string
+	LogLevel    string
+}

tools.go

@@ -20,4 +20,5 @@ import (
 	_ "github.com/bufbuild/buf/cmd/buf"
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 	_ "go.uber.org/mock/mockgen"
+	_ "mvdan.cc/gofumpt"
 )