codec: add ability to pass codec options

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

.github/workflows/codeql-analysis.yml

@@ -12,6 +12,10 @@
 name: "CodeQL"
 
 on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
   push:
     branches: [ master ]
   pull_request:

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,66 @@
+name: "prautomerge"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Dependabot-Automerge:
+    runs-on: ubuntu-latest
+    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
+    # The the github.event.workflow_run.event value is 'push' and not 'pull_request'
+    # dont work with multiple workflows when last returns success
+    if: >-
+      github.event.workflow_run.conclusion == 'success'
+      && github.actor == 'dependabot[bot]'
+      && github.event.sender.login == 'dependabot[bot]'
+      && github.event.sender.type == 'Bot'
+      && (github.event.workflow_run.event == 'pull_request'
+          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
+    steps:
+      - name: Approve Changes and Merge changes if label 'dependencies' is set
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            console.log(context.payload.workflow_run);
+            
+            var labelNames = await github.paginate(
+              github.issues.listLabelsOnIssue,
+              {
+                repo: context.repo.repo,
+                owner: context.repo.owner,
+                issue_number: context.payload.workflow_run.pull_requests[0].number,
+              },
+              (response) => response.data.map(
+                (label) => label.name
+              )
+            );
+
+            console.log(labelNames);
+
+            if (labelNames.includes('dependencies')) {
+              console.log('Found label');
+
+              await github.pulls.createReview({
+                repo: context.repo.repo,
+                owner: context.repo.owner,
+                pull_number: context.payload.workflow_run.pull_requests[0].number,
+                event: 'APPROVE'
+              });
+              console.log('Approved PR');
+
+              await github.pulls.merge({
+                repo: context.repo.repo,
+                owner: context.repo.owner,
+                pull_number: context.payload.workflow_run.pull_requests[0].number,
+              });
+
+              console.log('Merged PR');
+            }

codec/codec.go

@@ -41,11 +41,11 @@ type MessageType int
 // connection. ReadBody may be called with a nil argument to force the
 // body to be read and discarded.
 type Codec interface {
-	ReadHeader(io.Reader, *Message, MessageType) error
-	ReadBody(io.Reader, interface{}) error
-	Write(io.Writer, *Message, interface{}) error
-	Marshal(interface{}) ([]byte, error)
-	Unmarshal([]byte, interface{}) error
+	ReadHeader(r io.Reader, m *Message, mt MessageType) error
+	ReadBody(r io.Reader, v interface{}) error
+	Write(w io.Writer, m *Message, v interface{}) error
+	Marshal(v interface{}, opts ...Option) ([]byte, error)
+	Unmarshal(b []byte, v interface{}, opts ...Option) error
 	String() string
 }
 

codec/noop.go

@@ -5,7 +5,9 @@ import (
 	"io"
 )
 
-type noopCodec struct{}
+type noopCodec struct {
+	opts Options
+}
 
 func (c *noopCodec) ReadHeader(conn io.Reader, m *Message, t MessageType) error {
 	return nil
@@ -69,11 +71,11 @@ func (c *noopCodec) String() string {
 }
 
 // NewCodec returns new noop codec
-func NewCodec() Codec {
-	return &noopCodec{}
+func NewCodec(opts ...Option) Codec {
+	return &noopCodec{opts: NewOptions(opts...)}
 }
 
-func (c *noopCodec) Marshal(v interface{}) ([]byte, error) {
+func (c *noopCodec) Marshal(v interface{}, opts ...Option) ([]byte, error) {
 	if v == nil {
 		return nil, nil
 	}
@@ -96,7 +98,7 @@ func (c *noopCodec) Marshal(v interface{}) ([]byte, error) {
 	return json.Marshal(v)
 }
 
-func (c *noopCodec) Unmarshal(d []byte, v interface{}) error {
+func (c *noopCodec) Unmarshal(d []byte, v interface{}, opts ...Option) error {
 	if v == nil {
 		return nil
 	}

codec/options.go

@@ -1,6 +1,8 @@
 package codec
 
 import (
+	"context"
+
 	"github.com/unistack-org/micro/v3/logger"
 	"github.com/unistack-org/micro/v3/meter"
 	"github.com/unistack-org/micro/v3/tracer"
@@ -19,6 +21,10 @@ type Options struct {
 	Tracer tracer.Tracer
 	// MaxMsgSize specifies max messages size that reads by codec
 	MaxMsgSize int
+	// TagName specifies tag name in struct to control codec
+	TagName string
+	// Context stores additional codec options
+	Context context.Context
 }
 
 // MaxMsgSize sets the max message size
@@ -28,6 +34,13 @@ func MaxMsgSize(n int) Option {
 	}
 }
 
+// TagName sets the codec tag name in struct
+func TagName(n string) Option {
+	return func(o *Options) {
+		o.TagName = n
+	}
+}
+
 // Logger sets the logger
 func Logger(l logger.Logger) Option {
 	return func(o *Options) {
@@ -52,10 +65,12 @@ func Meter(m meter.Meter) Option {
 // NewOptions returns new options
 func NewOptions(opts ...Option) Options {
 	options := Options{
+		Context:    context.Background(),
 		Logger:     logger.DefaultLogger,
 		Meter:      meter.DefaultMeter,
 		Tracer:     tracer.DefaultTracer,
 		MaxMsgSize: DefaultMaxMsgSize,
+		TagName:    DefaultTagName,
 	}
 
 	for _, o := range opts {

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/imdario/mergo v0.3.12
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/silas/dag v0.0.0-20210121180416-41cf55125c34
-	github.com/stretchr/testify v1.7.0
 	github.com/unistack-org/micro-proto v0.0.9
 	golang.org/x/net v0.0.0-20210510120150-4163338589ed
 )

go.sum

@@ -1,5 +1,3 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/ef-ds/deque v1.0.4 h1:iFAZNmveMT9WERAkqLJ+oaABF9AcVQ5AjXem/hroniI=
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
 github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o=
@@ -11,13 +9,8 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-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/silas/dag v0.0.0-20210121180416-41cf55125c34 h1:vBfVmA5mZhsQa2jr1FOL9nfA37N/jnbBmi5XUfviVTI=
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc=
 github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg=
 golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
@@ -32,9 +25,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-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.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

util/id/id_internal_test.go

@@ -1,41 +0,0 @@
-package id
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestHasNoCollisions(t *testing.T) {
-	tries := 100_000
-	used := make(map[string]bool, tries)
-	for i := 0; i < tries; i++ {
-		id := Must()
-		require.False(t, used[id], "shouldn't return colliding IDs")
-		used[id] = true
-	}
-}
-
-func TestFlatDistribution(t *testing.T) {
-	tries := 100_000
-	alphabet := "abcdefghij"
-	size := 10
-	chars := make(map[rune]int)
-	for i := 0; i < tries; i++ {
-		id := Must(Alphabet(alphabet), Size(size))
-		for _, r := range id {
-			chars[r]++
-		}
-	}
-
-	for _, count := range chars {
-		require.InEpsilon(t, size*tries/len(alphabet), count, .01, "should have flat distribution")
-	}
-}
-
-// Benchmark id generator
-func BenchmarkNanoid(b *testing.B) {
-	for n := 0; n < b.N; n++ {
-		_, _ = New()
-	}
-}

util/id/id_test.go

@@ -1,68 +0,0 @@
-package id_test
-
-import (
-	"strings"
-	"testing"
-	"unicode/utf8"
-
-	"github.com/stretchr/testify/assert"
-	id "github.com/unistack-org/micro/v3/util/id"
-)
-
-func TestGenerate(t *testing.T) {
-	t.Run("short alphabet", func(t *testing.T) {
-		alphabet := ""
-		_, err := id.New(id.Alphabet(alphabet), id.Size(32))
-		assert.Error(t, err, "should return error if the alphabet is too small")
-	})
-
-	t.Run("long alphabet", func(t *testing.T) {
-		alphabet := strings.Repeat("a", 256)
-		_, err := id.New(id.Alphabet(alphabet), id.Size(32))
-		assert.Error(t, err, "should return error if the alphabet is too long")
-	})
-
-	t.Run("negative ID length", func(t *testing.T) {
-		_, err := id.New(id.Alphabet("abcdef"), id.Size(-1))
-		assert.Error(t, err, "should return error if the requested ID length is invalid")
-	})
-
-	t.Run("happy path", func(t *testing.T) {
-		alphabet := "abcdef"
-		id, err := id.New(id.Alphabet(alphabet), id.Size(6))
-		assert.NoError(t, err, "shouldn't return error")
-		assert.Len(t, id, 6, "should return ID of requested length")
-		for _, r := range id {
-			assert.True(t, strings.ContainsRune(alphabet, r), "should use given alphabet")
-		}
-	})
-
-	t.Run("works with unicode", func(t *testing.T) {
-		alphabet := "🚀💩🦄🤖"
-		id, err := id.New(id.Alphabet(alphabet), id.Size(6))
-		assert.NoError(t, err, "shouldn't return error")
-		assert.Equal(t, utf8.RuneCountInString(id), 6, "should return ID of requested length")
-		for _, r := range id {
-			assert.True(t, strings.ContainsRune(alphabet, r), "should use given alphabet")
-		}
-	})
-}
-
-func TestNew(t *testing.T) {
-	t.Run("negative ID length", func(t *testing.T) {
-		_, err := id.New(id.Size(-1))
-		assert.Error(t, err, "should return error if the requested ID length is invalid")
-	})
-
-	t.Run("happy path", func(t *testing.T) {
-		nid, err := id.New()
-		assert.NoError(t, err, "shouldn't return error")
-		assert.Len(t, nid, id.DefaultSize, "should return ID of default length")
-	})
-
-	t.Run("custom length", func(t *testing.T) {
-		id, err := id.New(id.Size(6))
-		assert.NoError(t, err, "shouldn't return error")
-		assert.Len(t, id, 6, "should return ID of requested length")
-	})
-}