Merge pull request #27 from ipfs/feat/ipfs-compat

make it possible to pre-load this plugin into go-ipfs
ipfs · Aug 15, 2019 · 824440f · 824440f
2 parents 4d430c4 + 6075c04
commit 824440f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ go.mod: FORCE
 
 FORCE:
 
-s3plugin.so: plugin/main.go go.mod
+s3plugin.so: plugin/main/main.go go.mod
 	$(GOCC) build $(GOFLAGS) -buildmode=plugin -o "$@" "$<"
 	chmod +x "$@"
 

diff --git a/plugin/main/main.go b/plugin/main/main.go
@@ -0,0 +1,11 @@
+package main
+
+import (
+	plugin "github.com/ipfs/go-ds-s3/plugin"
+)
+
+var Plugins = plugin.Plugins //nolint
+
+func main() {
+	panic("this is a plugin, build it as a plugin, this is here as for go#20312")
+}
diff --git a/plugin/main.go → plugin/s3ds.go b/plugin/main.go → plugin/s3ds.go
@@ -1,4 +1,4 @@
-package main
+package plugin
 
 import (
 	"fmt"
@@ -13,9 +13,6 @@ var Plugins = []plugin.Plugin{
 	&S3Plugin{},
 }
 
-// Mark this as used and exported. "nolint" doesn't work.
-var _ = Plugins
-
 type S3Plugin struct{}
 
 func (s3p S3Plugin) Name() string {