Embed http plugin (#1471)

http plugin is one of the most used plugins together with the shell plugin, embedding it in the main binary allow for more lean deployment.

.goreleaser.yml

@@ -5,9 +5,9 @@ release:
 
 builds:
   - &xbuild
-    main: ./builtin/bins/dkron-executor-http/
-    id: dkron-executor-http
-    binary: dkron-executor-http
+    main: .
+    id: dkron
+    binary: dkron
     env:
       - CGO_ENABLED=0
     goos:
@@ -22,7 +22,7 @@ builds:
     goarm:
       - '7'
     ldflags:
-      - -s -w
+      - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
 
   - <<: *xbuild
     main: ./builtin/bins/dkron-executor-rabbitmq/
@@ -69,13 +69,6 @@ builds:
     id: dkron-processor-fluent
     binary: dkron-processor-fluent
 
-  - <<: *xbuild
-    main: .
-    id: dkron
-    binary: dkron
-    ldflags:
-      - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
-
 nfpms:
   -
     vendor: Distributed Works
@@ -121,7 +114,6 @@ dockers:
     goarch: amd64
     ids: &docker-ids
       - dkron
-      - dkron-executor-http
       - dkron-executor-rabbitmq
       - dkron-executor-nats
       - dkron-executor-kafka

Makefile

@@ -72,8 +72,8 @@ localtest:
 
 updatetestcert:
 	wget https://badssl.com/certs/badssl.com-client.p12 -q -O badssl.com-client.p12
-	openssl pkcs12 -in badssl.com-client.p12 -nocerts -nodes -passin pass:badssl.com -out builtin/bins/dkron-executor-http/testdata/badssl.com-client-key-decrypted.pem
-	openssl pkcs12 -in badssl.com-client.p12 -nokeys -passin pass:badssl.com -out builtin/bins/dkron-executor-http/testdata/badssl.com-client.pem
+	openssl pkcs12 -in badssl.com-client.p12 -nocerts -nodes -passin pass:badssl.com -out plugin/http/testdata/badssl.com-client-key-decrypted.pem
+	openssl pkcs12 -in badssl.com-client.p12 -nokeys -passin pass:badssl.com -out plugin/http/testdata/badssl.com-client.pem
 	rm badssl.com-client.p12
 
 ui/node_modules: ui/package.json

cmd/http.go

@@ -0,0 +1,30 @@
+package cmd
+
+import (
+	dkplugin "github.com/distribworks/dkron/v4/plugin"
+	"github.com/distribworks/dkron/v4/plugin/http"
+	"github.com/hashicorp/go-plugin"
+	"github.com/spf13/cobra"
+)
+
+var httpCmd = &cobra.Command{
+	Hidden: true,
+	Use:    "http",
+	Short:  "Run the http plugin",
+	Long:   ``,
+	Run: func(cmd *cobra.Command, args []string) {
+		plugin.Serve(&plugin.ServeConfig{
+			HandshakeConfig: dkplugin.Handshake,
+			Plugins: map[string]plugin.Plugin{
+				"executor": &dkplugin.ExecutorPlugin{Executor: &http.HTTP{}},
+			},
+
+			// A non-nil value here enables gRPC serving for this plugin...
+			GRPCServer: plugin.DefaultGRPCServer,
+		})
+	},
+}
+
+func init() {
+	dkronCmd.AddCommand(httpCmd)
+}

cmd/plugins.go

@@ -15,6 +15,8 @@ import (
 	"github.com/spf13/viper"
 )
 
+var embededPlugins = []string{"shell", "http"}
+
 type Plugins struct {
 	Processors map[string]dkplugin.Processor
 	Executors  map[string]dkplugin.Executor
@@ -95,11 +97,14 @@ func (p *Plugins) DiscoverPlugins() error {
 		p.Executors[pluginName] = raw.(dkplugin.Executor)
 	}
 
-	raw, err := p.pluginFactory(exePath, []string{"shell"}, dkplugin.ExecutorPluginName)
-	if err != nil {
-		return err
+	// Load the embeded plugins
+	for _, pluginName := range embededPlugins {
+		raw, err := p.pluginFactory(exePath, []string{pluginName}, dkplugin.ExecutorPluginName)
+		if err != nil {
+			return err
+		}
+		p.Executors[pluginName] = raw.(dkplugin.Executor)
 	}
-	p.Executors["shell"] = raw.(dkplugin.Executor)
 
 	return nil
 }

builtin/bins/dkron-executor-http/http.go → plugin/http/http.go

@@ -1,4 +1,4 @@
-package main
+package http
 
 import (
 	"bytes"

builtin/bins/dkron-executor-http/http_test.go → plugin/http/http_test.go

@@ -1,4 +1,4 @@
-package main
+package http
 
 import (
 	"bytes"