Bump google.golang.org/grpc from 1.52.3 to 1.53.0

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.52.3 to 1.53.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.52.3...v1.53.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.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/autoapprove.yml

@@ -0,0 +1,20 @@
+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@v3
+        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -0,0 +1,21 @@
+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/build.yml

@@ -3,19 +3,20 @@ on:
  push:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v1
+        uses: golangci/golangci-lint-action@v3.4.0
         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.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "codeql"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+  push:
+    branches: [ master, v3 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, v3 ]
+  schedule:
+    - cron: '34 1 * * 0'
+
+jobs:
+  analyze:
+    name: analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    # Initializes the CodeQL tools for scanning.
+    - name: init
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: analyze
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,27 @@
+name: "dependabot-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 == 'dependabot[bot]'
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
+        with:
+          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:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/pr.yml

@@ -3,19 +3,20 @@ on:
   pull_request:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v1
+        uses: golangci/golangci-lint-action@v3.4.0
         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.

README.md

@@ -1,2 +1,2 @@
-# micro-logger-service
+# micro-config-service
 

generate.go

@@ -1,3 +1,3 @@
 package service
 
-//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --micro_out=debug=true,paths=source_relative:./proto proto/service.proto
+//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components=micro|rpc,standalone=true,debug=true,paths=source_relative:./micro proto/service.proto

go.mod

@@ -1,12 +1,10 @@
-module github.com/unistack-org/micro-config-service/v3
+module go.unistack.org/micro-config-service/v3
 
-go 1.14
+go 1.16
 
 require (
-	github.com/golang/protobuf v1.4.3
-	github.com/imdario/mergo v0.3.11
-	github.com/unistack-org/micro/v3 v3.1.1
-	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d // indirect
-	google.golang.org/grpc v1.27.0
-	google.golang.org/protobuf v1.25.0
+	github.com/imdario/mergo v0.3.13
+	go.unistack.org/micro/v3 v3.10.11
+	google.golang.org/grpc v1.53.0
+	google.golang.org/protobuf v1.28.1
 )

micro/service_micro.pb.go

@@ -0,0 +1,32 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.5.3
+// source: service.proto
+
+package servicepb
+
+import (
+	context "context"
+	proto "go.unistack.org/micro-config-service/v3/proto"
+	api "go.unistack.org/micro/v3/api"
+	client "go.unistack.org/micro/v3/client"
+)
+
+var (
+	ConfigName = "Config"
+
+	ConfigEndpoints = []api.Endpoint{}
+)
+
+func NewConfigEndpoints() []api.Endpoint {
+	return ConfigEndpoints
+}
+
+type ConfigClient interface {
+	Load(ctx context.Context, req *proto.LoadRequest, opts ...client.CallOption) (*proto.LoadResponse, error)
+	Save(ctx context.Context, req *proto.SaveRequest, opts ...client.CallOption) (*proto.SaveResponse, error)
+}
+
+type ConfigServer interface {
+	Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
+	Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
+}

micro/service_micro_rpc.pb.go

