Plugins (cs3org#4073)

Makefile

@@ -39,11 +39,11 @@ BUILD_FLAGS	= "`[[ -z "$(STATIC)" ]] && echo "" || echo "-extldflags=-static"` -
 
 .PHONY: revad
 revad:
-	go build -ldflags $(BUILD_FLAGS) -o ./cmd/revad/revad ./cmd/revad
+	go build -ldflags $(BUILD_FLAGS) -o ./cmd/revad/revad ./cmd/revad/main
 
 .PHONY: revad-ceph
 revad-ceph:
-	go build -ldflags $(BUILD_FLAGS) -tags ceph -o ./cmd/revad/revad ./cmd/revad
+	go build -ldflags $(BUILD_FLAGS) -tags ceph -o ./cmd/revad/revad ./cmd/revad/main
 
 .PHONY: reva
 reva:

changelog/unreleased/plugins.md

@@ -0,0 +1,7 @@
+Enhancement: Plugins
+
+Adds a plugin system for allowing the creation of external
+plugins for different plugable components in reva,
+for example grpc drivers, http services and middlewares.
+
+https://github.com/cs3org/reva/pull/4073

cmd/revad/main.go

@@ -16,7 +16,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-package main
+package revadcmd
 
 import (
 	"flag"
@@ -55,7 +55,7 @@ var (
 	revaProcs []*runtime.Reva
 )
 
-func main() {
+func Main() {
 	flag.Parse()
 
 	// initialize the global system information

pkg/plugin/registry.go → cmd/revad/main/main.go

@@ -16,14 +16,10 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-package plugin
+package main
 
-import "github.com/hashicorp/go-plugin"
+import revadcmd "github.com/cs3org/reva/cmd/revad"
 
-// PluginMap is a map containing all the plugins.
-var PluginMap = map[string]plugin.Plugin{}
-
-// Register registers the plugin.
-func Register(name string, plugin plugin.Plugin) {
-	PluginMap[name] = plugin
+func main() {
+	revadcmd.Main()
 }

docker/Dockerfile.revad

@@ -29,7 +29,7 @@ ENV CGO_ENABLED 1
 
 RUN apk add --no-cache gcc musl-dev
 
-RUN go build -ldflags "-X main.gitCommit=$GIT_COMMIT -X main.version=$VERSION -X main.goVersion=`go version | awk '{print $3}'` -X main.buildDate=`date +%FT%T%z`" -o ./cmd/revad/revad ./cmd/revad
+RUN go build -ldflags "-X main.gitCommit=$GIT_COMMIT -X main.version=$VERSION -X main.goVersion=`go version | awk '{print $3}'` -X main.buildDate=`date +%FT%T%z`" -o ./cmd/revad/revad ./cmd/revad/main
 
 FROM alpine:3.16
 

docker/Dockerfile.revad-eos

@@ -29,7 +29,7 @@ ENV CGO_ENABLED 1
 
 RUN apk add --no-cache gcc musl-dev
 
-RUN go build -ldflags "-X main.gitCommit=$GIT_COMMIT -X main.version=$VERSION -X main.goVersion=`go version | awk '{print $3}'` -X main.buildDate=`date +%FT%T%z`" -o ./cmd/revad/revad ./cmd/revad
+RUN go build -ldflags "-X main.gitCommit=$GIT_COMMIT -X main.version=$VERSION -X main.goVersion=`go version | awk '{print $3}'` -X main.buildDate=`date +%FT%T%z`" -o ./cmd/revad/revad ./cmd/revad/main
 
 FROM gitlab-registry.cern.ch/dss/eos/eos-all:4.8.91