Merge pull request #55 from unistack-org/master

merge master

.github/workflows/autoapprove.yml

@@ -1,20 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        uses: hmarr/auto-approve-action@v2
-        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -1,21 +0,0 @@
-name: "automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'vtolstov'
-    steps:
-      - name: merge
-        id: merge
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/dependabot-automerge.yml

@@ -1,4 +1,4 @@
-name: "dependabot-automerge"
+name: "prautomerge"
 
 on:
   pull_request_target:
@@ -9,17 +9,21 @@ permissions:
   contents: write
 
 jobs:
-  automerge:
+  dependabot:
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
+    if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: metadata
         id: metadata
         uses: dependabot/fetch-metadata@v1.3.0
         with:
           github-token: "${{ secrets.TOKEN }}"
+      - name: approve
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
       - name: merge
-        id: merge
         if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
         run: gh pr merge --auto --merge "$PR_URL"
         env:

http.go

@@ -604,8 +604,6 @@ func (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...clie
 }
 
 func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
-	var body []byte
-
 	options := client.NewPublishOptions(opts...)
 
 	// get proxy
@@ -624,22 +622,24 @@ func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	for _, p := range ps {
 		md := metadata.Copy(omd)
 		md[metadata.HeaderContentType] = p.ContentType()
+		md[metadata.HeaderTopic] = p.Topic()
+
+		cf, err := h.newCodec(p.ContentType())
+		if err != nil {
+			return errors.InternalServerError("go.micro.client", err.Error())
+		}
+
+		var body []byte
 
 		// passed in raw data
 		if d, ok := p.Payload().(*codec.Frame); ok {
 			body = d.Data
 		} else {
-			// use codec for payload
-			cf, err := h.newCodec(p.ContentType())
-			if err != nil {
+			b := bytes.NewBuffer(nil)
+			if err := cf.Write(b, &codec.Message{Type: codec.Event}, p.Payload()); err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
-			// set the body
-			b, err := cf.Marshal(p.Payload())
-			if err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
-			}
-			body = b
+			body = b.Bytes()
 		}
 
 		topic := p.Topic()
@@ -647,9 +647,6 @@ func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 			topic = exchange
 		}
 
-		for k, v := range p.Metadata() {
-			md.Set(k, v)
-		}
 		md.Set(metadata.HeaderTopic, topic)
 		msgs = append(msgs, &broker.Message{Header: md, Body: body})
 	}

util.go

@@ -92,15 +92,10 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			continue
 		}
 		fld := tmsg.Type().Field(i)
-		// Skip unexported fields.
-		if fld.PkgPath != "" {
-			continue
-		}
-		/* check for empty PkgPath can be replaced with new method IsExported
 		if !fld.IsExported() {
 			continue
 		}
-		*/
+
 		t := &tag{}
 		for _, tn := range tags {
 			ts, ok := fld.Tag.Lookup(tn)