v3: update plugin to v3

Signed-off-by: Valery Piashchynski <[email protected]>
roadrunner-server · Oct 9, 2022 · 0f21e6f · 0f21e6f
1 parent 40b8f3d
commit 0f21e6f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -18,6 +18,6 @@ jobs:
       - name: Run linter
         uses: golangci/[email protected] # Action page: <https://github.com/golangci/golangci-lint-action>
         with:
-          version: v1.49 # without patch version
+          version: v1.50 # without patch version
           only-new-issues: false # show only new issues if it's a pull request
           args: --timeout=10m --build-tags=race
diff --git a/.golangci.yml b/.golangci.yml
@@ -68,7 +68,6 @@ linters: # All available linters list: <https://golangci-lint.run/usage/linters/
     - noctx # finds sending http request without context.Context
     - nolintlint # Reports ill-formed or insufficient nolint directives
     - prealloc # Finds slice declarations that could potentially be preallocated
-    - rowserrcheck # Checks whether Err of rows is checked successfully
     - staticcheck # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
     - stylecheck # Stylecheck is a replacement for golint
     - tparallel # detects inappropriate usage of t.Parallel() method in your Go test codes

diff --git a/go.mod b/go.mod
@@ -1,9 +1,8 @@
-module github.com/roadrunner-server/resetter/v2
+module github.com/roadrunner-server/resetter/v3
 
 go 1.19
 
 require (
-	github.com/roadrunner-server/api/v2 v2.23.0
 	github.com/roadrunner-server/endure v1.4.5
 	github.com/roadrunner-server/errors v1.2.0
 )

diff --git a/go.sum b/go.sum
@@ -6,8 +6,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/roadrunner-server/api/v2 v2.23.0 h1:FCpVZWl7fZZqBdD/Z4HCVgQ+vKbqARneji20mp3iqDM=
-github.com/roadrunner-server/api/v2 v2.23.0/go.mod h1:UrOUfDFw0927h/PWv7f8PPcwfdHkwf8txWbmqszL7UA=
 github.com/roadrunner-server/endure v1.4.5 h1:kInGwZc9Xd55gXsdAQonajz5I202MDyJdV+biJ6+asI=
 github.com/roadrunner-server/endure v1.4.5/go.mod h1:FLqkppN/DAXhdMpuoVAlMt1L2odLCvCDRQr83gTHOl4=
 github.com/roadrunner-server/errors v1.2.0 h1:qBmNXt8Iex9QnYTjCkbJKsBZu2EtYkQCM06GUDcQBbI=

diff --git a/plugin.go b/plugin.go
@@ -1,19 +1,24 @@
 package resetter
 
 import (
-	"github.com/roadrunner-server/api/v2/plugins/resetter"
 	endure "github.com/roadrunner-server/endure/pkg/container"
 	"github.com/roadrunner-server/errors"
 )
 
 const PluginName = "resetter"
 
+// Resetter interface
+type Resetter interface {
+	// Reset reload plugin
+	Reset() error
+}
+
 type Plugin struct {
-	registry map[string]resetter.Resetter
+	registry map[string]Resetter
 }
 
 func (p *Plugin) Init() error {
-	p.registry = make(map[string]resetter.Resetter)
+	p.registry = make(map[string]Resetter)
 	return nil
 }
 
@@ -29,7 +34,7 @@ func (p *Plugin) Reset(name string) error {
 }
 
 // RegisterTarget resettable service.
-func (p *Plugin) RegisterTarget(name endure.Named, r resetter.Resetter) error {
+func (p *Plugin) RegisterTarget(name endure.Named, r Resetter) error {
 	p.registry[name.Name()] = r
 	return nil
 }