@@ -0,0 +1,68 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.5.3
+// source: service.proto
+
+package servicepb
+
+import (
+	context "context"
+	proto "go.unistack.org/micro-config-service/v3/proto"
+	api "go.unistack.org/micro/v3/api"
+	client "go.unistack.org/micro/v3/client"
+	server "go.unistack.org/micro/v3/server"
+)
+
+type configClient struct {
+	c    client.Client
+	name string
+}
+
+func NewConfigClient(name string, c client.Client) ConfigClient {
+	return &configClient{c: c, name: name}
+}
+
+func (c *configClient) Load(ctx context.Context, req *proto.LoadRequest, opts ...client.CallOption) (*proto.LoadResponse, error) {
+	rsp := &proto.LoadResponse{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Load", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *configClient) Save(ctx context.Context, req *proto.SaveRequest, opts ...client.CallOption) (*proto.SaveResponse, error) {
+	rsp := &proto.SaveResponse{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Save", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+type configServer struct {
+	ConfigServer
+}
+
+func (h *configServer) Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error {
+	return h.ConfigServer.Load(ctx, req, rsp)
+}
+
+func (h *configServer) Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error {
+	return h.ConfigServer.Save(ctx, req, rsp)
+}
+
+func RegisterConfigServer(s server.Server, sh ConfigServer, opts ...server.HandlerOption) error {
+	type config interface {
+		Load(ctx context.Context, req *proto.LoadRequest, rsp *proto.LoadResponse) error
+		Save(ctx context.Context, req *proto.SaveRequest, rsp *proto.SaveResponse) error
+	}
+	type Config struct {
+		config
+	}
+	h := &configServer{sh}
+	var nopts []server.HandlerOption
+	for _, endpoint := range ConfigEndpoints {
+		nopts = append(nopts, api.WithEndpoint(&endpoint))
+	}
+	return s.Handle(s.NewHandler(&Config{h}, append(nopts, opts...)...))
+}

options.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/unistack-org/micro/v3/client"
-	"github.com/unistack-org/micro/v3/config"
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/config"
 )
 
 type clientKey struct{}

proto/service.pb.go

@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0-devel
-// 	protoc        v3.6.1
+// 	protoc-gen-go v1.26.0
+// 	protoc        v3.17.3
 // source: service.proto
 
-package service
+package servicepb
 
 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type LoadRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -234,11 +229,11 @@ var file_service_proto_rawDesc = []byte{
 	0x61, 0x76, 0x65, 0x12, 0x14, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x61,
 	0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x65, 0x72, 0x76,
 	0x69, 0x63, 0x65, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69,
-	0x63, 0x72, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63,
+	0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

proto/service.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package service;
-option go_package="github.com/unistack-org/micro-config-service;service";
+option go_package="go.unistack.org/micro-config-service/v3/proto;servicepb";
 
 service Config {
 	rpc Load(LoadRequest) returns (LoadResponse) {};

proto/service_grpc.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 
-package service
+package servicepb
 
 import (
 	context "context"
@@ -11,7 +11,8 @@ import (
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion6
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
 
 // ConfigClient is the client API for Config service.
 //
@@ -60,16 +61,23 @@ type ConfigServer interface {
 type UnimplementedConfigServer struct {
 }
 
-func (*UnimplementedConfigServer) Load(context.Context, *LoadRequest) (*LoadResponse, error) {
+func (UnimplementedConfigServer) Load(context.Context, *LoadRequest) (*LoadResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Load not implemented")
 }
-func (*UnimplementedConfigServer) Save(context.Context, *SaveRequest) (*SaveResponse, error) {
+func (UnimplementedConfigServer) Save(context.Context, *SaveRequest) (*SaveResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Save not implemented")
 }
-func (*UnimplementedConfigServer) mustEmbedUnimplementedConfigServer() {}
+func (UnimplementedConfigServer) mustEmbedUnimplementedConfigServer() {}
 
-func RegisterConfigServer(s *grpc.Server, srv ConfigServer) {
-	s.RegisterService(&_Config_serviceDesc, srv)
+// UnsafeConfigServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to ConfigServer will
+// result in compilation errors.
+type UnsafeConfigServer interface {
+	mustEmbedUnimplementedConfigServer()
+}
+
+func RegisterConfigServer(s grpc.ServiceRegistrar, srv ConfigServer) {
+	s.RegisterService(&Config_ServiceDesc, srv)
 }
 
 func _Config_Load_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -108,7 +116,10 @@ func _Config_Save_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	return interceptor(ctx, in, info, handler)
 }
 
-var _Config_serviceDesc = grpc.ServiceDesc{
+// Config_ServiceDesc is the grpc.ServiceDesc for Config service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Config_ServiceDesc = grpc.ServiceDesc{
 	ServiceName: "service.Config",
 	HandlerType: (*ConfigServer)(nil),
 	Methods: []grpc.MethodDesc{

proto/service_micro.pb.go

@@ -1,47 +0,0 @@
-// Code generated by protoc-gen-micro
-// source: service.proto
-package service
-
-import (
-	"context"
-
-	micro_api "github.com/unistack-org/micro/v3/api"
-	micro_client "github.com/unistack-org/micro/v3/client"
-	micro_server "github.com/unistack-org/micro/v3/server"
-)
-
-// NewConfigEndpoints provides api endpoints metdata for Config service
-func NewConfigEndpoints() []*micro_api.Endpoint {
-	var endpoints []*micro_api.Endpoint
-	return endpoints
-}
-
-// ConfigService interface
-type ConfigService interface {
-	Load(context.Context, *LoadRequest, ...micro_client.CallOption) (*LoadResponse, error)
-	Save(context.Context, *SaveRequest, ...micro_client.CallOption) (*SaveResponse, error)
-}
-
-// Micro server stuff
-
-// ConfigHandler server handler
-type ConfigHandler interface {
-	Load(context.Context, *LoadRequest, *LoadResponse) error
-	Save(context.Context, *SaveRequest, *SaveResponse) error
-}
-
-// RegisterConfigHandler registers server handler
-func RegisterConfigHandler(s micro_server.Server, sh ConfigHandler, opts ...micro_server.HandlerOption) error {
-	type config interface {
-		Load(context.Context, *LoadRequest, *LoadResponse) error
-		Save(context.Context, *SaveRequest, *SaveResponse) error
-	}
-	type Config struct {
-		config
-	}
-	h := &configHandler{sh}
-	for _, endpoint := range NewConfigEndpoints() {
-		opts = append(opts, micro_api.WithEndpoint(endpoint))
-	}
-	return s.Handle(s.NewHandler(&Config{h}, opts...))
-}

proto/service_micro_grpc.pb.go

@@ -1,58 +0,0 @@
-// Code generated by protoc-gen-micro
-// source: service.proto
-package service
-
-import (
-	"context"
-
-	micro_client "github.com/unistack-org/micro/v3/client"
-	micro_server "github.com/unistack-org/micro/v3/server"
-)
-
-var (
-	_ micro_server.Option
-	_ micro_client.Option
-)
-
-type configService struct {
-	c    micro_client.Client
-	name string
-}
-
-// Micro client stuff
-
-// NewConfigService create new service client
-func NewConfigService(name string, c micro_client.Client) ConfigService {
-	return &configService{c: c, name: name}
-}
-
-func (c *configService) Load(ctx context.Context, req *LoadRequest, opts ...micro_client.CallOption) (*LoadResponse, error) {
-	rsp := &LoadResponse{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Load", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-func (c *configService) Save(ctx context.Context, req *SaveRequest, opts ...micro_client.CallOption) (*SaveResponse, error) {
-	rsp := &SaveResponse{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Config.Save", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-// Micro server stuff
-
-type configHandler struct {
-	ConfigHandler
-}
-
-func (h *configHandler) Load(ctx context.Context, req *LoadRequest, rsp *LoadResponse) error {
-	return h.ConfigHandler.Load(ctx, req, rsp)
-}
-
-func (h *configHandler) Save(ctx context.Context, req *SaveRequest, rsp *SaveResponse) error {
-	return h.ConfigHandler.Save(ctx, req, rsp)
-}

service.go

@@ -1,22 +1,25 @@
-package service
+package service // import "go.unistack.org/micro-config-service/v3"
 
 import (
 	"context"
 	"fmt"
 
 	"github.com/imdario/mergo"
-	pb "github.com/unistack-org/micro-config-service/v3/proto"
-	"github.com/unistack-org/micro/v3/config"
+	pbmicro "go.unistack.org/micro-config-service/v3/micro"
+	pb "go.unistack.org/micro-config-service/v3/proto"
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/config"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
-var (
-	DefaultStructTag = "service"
-)
+var _ config.Config = &serviceConfig{}
+
+var DefaultStructTag = "service"
 
 type serviceConfig struct {
 	opts    config.Options
 	service string
-	client  pb.ConfigService
+	client  pbmicro.ConfigClient
 }
 
 func (c *serviceConfig) Options() config.Options {
@@ -28,62 +31,102 @@ func (c *serviceConfig) Init(opts ...config.Option) error {
 		o(&c.opts)
 	}
 
+	var cli client.Client
 	if c.opts.Context != nil {
-		if v, ok := c.opts.Context.Value(serviceKey{}).(string); ok {
+		if v, ok := c.opts.Context.Value(serviceKey{}).(string); ok && v != "" {
 			c.service = v
 		}
+		if v, ok := c.opts.Context.Value(clientKey{}).(client.Client); ok {
+			cli = v
+		}
+	}
+
+	if cli == nil {
+		err := fmt.Errorf("missing client option")
+		c.opts.Logger.Error(c.opts.Context, err)
+		if !c.opts.AllowFail {
+			return err
+		}
+		return nil
 	}
 
 	if c.service == "" {
-		return fmt.Errorf("missing Service option")
+		err := fmt.Errorf("missing Service option")
+		c.opts.Logger.Error(c.opts.Context, err)
+		if !c.opts.AllowFail {
+			return err
+		}
+		return nil
 	}
 
+	c.client = pbmicro.NewConfigClient(c.service, cli)
+
 	return nil
 }
 
-func (c *serviceConfig) Load(ctx context.Context) error {
-	for _, fn := range c.opts.BeforeLoad {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
-	}
-
-	rsp, err := c.client.Load(ctx, &pb.LoadRequest{Service: c.service})
-	if err != nil && !c.opts.AllowFail {
-		return fmt.Errorf("failed to load error config: %w", err)
-	}
-
-	src, err := config.Zero(c.opts.Struct)
-	if err == nil {
-		err = c.opts.Codec.Unmarshal(rsp.Config, src)
-		if err == nil {
-			err = mergo.Merge(c.opts.Struct, src, mergo.WithOverride, mergo.WithTypeCheck, mergo.WithAppendSlice)
-		}
-	}
-	if err != nil && !c.opts.AllowFail {
+func (c *serviceConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
+	if err := config.DefaultBeforeLoad(ctx, c); err != nil {
 		return err
 	}
 
-	for _, fn := range c.opts.AfterLoad {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
+	rsp, err := c.client.Load(ctx, &pb.LoadRequest{Service: c.service})
+	if err != nil {
+		c.opts.Logger.Errorf(ctx, "service load error: %v", err)
+		if !c.opts.AllowFail {
+			return fmt.Errorf("failed to load config: %w", err)
 		}
+		return config.DefaultAfterLoad(ctx, c)
+	}
+
+	options := config.NewLoadOptions(opts...)
+	mopts := []func(*mergo.Config){mergo.WithTypeCheck}
+	if options.Override {
+		mopts = append(mopts, mergo.WithOverride)
+	}
+	if options.Append {
+		mopts = append(mopts, mergo.WithAppendSlice)
+	}
+
+	src, err := rutil.Zero(c.opts.Struct)
+	if err == nil {
+		err = c.opts.Codec.Unmarshal(rsp.Config, src)
+		if err == nil {
+			err = mergo.Merge(c.opts.Struct, src, mopts...)
+		}
+	}
+
+	if err != nil {
+		c.opts.Logger.Errorf(ctx, "service load error: %v", err)
+		if !c.opts.AllowFail {
+			return fmt.Errorf("failed to load config: %w", err)
+		}
+	}
+
+	if err := config.DefaultAfterLoad(ctx, c); err != nil {
+		return err
 	}
 
 	return nil
 }
 
-func (c *serviceConfig) Save(ctx context.Context) error {
-	for _, fn := range c.opts.BeforeSave {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
+func (c *serviceConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
+	if err := config.DefaultBeforeSave(ctx, c); err != nil {
+		return err
+	}
+
+	buf, err := c.opts.Codec.Marshal(c.opts.Struct)
+	if err == nil {
+		_, err = c.client.Save(ctx, &pb.SaveRequest{Service: c.service, Config: buf})
+	}
+	if err != nil {
+		c.opts.Logger.Errorf(ctx, "service save error: %v", err)
+		if !c.opts.AllowFail {
+			return fmt.Errorf("failed to save config: %w", err)
 		}
 	}
 
-	for _, fn := range c.opts.AfterSave {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
+	if err := config.DefaultAfterSave(ctx, c); err != nil {
+		return err
 	}
 
 	return nil
@@ -93,7 +136,15 @@ func (c *serviceConfig) String() string {
 	return "service"
 }
 
-func NewConfig(opts ...config.Option) config.Config {
+func (c *serviceConfig) Name() string {
+	return c.opts.Name
+}
+
+func (c *serviceConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func NewConfig(opts ...config.Option) *serviceConfig {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag