Merge pull request 'Update workflows' (#97) from atolstikhin/micro-codec-yaml:v3 into v3

Reviewed-on: #97

.gitea/workflows/job_lint.yml

@@ -0,0 +1,29 @@
+name: lint
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable' 
+    - name: setup deps
+      run: go get -v ./...
+    - name: run lint
+      uses: https://github.com/golangci/golangci-lint-action@v6
+      with:
+        version: 'latest'

.gitea/workflows/job_test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup deps
+      run: go get -v ./...
+    - name: run test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -0,0 +1,53 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: checkout tests
+      uses: actions/checkout@v4
+      with:
+        ref: master
+        filter: 'blob:none'
+        repository: unistack-org/micro-tests
+        path: micro-tests
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup go work
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        go work init
+        go work use .
+        go work use micro-tests        
+    - name: setup deps
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: go get -v ./...
+    - name: run tests
+      env:
+        INTEGRATION_TESTS: yes
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        cd micro-tests
+        go test -mod readonly -v ./... || true        

.github/stale.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-export PATH=$PATH:$(pwd)/bin
-export GO111MODULE=on
-export GOBIN=$(pwd)/bin
-
-#go get github.com/rvflash/goup@v0.4.1
-
-#goup -v ./...
-#go get github.com/psampaz/go-mod-outdated@v0.6.0
-go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
-
-#go list -u -m -json all | go-mod-outdated -update

.github/workflows/build.yml

@@ -1,46 +0,0 @@
-name: build
-on:
- push:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.15
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: lint
-        uses: golangci/golangci-lint-action@v1
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.github/workflows/pr.yml

@@ -1,46 +0,0 @@
-name: prbuild
-on:
-  pull_request:
-    branches:
-    - master
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.15
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: cache
-      uses: actions/cache@v2
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-      - name: lint
-        uses: golangci/golangci-lint-action@v1
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.golangci.yml

@@ -0,0 +1,5 @@
+run:
+  concurrency: 8
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true

codec_test.go

@@ -0,0 +1,54 @@
+package yaml
+
+import (
+	"bytes"
+	"testing"
+
+	"go.unistack.org/micro/v3/codec"
+)
+
+func TestFrame(t *testing.T) {
+	s := &codec.Frame{Data: []byte("test")}
+
+	buf, err := NewCodec().Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(buf, []byte(`test`)) {
+		t.Fatalf("bytes not equal %s != %s", buf, `test`)
+	}
+}
+
+func TestFrameFlatten(t *testing.T) {
+	s := &struct {
+		One  string
+		Name *codec.Frame `yaml:"name" codec:"flatten"`
+	}{
+		One:  "xx",
+		Name: &codec.Frame{Data: []byte("test")},
+	}
+
+	buf, err := NewCodec(codec.Flatten(true)).Marshal(s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !bytes.Equal(buf, []byte(`test`)) {
+		t.Fatalf("bytes not equal %s != %s", buf, `test`)
+	}
+}
+
+func TestNativeYamlTags(t *testing.T) {
+	s := &struct {
+		One string `yaml:"first"`
+	}{
+		One: "",
+	}
+
+	err := NewCodec().Unmarshal([]byte(`first: "val"`), s)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s.One != "val" {
+		t.Fatalf("XXX %#+v\n", s)
+	}
+}

go.mod

@@ -1,8 +1,10 @@
-module github.com/unistack-org/micro-codec-yaml/v3
+module go.unistack.org/micro-codec-yaml/v3
 
-go 1.15
+go 1.16
 
 require (
-	github.com/ghodss/yaml v1.0.0
-	github.com/unistack-org/micro/v3 v3.1.1
+	go.unistack.org/micro-proto/v3 v3.4.1
+	go.unistack.org/micro/v3 v3.10.94
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1
 )

yaml.go

@@ -1,90 +1,77 @@
 // Package yaml provides a yaml codec
-package yaml
+package yaml // import "go.unistack.org/micro-codec-yaml/v3"
 
 import (
-	"io"
-	"io/ioutil"
-
-	"github.com/ghodss/yaml"
-	"github.com/unistack-org/micro/v3/codec"
+	pb "go.unistack.org/micro-proto/v3/codec"
+	"go.unistack.org/micro/v3/codec"
+	rutil "go.unistack.org/micro/v3/util/reflect"
+	yaml "gopkg.in/yaml.v3"
 )
 
-type yamlCodec struct{}
+type yamlCodec struct {
+	opts codec.Options
+}
 
-func (c *yamlCodec) Marshal(b interface{}) ([]byte, error) {
-	switch m := b.(type) {
-	case nil:
+var _ codec.Codec = &yamlCodec{}
+
+func (c *yamlCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
+	if v == nil {
 		return nil, nil
+	}
+
+	options := c.opts
+	for _, o := range opts {
+		o(&options)
+	}
+
+	if options.Flatten {
+		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
+			v = nv
+		}
+	}
+
+	switch m := v.(type) {
 	case *codec.Frame:
 		return m.Data, nil
+	case *pb.Frame:
+		return m.Data, nil
 	}
 
-	return yaml.Marshal(b)
+	return yaml.Marshal(v)
 }
 
-func (c *yamlCodec) Unmarshal(b []byte, v interface{}) error {
-	if b == nil {
+func (c *yamlCodec) Unmarshal(b []byte, v interface{}, opts ...codec.Option) error {
+	if len(b) == 0 || v == nil {
 		return nil
 	}
+
+	options := c.opts
+	for _, o := range opts {
+		o(&options)
+	}
+
+	if options.Flatten {
+		if nv, nerr := rutil.StructFieldByTag(v, options.TagName, "flatten"); nerr == nil {
+			v = nv
+		}
+	}
+
 	switch m := v.(type) {
-	case nil:
-		return nil
 	case *codec.Frame:
 		m.Data = b
 		return nil
+	case *pb.Frame:
+		m.Data = b
+		return nil
 	}
 
 	return yaml.Unmarshal(b, v)
 }
 
-func (c *yamlCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error {
-	return nil
-}
-
-func (c *yamlCodec) ReadBody(conn io.Reader, b interface{}) error {
-	switch m := b.(type) {
-	case nil:
-		return nil
-	case *codec.Frame:
-		buf, err := ioutil.ReadAll(conn)
-		if err != nil {
-			return err
-		}
-		m.Data = buf
-		return nil
-	}
-
-	buf, err := ioutil.ReadAll(conn)
-	if err != nil {
-		return err
-	}
-
-	return yaml.Unmarshal(buf, b)
-}
-
-func (c *yamlCodec) Write(conn io.Writer, m *codec.Message, b interface{}) error {
-	switch m := b.(type) {
-	case nil:
-		return nil
-	case *codec.Frame:
-		_, err := conn.Write(m.Data)
-		return err
-	}
-
-	buf, err := yaml.Marshal(b)
-	if err != nil {
-		return err
-	}
-
-	_, err = conn.Write(buf)
-
-	return err
-}
-
 func (c *yamlCodec) String() string {
 	return "yaml"
 }
 
-func NewCodec() codec.Codec {
-	return &yamlCodec{}
+func NewCodec(opts ...codec.Option) *yamlCodec {
+	return &yamlCodec{opts: codec.NewOptions(opts...)}
 }