mods for config, utils/log and pluginmanager; Update vendor pm-graph …

…locally (#10)

* Add mods for config, utils/log and pluginmanager; Update pm-graph locally in vendor and use it.

* Use pm-graph updated locally in vendor

cmd/pm/integ_test.go

@@ -14,8 +14,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/VeritasOS/plugin-manager/config"
-	"github.com/VeritasOS/plugin-manager/pluginmanager"
+	"github.com/VeritasOS/plugin-manager/v2/config"
+	"github.com/VeritasOS/plugin-manager/v2/pluginmanager"
 
 	yaml "gopkg.in/yaml.v3"
 )

cmd/pm/pm.go

@@ -9,9 +9,9 @@ import (
 	"os"
 	"path/filepath"
 
-	pm "github.com/VeritasOS/plugin-manager"
-	"github.com/VeritasOS/plugin-manager/config"
-	logutil "github.com/VeritasOS/plugin-manager/utils/log"
+	pm "github.com/VeritasOS/plugin-manager/v2"
+	"github.com/VeritasOS/plugin-manager/v2/config"
+	logutil "github.com/VeritasOS/plugin-manager/v2/utils/log"
 )
 
 var (

config/config.go

@@ -10,7 +10,7 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	logutil "github.com/VeritasOS/plugin-manager/utils/log"
+	logutil "github.com/VeritasOS/plugin-manager/v2/utils/log"
 )
 
 // Config is Plugin Manager's configuration information.

config/go.mod

@@ -0,0 +1,10 @@
+module github.com/VeritasOS/plugin-manager/v2/config
+
+go 1.19
+
+replace github.com/VeritasOS/plugin-manager/v2/utils/log => ../utils/log
+
+require (
+	github.com/VeritasOS/plugin-manager/v2/utils/log v1.0.0
+	gopkg.in/yaml.v3 v3.0.1
+)

config/go.sum

@@ -0,0 +1,4 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

@@ -1,15 +1,25 @@
-module github.com/VeritasOS/plugin-manager
+module github.com/VeritasOS/plugin-manager/v2
 
 go 1.19
 
+replace github.com/VeritasOS/plugin-manager/v2/config => ./config
+
+replace github.com/VeritasOS/plugin-manager/v2/pluginmanager => ./pluginmanager
+
+replace github.com/VeritasOS/plugin-manager/v2/utils/log => ./utils/log
+
 require (
-	github.com/abhijithda/pm-graph/v3 v3.0.1
+	github.com/VeritasOS/plugin-manager/v2/config v1.0.0
+	github.com/VeritasOS/plugin-manager/v2/pluginmanager v1.0.0
+	github.com/VeritasOS/plugin-manager/v2/utils/log v1.0.0
+	github.com/abhijithda/pm-graph/v3 v3.0.3
+	github.com/goccy/go-graphviz v0.1.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	github.com/VeritasOS/plugin-manager v1.0.3 // indirect
 	github.com/fogleman/gg v1.3.0 // indirect
-	github.com/goccy/go-graphviz v0.1.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	golang.org/x/image v0.6.0 // indirect

go.sum

@@ -1,28 +1,24 @@
-github.com/abhijithda/pm-graph/v3 v3.0.1 h1:zHMJ0DxK2XMklXwvxjJRvls69dml540RnFFaVMdtdtc=
-github.com/abhijithda/pm-graph/v3 v3.0.1/go.mod h1:RAqXhAHADGbswlI4G2OStnmQHkJEY/z4QFsamuA6m3M=
+github.com/VeritasOS/plugin-manager v1.0.3 h1:7xEvfz5jky/HsgvqDb8vHxQnbMp6Y4aAQegBc2vLYrg=
+github.com/VeritasOS/plugin-manager v1.0.3/go.mod h1:Fw92eqykT0patTJNxHsfcUcBzzvTaqxUPPhVEcg+Y8o=
+github.com/abhijithda/pm-graph/v3 v3.0.3 h1:gj1QyhISIn2mOd4HlB4kwlHYx8i7e+a4YpFuEG8ZHgE=
+github.com/abhijithda/pm-graph/v3 v3.0.3/go.mod h1:LfnaWcMTcZfy8B5vbSt1Z75tlF6ofuXFYpAcBBb/djs=
 github.com/corona10/goimagehash v1.0.2 h1:pUfB0LnsJASMPGEZLj7tGY251vF+qLGqOgEP4rUs6kA=
-github.com/corona10/goimagehash v1.0.2/go.mod h1:/l9umBhvcHQXVtQO1V6Gp1yD20STawkhRnnX0D1bvVI=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/goccy/go-graphviz v0.1.0 h1:6OqQoQ5PeAiHYe/YcusyeulqBrOkUb16HQ4ctRdyVUU=
-github.com/goccy/go-graphviz v0.1.0/go.mod h1:wXVsXxmyMQU6TN3zGRttjNn3h+iCAS7xQFC6TlNvLhk=
+github.com/goccy/go-graphviz v0.1.1 h1:MGrsnzBxTyt7KG8FhHsFPDTGvF7UaQMmSa6A610DqPg=
+github.com/goccy/go-graphviz v0.1.1/go.mod h1:lpnwvVDjskayq84ZxG8tGCPeZX/WxP88W+OJajh+gFk=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY=
-github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
 golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -31,7 +27,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

plugin.go

@@ -19,12 +19,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/VeritasOS/plugin-manager/config"
-	"github.com/VeritasOS/plugin-manager/pluginmanager"
-	logutil "github.com/VeritasOS/plugin-manager/utils/log"
-	osutils "github.com/VeritasOS/plugin-manager/utils/os"
-	"github.com/VeritasOS/plugin-manager/utils/output"
+	"github.com/VeritasOS/plugin-manager/v2/config"
 	graph "github.com/abhijithda/pm-graph/v3"
+	// graph "github.com/VeritasOS/plugin-manager/v2/graph/v3"
+	"github.com/VeritasOS/plugin-manager/v2/pluginmanager"
+	logutil "github.com/VeritasOS/plugin-manager/v2/utils/log"
+	osutils "github.com/VeritasOS/plugin-manager/v2/utils/os"
+	"github.com/VeritasOS/plugin-manager/v2/utils/output"
 )
 
 var (

plugin_test.go

@@ -9,8 +9,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/VeritasOS/plugin-manager/config"
-	"github.com/VeritasOS/plugin-manager/pluginmanager"
+	"github.com/VeritasOS/plugin-manager/v2/config"
+	"github.com/VeritasOS/plugin-manager/v2/pluginmanager"
+	// pg "github.com/VeritasOS/plugin-manager/v2/graph/v3"
 	pg "github.com/abhijithda/pm-graph/v3"
 )
 

pluginmanager/go.mod

@@ -0,0 +1,3 @@
+module github.com/VeritasOS/plugin-manager/v2/pluginmanager
+
+go 1.19

utils/log/go.mod

@@ -0,0 +1,3 @@
+module github.com/VeritasOS/plugin-manager/v2/utils/log
+
+go 1.19