fixed metadata hooks

.gitea/workflows/job_coverage.yml

@@ -3,9 +3,6 @@ name: coverage
 on:
   push:
     branches: [ main, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
   pull_request:
     branches: [ main, v3, v4 ]
   # Allows you to run this workflow manually from the Actions tab

.gitea/workflows/job_lint.yml

@@ -3,10 +3,10 @@ name: lint
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
+    branches:
+    - master
+    - v3
+    - v4
 
 jobs:
   lint:

.gitea/workflows/job_syncpull.yml

@@ -1,54 +0,0 @@
-name: syncpull
-
-on:
-  schedule:
-    - cron: '* * * * *'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  pull:
-    runs-on: ubuntu-latest
-    steps:
-    - name: init
-      run: |
-        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
-        git config --global user.name "github-actions[bot]"
-        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" | tee -a /root/.netrc
-        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" | tee -a /root/.netrc
-
-    - name: track master
-      run: |
-        git clone --depth=10 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream master
-        git push upstream master --progress
-        git merge --allow-unrelated-histories "upstream/master"
-        git push origin master --progress
-        cd ../
-        rm -rf repo
-
-    - name: track v3
-      run: |
-        git clone --depth=10 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v3
-        git push upstream v3
-        git merge --allow-unrelated-histories "upstream/v3"
-        git push origin v3 --progress
-        cd ../
-        rm -rf repo
-
-    - name: track v4
-      run: |
-        git clone --depth=10 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v4
-        git push upstream v4
-        git merge --allow-unrelated-histories "upstream/v4"
-        git push origin v4 --progress
-        cd ../
-        rm -rf repo

.gitea/workflows/job_test.yml

@@ -3,12 +3,15 @@ name: test
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
+    branches:
+    - master
+    - v3
+    - v4
   push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
+    branches:
+    - master
+    - v3
+    - v4
 
 jobs:
   test:

.gitea/workflows/job_tests.yml

@@ -3,12 +3,15 @@ name: test
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
+    branches:
+    - master
+    - v3
+    - v4
   push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
+    branches:
+    - master
+    - v3
+    - v4
 
 jobs:
   test:

README.md

@@ -1,5 +1,5 @@
 # Micro
-![Coverage](https://img.shields.io/badge/Coverage-46.4%25-yellow)
+![Coverage](https://img.shields.io/badge/Coverage-44.3%25-yellow)
 [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go.unistack.org/micro/v4?tab=overview)
 [![Status](https://git.unistack.org/unistack-org/micro/actions/workflows/job_tests.yml/badge.svg?branch=v4)](https://git.unistack.org/unistack-org/micro/actions?query=workflow%3Abuild+branch%3Av4+event%3Apush)

SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 3.7.x   | :white_check_mark: |
+| < 3.7.0 | :x:                |
+
+## Reporting a Vulnerability
+
+If you find any issue, please create github issue in this repo

metadata/metadata.go

@@ -69,15 +69,6 @@ func (md Metadata) Copy() Metadata {
 	return out
 }
 
-// AsMap returns a copy of Metadata with map[string]string.
-func (md Metadata) AsMap() map[string]string {
-	out := make(map[string]string, len(md))
-	for k, v := range md {
-		out[k] = strings.Join(v, ",")
-	}
-	return out
-}
-
 // AsHTTP1 returns a copy of Metadata
 // with CanonicalMIMEHeaderKey.
 func (md Metadata) AsHTTP1() map[string][]string {

service.go

@@ -99,7 +99,6 @@ type service struct {
 	done chan struct{}
 	opts Options
 	sync.RWMutex
-	stopped bool
 }
 
 // NewService creates and returns a new Service based on the packages within.
@@ -425,7 +424,7 @@ func (s *service) Stop() error {
 		}
 	}
 
-	s.notifyShutdown()
+	close(s.done)
 
 	return nil
 }
@@ -449,23 +448,10 @@ func (s *service) Run() error {
 		return err
 	}
 
+	// wait on context cancel
 	<-s.done
 
-	return nil
-}
-
-// notifyShutdown marks the service as stopped and closes the done channel.
-// It ensures the channel is closed only once, preventing multiple closures.
-func (s *service) notifyShutdown() {
-	s.Lock()
-	if s.stopped {
-		s.Unlock()
-		return
-	}
-	s.stopped = true
-	s.Unlock()
-
-	close(s.done)
+	return s.Stop()
 }
 
 type Namer interface {

service_test.go

@@ -3,9 +3,7 @@ package micro
 import (
 	"reflect"
 	"testing"
-	"time"
 
-	"github.com/stretchr/testify/require"
 	"go.unistack.org/micro/v4/broker"
 	"go.unistack.org/micro/v4/client"
 	"go.unistack.org/micro/v4/config"
@@ -739,41 +737,3 @@ func Test_getNameIndex(t *testing.T) {
 	}
 }
 */
-
-func TestServiceShutdown(t *testing.T) {
-	defer func() {
-		if r := recover(); r != nil {
-			t.Fatalf("service shutdown failed: %v", r)
-		}
-	}()
-
-	s, ok := NewService().(*service)
-	require.NotNil(t, s)
-	require.True(t, ok)
-
-	require.NoError(t, s.Start())
-	require.False(t, s.stopped)
-
-	require.NoError(t, s.Stop())
-	require.True(t, s.stopped)
-}
-
-func TestServiceMultipleShutdowns(t *testing.T) {
-	defer func() {
-		if r := recover(); r != nil {
-			t.Fatalf("service shutdown failed: %v", r)
-		}
-	}()
-
-	s := NewService()
-
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		// first call
-		require.NoError(t, s.Stop())
-		// duplicate call
-		require.NoError(t, s.Stop())
-	}()
-
-	require.NoError(t, s.Run())
-}