Merge branch 'master-1'

# Conflicts:
#	internal/source/gitea/gitea.go
#	internal/source/github/github.go
#	internal/source/gitlab/gitlab.go

.gitea/pkgdashcli.yaml

@@ -3,6 +3,7 @@ branches:
 source:
   type: gitea
   apiurl: git.unistack.org
+  repository: pkgdash
 update_opt:
   pre: false
   major: false

Makefile

@@ -1,15 +1,15 @@
 .PHONY: build
 build:
-	GOWORK=off CGO_ENABLED=0 go build -o bin/pkgdash -mod=readonly git.unistack.org/unistack-org/pkgdash/cmd/pkgdash
+	GOWORK=off CGO_ENABLED=0 go build -o bin/pkgdash -mod=readonly go.unistack.org/pkgdash/cmd/pkgdash
-	GOWORK=off CGO_ENABLED=0 go build -o bin/pkgdashcli -mod=readonly git.unistack.org/unistack-org/pkgdash/cmd/pkgdashcli
+	GOWORK=off CGO_ENABLED=0 go build -o bin/pkgdashcli -mod=readonly go.unistack.org/pkgdash/cmd/pkgdashcli
 
 .PHONY: buildcli
 buildcli:
-	CGO_ENABLED=0 go build -o bin/app -mod=readonly git.unistack.org/unistack-org/pkgdash/cmd/pkgdashcli
+	CGO_ENABLED=0 go build -o bin/app -mod=readonly go.unistack.org/pkgdash/cmd/pkgdashcli
 
 .PHONY: cli
 cli:
-	go install git.unistack.org/unistack-org/pkgdash/cmd/pkgdashcli
+	go install go.unistack.org/pkgdash/cmd/pkgdashcli
 
 .PHONY: test
 test:

cmd/pkgdash/assets/ui/vendor.js

@@ -51956,7 +51956,7 @@ function ɵɵresolveBody(element) {
  */
 
 
-const INTERPOLATION_DELIMITER = `<60>`;
+const INTERPOLATION_DELIMITER = `<EFBFBD>`;
 /**
  * Unwrap a value which might be behind a closure (for forward declaration reasons).
  */
@@ -52069,7 +52069,7 @@ function getExpressionChangedErrorDetails(lView, bindingIndex, oldValue, newValu
   } // metadata is not available for this expression, check if this expression is a part of the
   // property interpolation by going from the current binding index left and look for a string that
   // contains INTERPOLATION_DELIMITER, the layout in tView.data for this case will look like this:
-  // [..., 'id<69>Prefix <20> and <20> suffix', null, null, null, ...]
+  // [..., 'id<EFBFBD>Prefix <20> and <20> suffix', null, null, null, ...]
 
 
   if (metadata === null) {
@@ -56810,7 +56810,7 @@ function executeViewQueryFn(flags, viewQueryFn, component) {
  * `LView`). Metadata are represented as `INTERPOLATION_DELIMITER`-delimited string with the
  * following format:
  * - `propertyName` for bound properties;
- * - `propertyName<6D>prefix<69>interpolation_static_part1<74>..interpolation_static_partN<74>suffix` for
+ * - `propertyName<EFBFBD>prefix<EFBFBD>interpolation_static_part1<EFBFBD>..interpolation_static_partN<74>suffix` for
  * interpolated properties.
  *
  * @param tData `TData` where meta-data will be saved;
@@ -64853,13 +64853,13 @@ class OpCodeParser {
  */
 
 
-const BINDING_REGEXP = /<2F>(\d+):?\d*<2A>/gi;
+const BINDING_REGEXP = /<EFBFBD>(\d+):?\d*<2A>/gi;
-const ICU_REGEXP = /({\s*<2A>\d+:?\d*<2A>\s*,\s*\S{6}\s*,[\s\S]*})/gi;
+const ICU_REGEXP = /({\s*<EFBFBD>\d+:?\d*<2A>\s*,\s*\S{6}\s*,[\s\S]*})/gi;
-const NESTED_ICU = /<2F>(\d+)<29>/;
+const NESTED_ICU = /<EFBFBD>(\d+)<29>/;
-const ICU_BLOCK_REGEXP = /^\s*(<28>\d+:?\d*<2A>)\s*,\s*(select|plural)\s*,/;
+const ICU_BLOCK_REGEXP = /^\s*(<EFBFBD>\d+:?\d*<2A>)\s*,\s*(select|plural)\s*,/;
-const MARKER = `<60>`;
+const MARKER = `<EFBFBD>`;
-const SUBTEMPLATE_REGEXP = /<2F>\/?\*(\d+:\d+)<29>/gi;
+const SUBTEMPLATE_REGEXP = /<EFBFBD>\/?\*(\d+:\d+)<29>/gi;
-const PH_REGEXP = /<2F>(\/?[#*]\d+):?\d*<2A>/gi;
+const PH_REGEXP = /<EFBFBD>(\/?[#*]\d+):?\d*<2A>/gi;
 /**
  * Angular Dart introduced &ngsp; as a placeholder for non-removable space, see:
  * https://github.com/dart-lang/angular/blob/0bb611387d29d65b5af7f9d2515ab571fd3fbee4/_tests/test/compiler/preserve_whitespace_test.dart#L25-L32
@@ -64942,7 +64942,7 @@ function i18nStartFirstCreatePass(tView, parentTNodeIndex, lView, index, message
       }
     } else {
       // Odd indexes are placeholders (elements and sub-templates)
-      // At this point value is something like: '/#1:2' (originally coming from '<27>/#1:2<>')
+      // At this point value is something like: '/#1:2' (originally coming from '<EFBFBD>/#1:2<>')
       const isClosing = value.charCodeAt(0) === 47
       /* CharCode.SLASH */
       ;
@@ -65298,7 +65298,7 @@ function icuStart(tView, lView, updateOpCodes, parentIdx, icuExpression, anchorI
         // It is an nested ICU expression
         const icuIndex = nestedIcus.push(value) - 1; // Replace nested ICU expression by a comment node
 
-        valueArr[j] = `<!--<2D>${icuIndex}<7D>-->`;
+        valueArr[j] = `<!--<EFBFBD>${icuIndex}<EFBFBD>-->`;
       }
     }
 
@@ -65597,11 +65597,11 @@ function addCreateAttribute(create, newIndex, attr) {
 
 
 const ROOT_TEMPLATE_ID = 0;
-const PP_MULTI_VALUE_PLACEHOLDERS_REGEXP = /\[(<28>.+?<3F>?)\]/;
+const PP_MULTI_VALUE_PLACEHOLDERS_REGEXP = /\[(<EFBFBD>.+?<3F>?)\]/;
-const PP_PLACEHOLDERS_REGEXP = /\[(<28>.+?<3F>?)\]|(<28>\/?\*\d+:\d+<2B>)/g;
+const PP_PLACEHOLDERS_REGEXP = /\[(<EFBFBD>.+?<3F>?)\]|(<28>\/?\*\d+:\d+<2B>)/g;
 const PP_ICU_VARS_REGEXP = /({\s*)(VAR_(PLURAL|SELECT)(_\d+)?)(\s*,)/g;
 const PP_ICU_PLACEHOLDERS_REGEXP = /{([A-Z0-9_]+)}/g;
-const PP_ICUS_REGEXP = /<2F>I18N_EXP_(ICU(_\d+)?)<29>/g;
+const PP_ICUS_REGEXP = /<EFBFBD>I18N_EXP_(ICU(_\d+)?)<29>/g;
 const PP_CLOSE_TEMPLATE_REGEXP = /\/\*/;
 const PP_TEMPLATE_ID_REGEXP = /\d+\:(\d+)/;
 /**
@@ -65611,10 +65611,10 @@ const PP_TEMPLATE_ID_REGEXP = /\d+\:(\d+)/;
  * format (that might contain some markers that we need to replace) to the final
  * form, consumable by i18nStart instruction. Post processing steps include:
  *
- * 1. Resolve all multi-value cases (like [<5B>*1:1<><31>#2:1<>|<7C>#4:1<>|<7C>5<EFBFBD>])
+ * 1. Resolve all multi-value cases (like [<EFBFBD>*1:1<EFBFBD><EFBFBD>#2:1<EFBFBD>|<EFBFBD>#4:1<EFBFBD>|<EFBFBD>5<EFBFBD>])
  * 2. Replace all ICU vars (like "VAR_PLURAL")
  * 3. Replace all placeholders used inside ICUs in a form of {PLACEHOLDER}
- * 4. Replace all ICU references with corresponding values (like <20>ICU_EXP_ICU_1<5F>)
+ * 4. Replace all ICU references with corresponding values (like <EFBFBD>ICU_EXP_ICU_1<EFBFBD>)
  *    in case multiple ICUs have the same placeholder name
  *
  * @param message Raw translation string for post processing
@@ -65627,13 +65627,13 @@ const PP_TEMPLATE_ID_REGEXP = /\d+\:(\d+)/;
 
 function i18nPostprocess(message, replacements = {}) {
   /**
-   * Step 1: resolve all multi-value placeholders like [<5B>#5<>|<7C>*1:1<><31>#2:1<>|<7C>#4:1<>]
+   * Step 1: resolve all multi-value placeholders like [<EFBFBD>#5<EFBFBD>|<EFBFBD>*1:1<EFBFBD><EFBFBD>#2:1<EFBFBD>|<EFBFBD>#4:1<EFBFBD>]
    *
    * Note: due to the way we process nested templates (BFS), multi-value placeholders are typically
-   * grouped by templates, for example: [<5B>#5<>|<7C>#6<>|<7C>#1:1<>|<7C>#3:2<>] where <20>#5<> and <20>#6<> belong to root
+   * grouped by templates, for example: [<EFBFBD>#5<EFBFBD>|<EFBFBD>#6<EFBFBD>|<EFBFBD>#1:1<EFBFBD>|<EFBFBD>#3:2<EFBFBD>] where <EFBFBD>#5<EFBFBD> and <EFBFBD>#6<EFBFBD> belong to root
-   * template, <20>#1:1<> belong to nested template with index 1 and <20>#1:2<> - nested template with index
+   * template, <EFBFBD>#1:1<EFBFBD> belong to nested template with index 1 and <EFBFBD>#1:2<EFBFBD> - nested template with index
-   * 3. However in real templates the order might be different: i.e. <20>#1:1<> and/or <20>#3:2<> may go in
+   * 3. However in real templates the order might be different: i.e. <EFBFBD>#1:1<EFBFBD> and/or <EFBFBD>#3:2<EFBFBD> may go in
-   * front of <20>#6<>. The post processing step restores the right order by keeping track of the
+   * front of <EFBFBD>#6<EFBFBD>. The post processing step restores the right order by keeping track of the
    * template id stack and looks for placeholders that belong to the currently active template.
    */
   let result = message;
@@ -65704,7 +65704,7 @@ function i18nPostprocess(message, replacements = {}) {
     return replacements.hasOwnProperty(key) ? replacements[key] : match;
   });
   /**
-   * Step 4: replace all ICU references with corresponding values (like <20>ICU_EXP_ICU_1<5F>) in case
+   * Step 4: replace all ICU references with corresponding values (like <EFBFBD>ICU_EXP_ICU_1<EFBFBD>) in case
    * multiple ICUs have the same placeholder name
    */
 
@@ -65739,14 +65739,14 @@ function i18nPostprocess(message, replacements = {}) {
  * contain placeholders which associate inner elements and sub-templates within the translation.
  *
  * The translation `message` placeholders are:
- * - `<60>{index}(:{block})<29>`: *Binding Placeholder*: Marks a location where an expression will be
+ * - `<EFBFBD>{index}(:{block})<29>`: *Binding Placeholder*: Marks a location where an expression will be
  *   interpolated into. The placeholder `index` points to the expression binding index. An optional
  *   `block` that matches the sub-template in which it was declared.
- * - `<60>#{index}(:{block})<29>`/`<60>/#{index}(:{block})<29>`: *Element Placeholder*:  Marks the beginning
+ * - `<EFBFBD>#{index}(:{block})<29>`/`<EFBFBD>/#{index}(:{block})<29>`: *Element Placeholder*:  Marks the beginning
  *   and end of DOM element that were embedded in the original translation block. The placeholder
  *   `index` points to the element index in the template instructions set. An optional `block` that
  *   matches the sub-template in which it was declared.
- * - `<60>*{index}:{block}<7D>`/`<60>/*{index}:{block}<7D>`: *Sub-template Placeholder*: Sub-templates must be
+ * - `<EFBFBD>*{index}:{block}<7D>`/`<EFBFBD>/*{index}:{block}<7D>`: *Sub-template Placeholder*: Sub-templates must be
  *   split up and translated separately in each angular template function. The `index` points to the
  *   `template` instruction index. A `block` that matches the sub-template in which it was declared.
  *
@@ -65801,14 +65801,14 @@ function ɵɵi18nEnd() {
  * contain placeholders which associate inner elements and sub-templates within the translation.
  *
  * The translation `message` placeholders are:
- * - `<60>{index}(:{block})<29>`: *Binding Placeholder*: Marks a location where an expression will be
+ * - `<EFBFBD>{index}(:{block})<29>`: *Binding Placeholder*: Marks a location where an expression will be
  *   interpolated into. The placeholder `index` points to the expression binding index. An optional
  *   `block` that matches the sub-template in which it was declared.
- * - `<60>#{index}(:{block})<29>`/`<60>/#{index}(:{block})<29>`: *Element Placeholder*:  Marks the beginning
+ * - `<EFBFBD>#{index}(:{block})<29>`/`<EFBFBD>/#{index}(:{block})<29>`: *Element Placeholder*:  Marks the beginning
  *   and end of DOM element that were embedded in the original translation block. The placeholder
  *   `index` points to the element index in the template instructions set. An optional `block` that
  *   matches the sub-template in which it was declared.
- * - `<60>*{index}:{block}<7D>`/`<60>/*{index}:{block}<7D>`: *Sub-template Placeholder*: Sub-templates must be
+ * - `<EFBFBD>*{index}:{block}<7D>`/`<EFBFBD>/*{index}:{block}<7D>`: *Sub-template Placeholder*: Sub-templates must be
  *   split up and translated separately in each angular template function. The `index` points to the
  *   `template` instruction index. A `block` that matches the sub-template in which it was declared.
  *
@@ -65877,10 +65877,10 @@ function ɵɵi18nApply(index) {
  * format (that might contain some markers that we need to replace) to the final
  * form, consumable by i18nStart instruction. Post processing steps include:
  *
- * 1. Resolve all multi-value cases (like [<5B>*1:1<><31>#2:1<>|<7C>#4:1<>|<7C>5<EFBFBD>])
+ * 1. Resolve all multi-value cases (like [<EFBFBD>*1:1<EFBFBD><EFBFBD>#2:1<EFBFBD>|<EFBFBD>#4:1<EFBFBD>|<EFBFBD>5<EFBFBD>])
  * 2. Replace all ICU vars (like "VAR_PLURAL")
  * 3. Replace all placeholders used inside ICUs in a form of {PLACEHOLDER}
- * 4. Replace all ICU references with corresponding values (like <20>ICU_EXP_ICU_1<5F>)
+ * 4. Replace all ICU references with corresponding values (like <EFBFBD>ICU_EXP_ICU_1<EFBFBD>)
  *    in case multiple ICUs have the same placeholder name
  *
  * @param message Raw translation string for post processing

cmd/pkgdash/main.go

@@ -7,33 +7,33 @@ import (
 	"io/fs"
 	"net/http"
 	"time"
-slog "go.unistack.org/micro/v4/logger/slog"
+
-	appconfig "git.unistack.org/unistack-org/pkgdash/internal/config"
+	jsoncodec "go.unistack.org/micro-codec-json/v3"
-	"git.unistack.org/unistack-org/pkgdash/internal/database"
+	jsonpbcodec "go.unistack.org/micro-codec-jsonpb/v3"
-	"git.unistack.org/unistack-org/pkgdash/internal/handler"
+	yamlcodec "go.unistack.org/micro-codec-yaml/v3"
-	"git.unistack.org/unistack-org/pkgdash/internal/storage"
+	envconfig "go.unistack.org/micro-config-env/v3"
-	_ "git.unistack.org/unistack-org/pkgdash/internal/storage/sqlite"
+	fileconfig "go.unistack.org/micro-config-file/v3"
-	"git.unistack.org/unistack-org/pkgdash/internal/worker"
+	vaultconfig "go.unistack.org/micro-config-vault/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	victoriameter "go.unistack.org/micro-meter-victoriametrics/v3"
-	jsoncodec "go.unistack.org/micro-codec-json/v4"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	jsonpbcodec "go.unistack.org/micro-codec-jsonpb/v4"
+	healthhandler "go.unistack.org/micro-server-http/v3/handler/health"
-	yamlcodec "go.unistack.org/micro-codec-yaml/v4"
+	meterhandler "go.unistack.org/micro-server-http/v3/handler/meter"
-	envconfig "go.unistack.org/micro-config-env/v4"
+	spahandler "go.unistack.org/micro-server-http/v3/handler/spa"
-	fileconfig "go.unistack.org/micro-config-file/v4"
+	swaggerui "go.unistack.org/micro-server-http/v3/handler/swagger-ui"
-	vaultconfig "go.unistack.org/micro-config-vault/v4"
+	"go.unistack.org/micro/v3"
-	victoriameter "go.unistack.org/micro-meter-victoriametrics/v4"
+	"go.unistack.org/micro/v3/config"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	"go.unistack.org/micro/v3/logger"
-	healthhandler "go.unistack.org/micro-server-http/v4/handler/health"
+	slog "go.unistack.org/micro/v3/logger/slog"
-	meterhandler "go.unistack.org/micro-server-http/v4/handler/meter"
+	"go.unistack.org/micro/v3/meter"
-	spahandler "go.unistack.org/micro-server-http/v4/handler/spa"
+	"go.unistack.org/micro/v3/server"
-	swaggerui "go.unistack.org/micro-server-http/v4/handler/swagger-ui"
+	rutil "go.unistack.org/micro/v3/util/reflect"
-	"go.unistack.org/micro/v4"
+	appconfig "go.unistack.org/pkgdash/internal/config"
-	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/pkgdash/internal/database"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/pkgdash/internal/handler"
-	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/pkgdash/internal/storage"
-	"go.unistack.org/micro/v4/options"
+	_ "go.unistack.org/pkgdash/internal/storage/sqlite"
-	"go.unistack.org/micro/v4/server"
+	"go.unistack.org/pkgdash/internal/worker"
-	rutil "go.unistack.org/micro/v4/util/reflect"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 const appName = "pkgdash"
@@ -53,16 +53,16 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	logger.DefaultLogger = slog.NewLogger(logger.WithLevel(logger.DebugLevel))
+	log := slog.NewLogger(logger.WithLevel(logger.DebugLevel))
-	if err := logger.DefaultLogger.Init(); err != nil {
+	if err := log.Init(); err != nil {
-		logger.Fatal(ctx, "failed to init logger")
+		log.Fatal(ctx, "failed to init logger")
 	}
 
 	cfg := appconfig.NewConfig(appName, AppVersion) // create new empty config
 	vc := vaultconfig.NewConfig(
 		config.AllowFail(true),             // that may be not exists
 		config.Struct(cfg),                 // load from vault
-		options.Codec(jsoncodec.NewCodec()), // vault config in json
+		config.Codec(jsoncodec.NewCodec()), // vault config in json
 		config.BeforeLoad(func(ctx context.Context, c config.Config) error {
 			return c.Init(
 				vaultconfig.HTTPClient(&http.Client{
@@ -86,7 +86,7 @@ func main() {
 			fileconfig.NewConfig( // load from file
 				config.AllowFail(true),             // that may be not exists
 				config.Struct(cfg),                 // pass config struct
-				options.Codec(yamlcodec.NewCodec()), // file config in json
+				config.Codec(yamlcodec.NewCodec()), // file config in json
 				fileconfig.Path("./local.yaml"),    // nearby file
 			),
 			envconfig.NewConfig( // load from environment
@@ -95,11 +95,11 @@ func main() {
 			vc,
 		}, config.LoadOverride(true),
 	); err != nil {
-		logger.Fatal(ctx, "failed to load config: %v", err)
+		log.Fatal(ctx, "failed to load config: %v", err)
 	}
 
 	if err := config.Validate(ctx, cfg); err != nil {
-		logger.Fatal(ctx, "failed to validate config: %v", err)
+		log.Fatal(ctx, "failed to validate config: %v", err)
 	}
 
 	swaggerui.Config["url"] = "../service.swagger.yaml"
@@ -108,7 +108,7 @@ func main() {
 		meter.Path(cfg.Meter.Path),
 		meter.WriteFDMetrics(true),
 		meter.WriteProcessMetrics(true),
-		options.Address(cfg.Meter.Addr),
+		meter.Address(cfg.Meter.Addr),
 	)
 
 	svc := micro.NewService()
@@ -118,89 +118,86 @@ func main() {
 		micro.Name(cfg.Server.Name),
 		micro.Version(cfg.Server.Version),
 	); err != nil {
-		logger.Fatal(ctx, "failed to init service: %v", err)
+		log.Fatal(ctx, "failed to init service: %v", err)
 	}
 
 	assetsUI, err := fs.Sub(assets, "assets/ui")
 	if err != nil {
-		logger.Fatal(ctx, "failed to get assets: %v", err)
+		log.Fatal(ctx, "failed to get assets: %v", err)
 	}
 
 	if err := svc.Server("http").Init(
-		options.Address(cfg.Server.Addr),
+		server.Address(cfg.Server.Addr),
-		options.Name(cfg.Server.Name),
+		server.Name(cfg.Server.Name),
 		server.Version(cfg.Server.Version),
-		options.Codecs("application/json", jsonpbcodec.NewCodec()),
+		server.Codec("application/json", jsonpbcodec.NewCodec()),
-		options.Address(cfg.Server.Addr),
-		options.Context(ctx),
 		httpsrv.PathHandler(http.MethodGet, "/ui/*", spahandler.Handler("/ui/", assetsUI)),
 		httpsrv.PathHandler(http.MethodHead, "/ui/*", spahandler.Handler("/ui/", assetsUI)),
 		httpsrv.PathHandler(http.MethodGet, "/swagger-ui/*", swaggerui.Handler("/swagger-ui")),
 	); err != nil {
-		logger.Fatal(ctx, "failed to init service: %v", err)
+		log.Fatal(ctx, "failed to init service: %v", err)
 	}
 
 	if err := database.ParseDSN(cfg.Database); err != nil {
-		logger.Fatal(ctx, "failed to init database: %v", err)
+		log.Fatal(ctx, "failed to init database: %v", err)
 	}
 
-	db, err := database.Connect(ctx, cfg.Database, logger.DefaultLogger)
+	db, err := database.Connect(ctx, cfg.Database, log)
 	if err != nil {
-		logger.Fatal(ctx, "failed to connect database: %v", err)
+		log.Fatal(ctx, "failed to connect database: %v", err)
 	}
 
-	store, err := storage.NewStorage(cfg.Database.Type, db)
+	store, err := storage.NewStorage(cfg.Database.Type, log, db)
 	if err != nil {
-		logger.Fatal(ctx, "failed to init storage: %v", err)
+		log.Fatal(ctx, "failed to init storage: %v", err)
 	}
 
-	h, err := handler.NewHandler(store)
+	h, err := handler.NewHandler(log, store)
 	if err != nil {
-		logger.Fatal(ctx, "failed to create handler: %v", err)
+		log.Fatal(ctx, "failed to create handler: %v", err)
 	}
 
-	log := logger.NewLogger(
+	if err := svc.Init(
-		logger.WithLevel(logger.ParseLevel(cfg.Server.LoggerLevel)),
+		micro.Logger(
-		logger.WithCallerSkipCount(3),
+			log.Clone(logger.WithLevel(logger.ParseLevel(cfg.Server.LoggerLevel))),
-	)
+		),
-	if err := svc.Init(micro.Logger(log)); err != nil {
+	); err != nil {
-		logger.Fatal(ctx, "failed to init service: %v", err)
+		log.Fatal(ctx, "failed to init service", err)
 	}
 
-	if err := pb.RegisterPkgdashServiceServer(svc.Server("http"), h); err != nil {
+	if err := pb.RegisterPkgdashServer(svc.Server("http"), h); err != nil {
-		logger.Fatal(ctx, "failed to register handler: %v", err)
+		log.Fatal(ctx, "failed to register handler", err)
 	}
 
 	intsvc := httpsrv.NewServer(
-		options.Codecs("application/json", jsoncodec.NewCodec()),
+		server.Codec("application/json", jsoncodec.NewCodec()),
-		options.Address(cfg.Meter.Addr),
+		server.Address(cfg.Meter.Addr),
-		options.Context(ctx),
 	)
 
 	if err := intsvc.Init(); err != nil {
-		logger.Fatal(ctx, "failed to init http srv: %v", err)
+		log.Fatal(ctx, "failed to init http srv: %v", err)
 	}
 
 	if err := healthhandler.RegisterHealthServiceServer(intsvc, healthhandler.NewHandler()); err != nil {
-		logger.Fatal(ctx, "failed to set http handler: %v", err)
+		log.Fatal(ctx, "failed to set http handler: %v", err)
 	}
 
 	if err := meterhandler.RegisterMeterServiceServer(intsvc, meterhandler.NewHandler()); err != nil {
-		logger.Fatal(ctx, "failed to set http handler: %v", err)
+		log.Fatal(ctx, "failed to set http handler: %v", err)
 	}
 
 	if err := intsvc.Start(); err != nil {
-		logger.Fatal(ctx, "failed to run http srv: %v", err)
+		log.Fatal(ctx, "failed to run http srv: %v", err)
 	}
 
 	cw, err := vc.Watch(ctx, config.WatchCoalesce(true), config.WatchInterval(1*time.Second, 5*time.Second))
 	if err != nil {
-		logger.Fatal(ctx, "failed to watch config: %v", err)
+		log.Fatal(ctx, "failed to watch config: %v", err)
 	}
 
 	defer func() {
 		if err := cw.Stop(); err != nil {
-			logger.Error(ctx, err.Error())
+			log.Error(ctx, err.Error())
 		}
 	}()
 
@@ -208,11 +205,11 @@ func main() {
 		for {
 			changes, err := cw.Next()
 			if err != nil {
-				logger.Error(ctx, "failed to get config update: %v", err)
+				log.Error(ctx, "failed to get config update: %v", err)
 			}
 			for k, v := range changes {
 				if err = rutil.SetFieldByPath(cfg, v, k); err != nil {
-					logger.Error(ctx, "failed to set config update: %v", err)
+					log.Error(ctx, "failed to set config update: %v", err)
 					break
 				}
 			}
@@ -221,8 +218,8 @@ func main() {
 					switch k {
 					case "Server.LoggerLevel":
 						if lvl, ok := changes[k].(string); ok {
-							logger.Info(ctx, "logger level changed to %s", lvl)
+							log.Info(ctx, "logger level changed to %s", lvl)
-							logger.DefaultLogger.Level(logger.ParseLevel(lvl))
+							log.Level(logger.ParseLevel(lvl))
 						}
 					}
 				}
@@ -231,10 +228,10 @@ func main() {
 	}()
 
 	go func() {
-		worker.Run(ctx, store, time.Duration(cfg.App.CheckInterval))
+		worker.Run(ctx, log, store, time.Duration(cfg.App.CheckInterval))
 	}()
 
 	if err = svc.Run(); err != nil {
-		logger.Fatal(ctx, "failed to run svc: %v", err)
+		log.Fatal(ctx, "failed to run svc: %v", err)
 	}
 }

cmd/pkgdashcli/main.go

@@ -8,7 +8,9 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	stdslog "log/slog"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"os/user"
@@ -17,23 +19,22 @@ import (
 	"text/template"
 	"time"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/configcli"
-	"git.unistack.org/unistack-org/pkgdash/internal/modules"
-	"git.unistack.org/unistack-org/pkgdash/internal/source"
 	"github.com/go-git/go-git/v5"
 	gitconfig "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	httpauth "github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/jdx/go-netrc"
-	yamlcodec "go.unistack.org/micro-codec-yaml/v4"
+	yamlcodec "go.unistack.org/micro-codec-yaml/v3"
-	envconfig "go.unistack.org/micro-config-env/v4"
+	envconfig "go.unistack.org/micro-config-env/v3"
-	fileconfig "go.unistack.org/micro-config-file/v4"
+	fileconfig "go.unistack.org/micro-config-file/v3"
-	microflag "go.unistack.org/micro-config-flag/v4"
+	microflag "go.unistack.org/micro-config-flag/v3"
-	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v3/config"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v4/logger/slog"
+	"go.unistack.org/micro/v3/logger/slog"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/pkgdash/internal/configcli"
+	"go.unistack.org/pkgdash/internal/modules"
+	"go.unistack.org/pkgdash/internal/source"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/mod/semver"
 )
@@ -98,10 +99,10 @@ func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	logger.DefaultLogger = slog.NewLogger()
+	log := slog.NewLogger(slog.WithHandlerFunc(stdslog.NewTextHandler))
 
-	if err = logger.DefaultLogger.Init(logger.WithCallerSkipCount(3), logger.WithLevel(logger.DebugLevel)); err != nil {
+	if err = log.Init(logger.WithLevel(logger.DebugLevel)); err != nil {
-		logger.Error(ctx, fmt.Sprintf("logger init error: %v", err))
+		log.Error(ctx, fmt.Sprintf("logger init error: %v", err))
 	}
 
 	cfg := configcli.NewConfig()
@@ -117,7 +118,7 @@ func main() {
 		},
 		config.LoadOverride(true),
 	); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to load config: %v", err))
+		log.Fatal(ctx, fmt.Sprintf("failed to load config: %v", err))
 	}
 
 	for _, configDir := range configDirs {
@@ -130,15 +131,15 @@ func main() {
 			c := fileconfig.NewConfig(
 				config.AllowFail(false),
 				config.Struct(cfg),
-				options.Codec(yamlcodec.NewCodec()),
+				config.Codec(yamlcodec.NewCodec()),
 				fileconfig.Path(path),
 			)
 			err = c.Init()
 			if err != nil {
-				logger.Error(ctx, fmt.Sprintf("failed to init config: %v", err))
+				log.Error(ctx, fmt.Sprintf("failed to init config: %v", err))
 			}
 			if err = c.Load(ctx, config.LoadOverride(true)); err != nil {
-				logger.Error(ctx, fmt.Sprintf("failed to load config: %v", err))
+				log.Error(ctx, fmt.Sprintf("failed to load config: %v", err))
 			}
 		}
 	}
@@ -155,11 +156,11 @@ func main() {
 	c := microflag.NewConfig(config.Struct(cliCfg), microflag.FlagErrorHandling(flag.ContinueOnError))
 
 	if err = c.Init(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("init cli cfg failed: %v", err))
+		log.Fatal(ctx, fmt.Sprintf("init cli cfg failed: %v", err))
 	}
 
 	if err = c.Load(ctx); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("load cli cfg failed: %v", err))
+		log.Fatal(ctx, fmt.Sprintf("load cli cfg failed: %v", err))
 	}
 
 	if cliCfg.Path == "" && cliCfg.Command == "" {
@@ -178,11 +179,11 @@ func main() {
 	}
 	buf, err := os.ReadFile(name)
 	if err != nil {
-		panic(err)
+		log.Fatal(ctx, "failed to read file", err)
 	}
 	mfile, err := modfile.Parse(name, buf, nil)
 	if err != nil {
-		panic(err)
+		log.Fatal(ctx, "failed to parse file", err)
 	}
 
 	mvs := make(map[string]modules.Update)
@@ -195,7 +196,7 @@ func main() {
 		OnUpdate: func(u modules.Update) {
 			var modpath string // new mod path with major
 			if u.Err != nil {
-				logger.Error(ctx, fmt.Sprintf("%s: failed: %v", u.Module.Path, u.Err))
+				log.Error(ctx, fmt.Sprintf("%s: failed: %v", u.Module.Path, u.Err))
 				return
 			}
 			modpath = u.Module.Path
@@ -219,18 +220,42 @@ func main() {
 
 	modules.Updates(updateOptions)
 
-	if err = getRepoMgmt(ctx, cfg); err != nil { // Filling in empty config fields.
+	if err = getRepoMgmt(ctx, log, cfg); err != nil { // Filling in empty config fields.
-		logger.Error(ctx, err.Error())
+		log.Error(ctx, err.Error())
 	}
 
-	gitSource := source.NewSourceControl(*cfg)
+	if len(cfg.Branches) == 0 {
-
+		branchName, err := getCurrentBranch(ctx)
-	Execute(ctx, gitSource, mvs, *cliCfg, *cfg)
+		if err != nil {
-
+			log.Fatal(ctx, "failed to get current branch", err)
-	logger.Info(ctx, "Pkgdash successfully updated dependencies")
+		}
+		cfg.Branches = append(cfg.Branches, branchName)
 	}
 
-func Execute(ctx context.Context, gitSource source.SourceControl, mvs map[string]modules.Update, cliCfg configcli.Cli, cfg configcli.Config) {
+	if cfg.Source.Owner == "" {
+		owner, err := getOwnerRepository(ctx)
+		if err != nil {
+			log.Fatal(ctx, "failed to get current repository", err)
+		}
+		cfg.Source.Owner = owner
+	}
+
+	if cfg.Source.Repository == "" {
+		repository, err := getCurrentRepository(ctx)
+		if err != nil {
+			log.Fatal(ctx, "failed to get current repository", err)
+		}
+		cfg.Source.Repository = repository
+	}
+
+	gitSource := source.NewSourceControl(*cfg, log)
+
+	Execute(ctx, log, gitSource, mvs, *cliCfg, *cfg)
+
+	log.Info(ctx, "Pkgdash successfully updated dependencies")
+}
+
+func Execute(ctx context.Context, log logger.Logger, gitSource source.SourceControl, mvs map[string]modules.Update, cliCfg configcli.Cli, cfg configcli.Config) {
 	var mod modules.Update
 	var ok bool
 	var path string
@@ -244,81 +269,168 @@ func Execute(ctx context.Context, gitSource source.SourceControl, mvs map[string
 		if cliCfg.Path != "" { // update one dep
 			path = cliCfg.Path
 			if mod, ok = mvs[path]; !ok {
-				logger.Fatal(ctx, fmt.Sprintf("For %s update not exist", path))
+				log.Fatal(ctx, fmt.Sprintf("For %s update not exist", path))
 			}
-			logger.Debug(ctx, fmt.Sprintf("Start update %s from %s to %s", path, mod.Module.Version, mod.Version))
+			log.Debug(ctx, fmt.Sprintf("Start update %s from %s to %s", path, mod.Module.Version, mod.Version))
 			for _, branch := range cfg.Branches {
 				if err := gitSource.RequestOpen(ctx, branch, path, mod); err != nil {
-					logger.Fatal(ctx, fmt.Sprintf("failed to create pr: %v", err))
+					log.Fatal(ctx, fmt.Sprintf("failed to create pr: %v", err))
 				}
 			}
-			logger.Debug(ctx, fmt.Sprintf("Update successful for %s", path))
+			log.Debug(ctx, fmt.Sprintf("Update successful for %s", path))
 			return
 		}
 		for _, branch := range cfg.Branches { // update all dep
 			for path, mod = range mvs {
-				logger.Debug(ctx, fmt.Sprintf("Start update %s from %s to %s", path, mod.Module.Version, mod.Version))
+				log.Debug(ctx, fmt.Sprintf("Start update %s from %s to %s", path, mod.Module.Version, mod.Version))
 				err := gitSource.RequestOpen(ctx, branch, path, mod)
 				if err != nil {
 					if strings.Contains(err.Error(), "already exists") {
-						logger.Debug(ctx, fmt.Sprintf("skip %s, branch already exists", path))
+						log.Debug(ctx, fmt.Sprintf("skip %s, branch already exists", path))
 						continue
 					}
-					logger.Fatal(ctx, fmt.Sprintf("failed to create pr: %v", err))
+					log.Fatal(ctx, fmt.Sprintf("failed to create pr: %v", err))
 				}
-				logger.Debug(ctx, fmt.Sprintf("Update successful for %s", path))
+				log.Debug(ctx, fmt.Sprintf("Update successful for %s", path))
 			}
 		}
 	case "close":
 		if cliCfg.Path != "" { // close one dep
 			path = cliCfg.Path
-			logger.Debug(ctx, fmt.Sprintf("Start close for %s", path))
+			log.Debug(ctx, fmt.Sprintf("Start close for %s", path))
 			for _, branch := range cfg.Branches {
 				if err := gitSource.RequestClose(ctx, branch, path); err != nil {
-					logger.Fatal(ctx, fmt.Sprintf("failed to close pr: %v", err))
+					log.Fatal(ctx, fmt.Sprintf("failed to close pr: %v", err))
 				}
 			}
-			logger.Debug(ctx, fmt.Sprintf("Close successful for %s", path))
+			log.Debug(ctx, fmt.Sprintf("Close successful for %s", path))
 			return
 		}
 		for _, branch := range cfg.Branches {
-			logger.Info(ctx, fmt.Sprintf("Start getting pr for %s", branch))
+			log.Info(ctx, fmt.Sprintf("Start getting pr for %s", branch))
 			rMap, err := gitSource.RequestList(ctx, branch)
 			if err != nil {
-				logger.Fatal(ctx, fmt.Sprintf("Error with getting pr list for branch: %s", branch))
+				log.Fatal(ctx, fmt.Sprintf("Error with getting pr list for branch: %s", branch))
 			}
 
-			logger.Info(ctx, fmt.Sprintf("for %s:\n%s", branch, rMap))
+			log.Info(ctx, fmt.Sprintf("for %s:\n%s", branch, rMap))
-			logger.Info(ctx, fmt.Sprintf("Start close pr for base branch %s", branch))
+			log.Info(ctx, fmt.Sprintf("Start close pr for base branch %s", branch))
 
-			for path, _ = range rMap {
+			for path = range rMap {
-				logger.Debug(ctx, fmt.Sprintf("Start close for %s", path))
+				log.Debug(ctx, fmt.Sprintf("Start close for %s", path))
 				if err = gitSource.RequestClose(ctx, branch, path); err != nil {
-					logger.Fatal(ctx, fmt.Sprintf("failed to close pr: %v", err))
+					log.Fatal(ctx, fmt.Sprintf("failed to close pr: %v", err))
 				}
-				logger.Debug(ctx, fmt.Sprintf("Close successful for %s", path))
+				log.Debug(ctx, fmt.Sprintf("Close successful for %s", path))
 			}
 		}
 	case "list":
 		for _, branch := range cfg.Branches {
 			rMap, err := gitSource.RequestList(ctx, branch)
 			if err != nil {
-				logger.Fatal(ctx, fmt.Sprintf("RequestList: error %s", err))
+				log.Fatal(ctx, fmt.Sprintf("RequestList: error %s", err))
 			}
 
 			prList[branch] = rMap
 		}
 		js, err := json.Marshal(prList)
 		if err != nil {
-			logger.Error(ctx, fmt.Sprintf("error: %s", err))
+			log.Error(ctx, fmt.Sprintf("error: %s", err))
 		}
-		fmt.Println(fmt.Sprintf("for %s:\n%s", cfg.Source.Repository, js))
+		fmt.Printf("for %s:\n%s\n", cfg.Source.Repository, js)
 	default:
 		fmt.Print(initMsg)
 	}
 }
 
-func getRepoMgmt(ctx context.Context, cfg *configcli.Config) error {
+func getCurrentRepository(ctx context.Context) (string, error) {
+	wd, err := os.Getwd()
+	if err != nil {
+		return "", err
+	}
+
+	p := filepath.Clean(wd)
+
+	repo, err := git.PlainOpen(p)
+	if err != nil {
+		return "", err
+	}
+
+	cfg, err := repo.Config()
+	if err != nil {
+		return "", err
+	}
+
+	for k, v := range cfg.Remotes {
+		if k != "origin" {
+			continue
+		}
+
+		u, err := url.Parse(v.URLs[0])
+		if err != nil {
+			continue
+		}
+		return filepath.Base(u.Path), nil
+	}
+
+	return "", fmt.Errorf("failed to get remotes")
+}
+
+func getOwnerRepository(ctx context.Context) (string, error) {
+	wd, err := os.Getwd()
+	if err != nil {
+		return "", err
+	}
+
+	p := filepath.Clean(wd)
+
+	repo, err := git.PlainOpen(p)
+	if err != nil {
+		return "", err
+	}
+
+	cfg, err := repo.Config()
+	if err != nil {
+		return "", err
+	}
+
+	for k, v := range cfg.Remotes {
+		if k != "origin" {
+			continue
+		}
+
+		u, err := url.Parse(v.URLs[0])
+		if err != nil {
+			continue
+		}
+		return filepath.Base(filepath.Dir(u.Path)), nil
+	}
+
+	return "", fmt.Errorf("failed to get remotes")
+}
+
+func getCurrentBranch(ctx context.Context) (string, error) {
+	wd, err := os.Getwd()
+	if err != nil {
+		return "", err
+	}
+
+	p := filepath.Clean(wd)
+
+	repo, err := git.PlainOpen(p)
+	if err != nil {
+		return "", err
+	}
+
+	ref, err := repo.Head()
+	if err != nil {
+		return "", err
+	}
+
+	return ref.Name().Short(), nil
+}
+
+func getRepoMgmt(ctx context.Context, log logger.Logger, cfg *configcli.Config) error {
 	wd, err := os.Getwd()
 	if err != nil {
 		return err
@@ -327,30 +439,38 @@ func getRepoMgmt(ctx context.Context, cfg *configcli.Config) error {
 	p := filepath.Clean(wd)
 	for _, configDir := range configDirs {
 		_, err := os.Stat(filepath.Join(p, configDir))
-		if name, ok := repoMgmt[configDir]; ok && cfg.Source.TypeGit == "" && err == nil {
+		if err != nil {
+			continue
+		}
+
+		log.Info(ctx, fmt.Sprintf("check config dir %s", configDir))
+		if name, ok := repoMgmt[configDir]; ok && cfg.Source.TypeGit == "" {
 			cfg.Source.TypeGit = name
 		}
-		if api, ok := repoAPI[configDir]; ok && cfg.Source.APIURL == "" && err == nil {
+		if api, ok := repoAPI[configDir]; ok && cfg.Source.APIURL == "" {
 			cfg.Source.APIURL = api
 		}
 	}
 	if p == "/" && cfg.Source.TypeGit == "" && cfg.Source.APIURL == "" {
 		return fmt.Errorf("unknown")
 	}
-	p = filepath.Clean(filepath.Join(p, ".."))
+	// p = filepath.Clean(filepath.Join(p, ".."))
 
 	usr, err := user.Current()
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("pkgdash/main can t get info about user: %s", err))
+		log.Fatal(ctx, fmt.Sprintf("pkgdash/main cant get info about user: %s", err))
-	}
-	n, err := netrc.Parse(filepath.Join(usr.HomeDir, ".netrc"))
-	if err != nil {
-		logger.Error(ctx, "pkgdash/main can t parse .netrc: %s", err)
 	}
 
-	if cfg.Source.Owner == "" {
+	log.Info(ctx, fmt.Sprintf("try to configure scm source %v", cfg.Source))
-		cfg.Source.Owner = n.Machine(cfg.Source.APIURL).Get("login")
+
+	netrcfile := filepath.Join(usr.HomeDir, ".netrc")
+	log.Info(ctx, "try to parse netrc file "+netrcfile)
+	n, err := netrc.Parse(netrcfile)
+	if err != nil {
+		log.Error(ctx, "pkgdash/main cant parse .netrc: %s", err)
 	}
+
+	log.Info(ctx, "try to configure scm for "+cfg.Source.APIURL)
 	if cfg.Source.Username == "" {
 		cfg.Source.Username = n.Machine(cfg.Source.APIURL).Get("login")
 	}
@@ -360,7 +480,7 @@ func getRepoMgmt(ctx context.Context, cfg *configcli.Config) error {
 	return nil
 }
 
-func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string, mods map[string]modules.Update) error {
+func giteaPullRequest(ctx context.Context, log logger.Logger, cfg *configcli.Config, branch string, mods map[string]modules.Update) error {
 	envAPIURL := os.Getenv("GITHUB_API_URL")
 	envREPOSITORY := os.Getenv("GITHUB_REPOSITORY")
 	envTOKEN := os.Getenv("GITHUB_TOKEN")
@@ -370,34 +490,34 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 
 	tplTitle, err := template.New("pull_request_title").Parse(cfg.PullRequestTitle)
 	if err != nil {
-		logger.Fatal(ctx, "failed to parse template: %v", err)
+		log.Fatal(ctx, "failed to parse template: %v", err)
 	}
 
 	wTitle := bytes.NewBuffer(nil)
 
 	tplBody, err := template.New("pull_request_body").Parse(cfg.PullRequestBody)
 	if err != nil {
-		logger.Fatal(ctx, "failed to parse template: %v", err)
+		log.Fatal(ctx, "failed to parse template: %v", err)
 	}
 
 	wBody := bytes.NewBuffer(nil)
 
 	repo, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
-		logger.Fatal(ctx, "failed to open repo: %v", err)
+		log.Fatal(ctx, "failed to open repo: %v", err)
 	}
 
 	if err = repo.FetchContext(ctx, &git.FetchOptions{
 		Auth:  &httpauth.BasicAuth{Username: envTOKEN, Password: envTOKEN},
 		Force: true,
 	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		logger.Fatal(ctx, "failed to fetch repo: %v", err)
+		log.Fatal(ctx, "failed to fetch repo: %v", err)
 	}
 
 	var headRef *plumbing.Reference
 	refIter, err := repo.Branches()
 	if err != nil {
-		logger.Fatal(ctx, "failed to get branches: %v", err)
+		log.Fatal(ctx, "failed to get branches: %v", err)
 	}
 	for {
 		ref, err := refIter.Next()
@@ -412,14 +532,14 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 	refIter.Close()
 
 	if headRef == nil {
-		logger.Fatal(ctx, "failed to get repo branch head")
+		log.Fatal(ctx, "failed to get repo branch head")
 	}
 
-	logger.Info(ctx, "repo head %s", headRef)
+	log.Info(ctx, "repo head %s", headRef)
 
 	wtree, err := repo.Worktree()
 	if err != nil {
-		logger.Fatal(ctx, "failed to get worktree: %v", err)
+		log.Fatal(ctx, "failed to get worktree: %v", err)
 	}
 
 	type giteaPull struct {
@@ -450,13 +570,13 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 	}
 
 	if err = json.Unmarshal(buf, &pulls); err != nil {
-		logger.Fatal(ctx, "failed to decode response %s err: %v", buf, err)
+		log.Fatal(ctx, "failed to decode response %s err: %v", buf, err)
 	}
 
 	for path := range mods {
 		for _, pull := range pulls {
 			if strings.Contains(pull.Title, path) && pull.Base.Ref == branch {
-				logger.Info(ctx, "skip %s as pr already exists %s", path, pull.URL)
+				log.Info(ctx, "skip %s as pr already exists %s", path, pull.URL)
 				delete(mods, path)
 			}
 		}
@@ -466,11 +586,11 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 		wTitle.Reset()
 		wBody.Reset()
 
-		logger.Info(ctx, "update %s from %s to %s", path, mod.Module.Version, mod.Version)
+		log.Info(ctx, "update %s from %s to %s", path, mod.Module.Version, mod.Version)
 
-		logger.Info(ctx, "reset worktree")
+		log.Info(ctx, "reset worktree")
 		if err = wtree.Reset(&git.ResetOptions{Mode: git.HardReset}); err != nil {
-			logger.Fatal(ctx, "failed to reset repo branch: %v", err)
+			log.Fatal(ctx, "failed to reset repo branch: %v", err)
 		}
 
 		if err = wtree.PullContext(ctx, &git.PullOptions{
@@ -480,17 +600,17 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 			Force:      true,
 			RemoteName: "origin",
 		}); err != nil && err != git.NoErrAlreadyUpToDate {
-			logger.Fatal(ctx, "failed to pull repo: %v", err)
+			log.Fatal(ctx, "failed to pull repo: %v", err)
 		}
 
-		logger.Info(ctx, "checkout ref %s", headRef)
+		log.Info(ctx, "checkout ref %s", headRef)
 		if err = wtree.Checkout(&git.CheckoutOptions{
 			Hash:   headRef.Hash(),
 			Branch: plumbing.NewBranchReferenceName(fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version)),
 			Create: true,
 			Force:  true,
 		}); err != nil {
-			logger.Fatal(ctx, "failed to checkout tree: %v", err)
+			log.Fatal(ctx, "failed to checkout tree: %v", err)
 		}
 
 		epath, err := exec.LookPath("go")
@@ -498,7 +618,7 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 			err = nil
 		}
 		if err != nil {
-			logger.Fatal(ctx, "failed to find go command: %v", err)
+			log.Fatal(ctx, "failed to find go command: %v", err)
 		}
 
 		var cmd *exec.Cmd
@@ -506,25 +626,25 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 
 		cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-require=%s@%s", path, mod.Version))
 		if out, err = cmd.CombinedOutput(); err != nil {
-			logger.Fatal(ctx, "failed to run go mod edit: %s err: %v", out, err)
+			log.Fatal(ctx, "failed to run go mod edit: %s err: %v", out, err)
 		}
 
 		cmd = exec.CommandContext(ctx, epath, "mod", "tidy")
 		if out, err = cmd.CombinedOutput(); err != nil {
-			logger.Fatal(ctx, "failed to run go mod tidy: %s err: %v", out, err)
+			log.Fatal(ctx, "failed to run go mod tidy: %s err: %v", out, err)
 		}
 
-		logger.Info(ctx, "worktree add go.mod")
+		log.Info(ctx, "worktree add go.mod")
 		if _, err = wtree.Add("go.mod"); err != nil {
-			logger.Fatal(ctx, "failed to add file: %v", err)
+			log.Fatal(ctx, "failed to add file: %v", err)
 		}
 
-		logger.Info(ctx, "worktree add go.sum")
+		log.Info(ctx, "worktree add go.sum")
 		if _, err = wtree.Add("go.sum"); err != nil {
-			logger.Fatal(ctx, "failed to add file: %v", err)
+			log.Fatal(ctx, "failed to add file: %v", err)
 		}
 
-		logger.Info(ctx, "worktree commit")
+		log.Info(ctx, "worktree commit")
 		_, err = wtree.Commit(wTitle.String(), &git.CommitOptions{
 			Parents: []plumbing.Hash{headRef.Hash()},
 			Author: &object.Signature{
@@ -534,27 +654,27 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 			},
 		})
 		if err != nil {
-			logger.Fatal(ctx, "failed to commit: %v", err)
+			log.Fatal(ctx, "failed to commit: %v", err)
 		}
 
 		// newref := plumbing.NewHashReference(plumbing.ReferenceName(fmt.Sprintf("refs/heads/pkgdash/go_modules/%s-%s", path, mod.Version)), headRef.Hash())
 
 		/*
 			if err = repo.Storer.SetReference(newref); err != nil {
-				logger.Fatal(ctx, "failed to create repo branch: %v", err)
+			log.Fatal(ctx, "failed to create repo branch: %v", err)
 			}
 		*/
 
 		refspec := gitconfig.RefSpec(fmt.Sprintf("+refs/heads/pkgdash/go_modules/%s-%s:refs/heads/pkgdash/go_modules/%s-%s", path, mod.Version, path, mod.Version))
 
-		logger.Info(ctx, "try to push refspec %s", refspec)
+		log.Info(ctx, "try to push refspec %s", refspec)
 
 		if err = repo.PushContext(ctx, &git.PushOptions{
 			RefSpecs: []gitconfig.RefSpec{refspec},
 			Auth:     &httpauth.BasicAuth{Username: envTOKEN, Password: envTOKEN},
 			Force:    true,
 		}); err != nil {
-			logger.Fatal(ctx, "failed to push repo branch: %v", err)
+			log.Fatal(ctx, "failed to push repo branch: %v", err)
 		}
 
 		data := map[string]string{
@@ -564,10 +684,10 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 		}
 
 		if err = tplTitle.Execute(wTitle, data); err != nil {
-			logger.Fatal(ctx, "failed to execute template: %v", err)
+			log.Fatal(ctx, "failed to execute template: %v", err)
 		}
 		if err = tplBody.Execute(wBody, data); err != nil {
-			logger.Fatal(ctx, "failed to execute template: %v", err)
+			log.Fatal(ctx, "failed to execute template: %v", err)
 		}
 
 		body := map[string]string{
@@ -576,14 +696,14 @@ func giteaPullRequest(ctx context.Context, cfg *configcli.Config, branch string,
 			"head":  fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version),
 			"title": wTitle.String(),
 		}
-		logger.Info(ctx, "raw body: %#+v", body)
+		log.Info(ctx, "raw body: %#+v", body)
 
 		buf, err = json.Marshal(body)
 		if err != nil {
 			return err
 		}
 
-		logger.Info(ctx, "marshal body: %s", buf)
+		log.Info(ctx, "marshal body: %s", buf)
 
 		req, err := http.NewRequestWithContext(ctx, http.MethodPost, envAPIURL+"/repos/"+envREPOSITORY+"/pulls?token="+envTOKEN, bytes.NewReader(buf))
 		if err != nil {

generate.go

@@ -7,6 +7,6 @@ package main
 
 import (
 	_ "github.com/envoyproxy/protoc-gen-validate"
-	_ "go.unistack.org/micro-proto/v4"
+	_ "go.unistack.org/micro-proto/v3"
-	_ "go.unistack.org/protoc-gen-go-micro/v4"
+	_ "go.unistack.org/protoc-gen-go-micro/v3"
 )

generate.sh

@@ -2,7 +2,7 @@
 
 PROTO_ARGS=" \
 --proto_path=$(go list -f '{{ .Dir }}' -m github.com/envoyproxy/protoc-gen-validate) \
---proto_path=$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v4) \
+--proto_path=$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) \
 --go_out=paths=source_relative:./proto \
 --go-micro_out=paths=source_relative,components=micro|http,standalone=false:./proto \
 --validate_out=paths=source_relative,lang=go:./proto \
@@ -12,4 +12,4 @@ PROTO_ARGS=" \
 find ./proto -type f -name "*.pb.go" -delete
 protoc -I./proto $PROTO_ARGS ./proto/*.proto || find ./proto -type f -name "*.pb.go" -delete
 
-./ui/node_modules/.bin/ng-openapi-gen -i ./proto/apidocs.swagger.yaml -o ./ui/src/app/api --removeStaleFiles true --ignoreUnusedModels false
+#./ui/node_modules/.bin/ng-openapi-gen -i ./proto/apidocs.swagger.yaml -o ./ui/src/app/api --removeStaleFiles true --ignoreUnusedModels false

go.mod

@@ -1,77 +1,87 @@
-module git.unistack.org/unistack-org/pkgdash
+module go.unistack.org/pkgdash
 
-go 1.20
+go 1.22.7
+
+toolchain go1.23.3
 
 require (
-	github.com/envoyproxy/protoc-gen-validate v1.0.4
+	github.com/envoyproxy/protoc-gen-validate v1.1.0
-	github.com/go-git/go-git/v5 v5.12.0
+	github.com/go-git/go-git/v5 v5.12.1-0.20241206065855-b2aea86f9eef
 	github.com/golang-migrate/migrate/v4 v4.17.0
 	github.com/google/uuid v1.6.0
-	github.com/jackc/pgx/v4 v4.18.3
+	github.com/jackc/pgx/v5 v5.3.1
 	github.com/jdx/go-netrc v1.0.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
-	go.unistack.org/micro-client-http/v4 v4.0.3
+	go.unistack.org/micro-client-http/v3 v3.9.14
-	go.unistack.org/micro-codec-json/v4 v4.0.0
+	go.unistack.org/micro-codec-json/v3 v3.10.1
-	go.unistack.org/micro-codec-jsonpb/v4 v4.0.1
+	go.unistack.org/micro-codec-jsonpb/v3 v3.10.3
-	go.unistack.org/micro-codec-yaml/v4 v4.0.0
+	go.unistack.org/micro-codec-yaml/v3 v3.10.2
-	go.unistack.org/micro-config-env/v4 v4.0.3
+	go.unistack.org/micro-config-env/v3 v3.8.7
-	go.unistack.org/micro-config-flag/v4 v4.0.4
+	go.unistack.org/micro-config-file/v3 v3.8.10
-	go.unistack.org/micro-config-vault/v4 v4.0.4
+	go.unistack.org/micro-config-flag/v3 v3.8.11
-	go.unistack.org/micro-meter-victoriametrics/v4 v4.0.1
+	go.unistack.org/micro-config-vault/v3 v3.8.9
-	go.unistack.org/micro-proto/v4 v4.1.0
+	go.unistack.org/micro-meter-victoriametrics/v3 v3.8.9
-	go.unistack.org/micro-server-http/v4 v4.0.14
+	go.unistack.org/micro-proto/v3 v3.4.1
-	go.unistack.org/micro/v4 v4.0.19
+	go.unistack.org/micro-server-http/v3 v3.11.37
-	go.unistack.org/protoc-gen-go-micro/v4 v4.0.13
+	go.unistack.org/micro/v3 v3.11.12
-	golang.org/x/mod v0.16.0
+	go.unistack.org/protoc-gen-go-micro/v3 v3.10.10
-	golang.org/x/sync v0.6.0
+	golang.org/x/mod v0.22.0
-	golang.org/x/tools v0.19.0
+	golang.org/x/sync v0.10.0
-	google.golang.org/protobuf v1.33.0
+	golang.org/x/tools v0.28.0
+	google.golang.org/protobuf v1.35.2
 	modernc.org/sqlite v1.29.5
 )
 
 require (
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/KimMachineGun/automemlimit v0.6.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cilium/ebpf v0.9.1 // indirect
+	github.com/containerd/cgroups/v3 v3.0.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.5 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
+	github.com/godbus/dbus/v5 v5.0.4 // indirect
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/jackc/pgx/v4 v4.18.3 // indirect
+	github.com/opencontainers/runtime-spec v1.0.2 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
 	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
+	go.unistack.org/metrics v0.0.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
+	google.golang.org/grpc v1.68.0 // indirect
 	modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
 )
 
 require (
-	dario.cat/mergo v1.0.0 // indirect
+	dario.cat/mergo v1.0.1 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
-	github.com/VictoriaMetrics/metrics v1.33.1 // indirect
+	github.com/cloudflare/circl v1.5.0 // indirect
-	github.com/acomagu/bufpipe v1.0.4 // indirect
-	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.6.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.3 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic v0.7.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
-	github.com/hashicorp/go-sockaddr v1.0.6 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/vault/api v1.12.2 // indirect
+	github.com/hashicorp/vault/api v1.15.0 // indirect
 	github.com/iancoleman/strcase v0.3.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.14.3 // indirect
 	github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
@@ -81,41 +91,33 @@ require (
 	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
 	github.com/jackc/pgtype v1.14.3 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/lyft/protoc-gen-star/v2 v2.0.3 // indirect
+	github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/spf13/afero v1.10.0 // indirect
 	github.com/valyala/fastrand v1.1.0 // indirect
 	github.com/valyala/histogram v1.2.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	go.unistack.org/micro-config-file/v4 v4.0.3
+	golang.org/x/crypto v0.30.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.32.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	lukechampine.com/uint128 v1.3.0 // indirect
-	modernc.org/cc/v3 v3.41.0 // indirect
-	modernc.org/ccgo/v3 v3.17.0 // indirect
 	modernc.org/libc v1.49.0 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.7.2 // indirect
-	modernc.org/opt v0.1.3 // indirect
 	modernc.org/strutil v1.2.0 // indirect
 	modernc.org/token v1.1.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
 )

internal/analyzer/coverage/coverage.go

@@ -3,10 +3,11 @@ package coverage
 import (
 	"context"
 	"fmt"
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	"golang.org/x/tools/cover"
 	"io"
 	"strings"
+
+	"go.unistack.org/pkgdash/internal/models"
+	"golang.org/x/tools/cover"
 )
 
 func Analyze(ctx context.Context, dataCoverage io.Reader, pack models.Package) (float64, error) {

internal/analyzer/coverage/coverage_test.go

@@ -2,10 +2,11 @@ package coverage
 
 import (
 	"context"
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.unistack.org/pkgdash/internal/models"
 )
 
 func Test_Calculate(t *testing.T) {
@@ -28,7 +29,7 @@ func Test_Analyze(t *testing.T) {
 	}()
 
 	analyze, err := Analyze(context.Background(), file, models.Package{
-		Name: "go.unistack.org/micro/v4",
+		Name: "go.unistack.org/micro/v3",
 		URL:  "https://git.unistack.org/unistack-org/micro.git",
 	})
 	assert.Nil(t, err)

internal/config/config.go

@@ -3,7 +3,7 @@ package config
 import (
 	"time"
 
-	mtime "go.unistack.org/micro/v4/util/time"
+	mtime "go.unistack.org/micro/v3/util/time"
 )
 
 type AppConfig struct {

internal/database/database.go

@@ -8,16 +8,16 @@ import (
 	"strings"
 	"time"
 
-	appconfig "git.unistack.org/unistack-org/pkgdash/internal/config"
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	mpgx "github.com/golang-migrate/migrate/v4/database/pgx"
 	msqlite "github.com/golang-migrate/migrate/v4/database/sqlite"
 	"github.com/golang-migrate/migrate/v4/source/iofs"
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5"
-	"github.com/jackc/pgx/v4/stdlib"
+	"github.com/jackc/pgx/v5/stdlib"
 	"github.com/jmoiron/sqlx"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
+	appconfig "go.unistack.org/pkgdash/internal/config"
 	_ "modernc.org/sqlite"
 )
 
@@ -128,18 +128,18 @@ func Connect(ctx context.Context, cfg *appconfig.DatabaseConfig, log logger.Logg
 	case "":
 		break
 	case "up":
-		logger.Info(ctx, "migrate up")
+		log.Info(ctx, "migrate up")
 		err = m.Up()
 	case "down":
-		logger.Info(ctx, "migrate down")
+		log.Info(ctx, "migrate down")
 		err = m.Down()
 	case "seed":
-		logger.Info(ctx, "migrate seed")
+		log.Info(ctx, "migrate seed")
 		if err = m.Drop(); err == nil {
 			err = m.Up()
 		}
 	default:
-		logger.Info(ctx, "migrate version")
+		log.Info(ctx, "migrate version")
 		v, verr := strconv.ParseUint(cfg.Type, 10, 64)
 		if verr != nil {
 			return nil, err

internal/handler/comment_create.go

@@ -6,18 +6,17 @@ import (
 	"errors"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) CommentCreate(ctx context.Context, req *pb.CommentCreateReq, rsp *pb.CommentCreateRsp) error {
-	logger.Debug(ctx, "Start AddComment")
+	h.logger.Debug(ctx, "Start AddComment")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validation error", err)
+		h.logger.Error(ctx, "validation error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
@@ -28,13 +27,13 @@ func (h *Handler) CommentCreate(ctx context.Context, req *pb.CommentCreateReq, r
 			httpsrv.SetRspCode(ctx, http.StatusNotFound)
 			return httpsrv.SetError(NewNotFoundError(err))
 		}
-		logger.Error(ctx, "comment create error", err)
+		h.logger.Error(ctx, "comment create error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
 	rsp.Comment = models.NewComment(com)
 
-	logger.Debug(ctx, "Success finish addComment")
+	h.logger.Debug(ctx, "Success finish addComment")
 	return nil
 }

internal/handler/comment_delete.go

@@ -6,17 +6,16 @@ import (
 	"errors"
 	"net/http"
 
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) CommentDelete(ctx context.Context, req *pb.CommentDeleteReq, rsp *pb.CommentDeleteRsp) error {
-	logger.Debug(ctx, "Start AddComment")
+	h.logger.Debug(ctx, "Start AddComment")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
@@ -27,11 +26,11 @@ func (h *Handler) CommentDelete(ctx context.Context, req *pb.CommentDeleteReq, r
 			httpsrv.SetRspCode(ctx, http.StatusNotFound)
 			return httpsrv.SetError(NewNotFoundError(err))
 		}
-		logger.Error(ctx, "comment delete error", err)
+		h.logger.Error(ctx, "comment delete error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
-	logger.Debug(ctx, "Success finish addComment")
+	h.logger.Debug(ctx, "Success finish addComment")
 	return nil
 }

internal/handler/comment_list.go

@@ -4,25 +4,24 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) CommentList(ctx context.Context, req *pb.CommentListReq, rsp *pb.CommentListRsp) error {
-	logger.Debug(ctx, "Start GetModule")
+	h.logger.Debug(ctx, "Start GetModule")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	comments, err := h.store.CommentList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "comment list error", err)
+		h.logger.Error(ctx, "comment list error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -31,6 +30,6 @@ func (h *Handler) CommentList(ctx context.Context, req *pb.CommentListReq, rsp *
 		rsp.Comments = append(rsp.Comments, models.NewComment(com))
 	}
 
-	logger.Debug(ctx, "Success finish getModule")
+	h.logger.Debug(ctx, "Success finish getModule")
 	return nil
 }

internal/handler/comment_lookup.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"context"
 
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func (h *Handler) CommentLookup(ctx context.Context, req *pb.CommentLookupReq, rsp *pb.CommentLookupRsp) error {

internal/handler/handler.go

@@ -4,14 +4,16 @@ import (
 	"net/http"
 	"strconv"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/storage"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
 	"github.com/google/uuid"
-	jsonpbcodec "go.unistack.org/micro-codec-jsonpb/v4"
+	jsonpbcodec "go.unistack.org/micro-codec-jsonpb/v3"
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/storage"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 type Handler struct {
+	logger logger.Logger
 	store  storage.Storage
 	codec  codec.Codec
 }
@@ -43,8 +45,9 @@ func NewValidationError(err error) *pb.ErrorRsp {
 	}
 }
 
-func NewHandler(store storage.Storage) (*Handler, error) {
+func NewHandler(log logger.Logger, store storage.Storage) (*Handler, error) {
 	h := &Handler{
+		logger: log,
 		codec:  jsonpbcodec.NewCodec(),
 		store:  store,
 	}

internal/handler/handler_list.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) HandlerList(ctx context.Context, req *pb.HandlerListReq, rsp *pb.HandlerListRsp) error {
-	logger.Debug(ctx, "HandlerList handler start")
+	h.logger.Debug(ctx, "HandlerList handler start")
 
 	packages, err := h.store.HandlerList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "error db response: %v", err)
+		h.logger.Error(ctx, "error db response: %v", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -23,6 +22,6 @@ func (h *Handler) HandlerList(ctx context.Context, req *pb.HandlerListReq, rsp *
 	for _, hdlr := range packages {
 		rsp.Handlers = append(rsp.Handlers, models.NewHandler(hdlr))
 	}
-	logger.Debug(ctx, "HandlerList handler stop")
+	h.logger.Debug(ctx, "HandlerList handler stop")
 	return nil
 }

internal/handler/modules_list.go

@@ -4,25 +4,24 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) ModuleList(ctx context.Context, req *pb.ModuleListReq, rsp *pb.ModuleListRsp) error {
-	logger.Debug(ctx, "Start GetModule")
+	h.logger.Debug(ctx, "Start GetModule")
 
 	err := req.Validate()
 	if err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	modules, err := h.store.ModuleList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "module list error", err)
+		h.logger.Error(ctx, "module list error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -30,6 +29,6 @@ func (h *Handler) ModuleList(ctx context.Context, req *pb.ModuleListReq, rsp *pb
 	for _, mod := range modules {
 		rsp.Modules = append(rsp.Modules, models.NewModule(mod))
 	}
-	logger.Debug(ctx, "Success finish getModule")
+	h.logger.Debug(ctx, "Success finish getModule")
 	return nil
 }

internal/handler/package_create.go

@@ -4,30 +4,29 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) PackageCreate(ctx context.Context, req *pb.PackageCreateReq, rsp *pb.PackageCreateRsp) error {
-	logger.Debug(ctx, "PackagesCreate handler start")
+	h.logger.Debug(ctx, "PackagesCreate handler start")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	pkg, err := h.store.PackageCreate(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "package create error", err)
+		h.logger.Error(ctx, "package create error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	rsp.Package = models.NewPackage(pkg)
 
-	logger.Debug(ctx, "PackagesCreate handler stop")
+	h.logger.Debug(ctx, "PackagesCreate handler stop")
 	return nil
 }

internal/handler/package_delete.go

@@ -4,26 +4,25 @@ import (
 	"context"
 	"net/http"
 
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) PackageDelete(ctx context.Context, req *pb.PackageDeleteReq, rsp *pb.PackageDeleteRsp) error {
-	logger.Debug(ctx, "Start UpdatePackage")
+	h.logger.Debug(ctx, "Start UpdatePackage")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	if err := h.store.PackageDelete(ctx, req); err != nil {
-		logger.Error(ctx, "package delete error", err)
+		h.logger.Error(ctx, "package delete error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
-	logger.Debug(ctx, "Success finish UpdatePackage")
+	h.logger.Debug(ctx, "Success finish UpdatePackage")
 	return nil
 }

internal/handler/package_list.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) PackageList(ctx context.Context, req *pb.PackageListReq, rsp *pb.PackageListRsp) error {
-	logger.Debug(ctx, "PackagesList handler start")
+	h.logger.Debug(ctx, "PackagesList handler start")
 
 	packages, err := h.store.PackageList(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "error db response: %v", err)
+		h.logger.Error(ctx, "error db response: %v", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -23,6 +22,6 @@ func (h *Handler) PackageList(ctx context.Context, req *pb.PackageListReq, rsp *
 	for _, pkg := range packages {
 		rsp.Packages = append(rsp.Packages, models.NewPackage(pkg))
 	}
-	logger.Debug(ctx, "PackagesList handler stop")
+	h.logger.Debug(ctx, "PackagesList handler stop")
 	return nil
 }

internal/handler/package_lookup.go

@@ -4,30 +4,29 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) PackageLookup(ctx context.Context, req *pb.PackageLookupReq, rsp *pb.PackageLookupRsp) error {
-	logger.Debug(ctx, "Start PackagesLookup")
+	h.logger.Debug(ctx, "Start PackagesLookup")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	pkg, err := h.store.PackageLookup(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "package lookup", err)
+		h.logger.Error(ctx, "package lookup", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
 	rsp.Package = models.NewPackage(pkg)
 
-	logger.Debug(ctx, "Success finish PackagesLookup")
+	h.logger.Debug(ctx, "Success finish PackagesLookup")
 	return nil
 }

internal/handler/package_modules.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) PackageModules(ctx context.Context, req *pb.PackageModulesReq, rsp *pb.PackageModulesRsp) error {
-	logger.Debug(ctx, "PackageModules handler start")
+	h.logger.Debug(ctx, "PackageModules handler start")
 
 	modules, err := h.store.PackageModules(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "error db response: %v", err)
+		h.logger.Error(ctx, "error db response: %v", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
@@ -23,6 +22,6 @@ func (h *Handler) PackageModules(ctx context.Context, req *pb.PackageModulesReq,
 	for _, mod := range modules {
 		rsp.Modules = append(rsp.Modules, models.NewModule(mod))
 	}
-	logger.Debug(ctx, "PackagesModules handler stop")
+	h.logger.Debug(ctx, "PackagesModules handler stop")
 	return nil
 }

internal/handler/package_update.go

@@ -4,30 +4,29 @@ import (
 	"context"
 	"net/http"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	httpsrv "go.unistack.org/micro-server-http/v3"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	"go.unistack.org/pkgdash/internal/models"
-	httpsrv "go.unistack.org/micro-server-http/v4"
+	pb "go.unistack.org/pkgdash/proto"
-	"go.unistack.org/micro/v4/logger"
 )
 
 func (h *Handler) PackageUpdate(ctx context.Context, req *pb.PackageUpdateReq, rsp *pb.PackageUpdateRsp) error {
-	logger.Debug(ctx, "Start UpdatePackage")
+	h.logger.Debug(ctx, "Start UpdatePackage")
 
 	if err := req.Validate(); err != nil {
-		logger.Error(ctx, "validate error", err)
+		h.logger.Error(ctx, "validate error", err)
 		httpsrv.SetRspCode(ctx, http.StatusBadRequest)
 		return httpsrv.SetError(NewValidationError(err))
 	}
 
 	pkg, err := h.store.PackageUpdate(ctx, req)
 	if err != nil {
-		logger.Error(ctx, "package update error", err)
+		h.logger.Error(ctx, "package update error", err)
 		httpsrv.SetRspCode(ctx, http.StatusInternalServerError)
 		return httpsrv.SetError(NewInternalError(err))
 	}
 
 	rsp.Package = models.NewPackage(pkg)
 
-	logger.Debug(ctx, "Success finish UpdatePackage")
+	h.logger.Debug(ctx, "Success finish UpdatePackage")
 	return nil
 }

internal/models/models.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"time"
 
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	pb "go.unistack.org/pkgdash/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 

internal/source/git/gogit.go

@@ -0,0 +1,48 @@
+//go:build gogit
+
+package git
+
+/*
+import "context"
+
+type Repository interface {
+	Checkout(ctx context.Context, hash string) error
+}
+
+type repository struct {
+	path string
+}
+
+func NewRepositoryFromURL(ctx context.Context, url string) (Repository, error) {
+	return nil, nil
+}
+
+
+Branches() {
+	refIter, err := repo.Branches() // получение веток
+	if err != nil {
+		g.logger.Error(ctx, "failed to get branches", err)
+		return err
+	}
+
+	for {
+		ref, err := refIter.Next()
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			g.logger.Error(ctx, "ref iter error", err)
+			return err
+		}
+		g.logger.Info(ctx, fmt.Sprintf("check %s == %s", ref.Name().Short(), branch))
+		if ref.Name().Short() == branch {
+			headRef = plumbing.NewHashReference(ref.Name(), ref.Hash())
+			g.logger.Info(ctx, "headRef set to "+headRef.String())
+			break
+		}
+	} // перебираем получение ветки и когда находим нужную выходим из цикла записав ветку в headRef
+
+	refIter.Close()
+}
+
+*/

internal/source/git/nogogit.go

@@ -0,0 +1,262 @@
+//go:build !gogit
+
+package git
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"os/exec"
+	"strings"
+
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
+)
+
+type Repository interface {
+	Branches() ([]*plumbing.Reference, error)
+	//	Auth(username string, password string) error
+	FetchContext(ctx context.Context, opts *git.FetchOptions) error
+	PushContext(ctx context.Context, opts *git.PushOptions) error
+	Head() (*plumbing.Reference, error)
+	Worktree() (Worktree, error)
+}
+
+type Worktree interface {
+	Checkout(*git.CheckoutOptions) error
+	PullContext(ctx context.Context, opts *git.PullOptions) error
+	Status() (git.Status, error)
+	AddWithOptions(opts *git.AddOptions) error
+	Commit(msg string, opts *git.CommitOptions) (plumbing.Hash, error)
+	Reset(opts *git.ResetOptions) error
+}
+
+type repository struct {
+	gocmd string
+	path  string
+	// authUsername string
+	// authPassword string
+}
+
+func PlainOpenWithOptions(path string, opts *git.PlainOpenOptions) (Repository, error) {
+	gopath, err := exec.LookPath("git")
+	if err != nil {
+		return nil, err
+	}
+	return &repository{path: path, gocmd: gopath}, nil
+}
+
+/*
+func (r *repository) Auth(username string, password string) error {
+	r.authUsername = username
+	r.authPassword = password
+	return nil
+}
+*/
+
+func (r *repository) Branches() ([]*plumbing.Reference, error) {
+	var branches []*plumbing.Reference
+	cmd := exec.Command(r.gocmd, "show-ref", "--branches")
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("output %s error %w", buf, err)
+	}
+	br := bytes.NewBuffer(buf)
+	for {
+		line, err := br.ReadString('\n')
+		if err != nil {
+			if err == io.EOF && line == "" {
+				break
+			} else if err != io.EOF && line == "" {
+				return nil, err
+			}
+		}
+		fields := strings.Fields(line)
+		if len(fields) != 2 {
+			return nil, fmt.Errorf("invalid fields %s", line)
+		}
+		branches = append(branches, plumbing.NewReferenceFromStrings(fields[1], fields[0]))
+	}
+	return branches, nil
+}
+
+func (r *repository) FetchContext(ctx context.Context, opts *git.FetchOptions) error {
+	args := []string{"fetch"}
+	if opts.Force {
+		args = append(args, "-f")
+	}
+	cmd := exec.CommandContext(ctx, r.gocmd, args...)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("output %s error %w", buf, err)
+	}
+
+	return nil
+}
+
+func (r *repository) PushContext(ctx context.Context, opts *git.PushOptions) error {
+	args := []string{"push"}
+
+	if opts.Force {
+		args = append(args, "-f")
+	}
+
+	/* TODO
+	var refs []string
+	for _, ref := range opts.RefSpecs {
+		refs = append(refs, ref.String())
+	}
+
+	args = append(args, strings.Join(refs, " "))
+	*/
+	cmd := exec.CommandContext(ctx, r.gocmd, args...)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("output %s error %w", buf, err)
+	}
+
+	return nil
+}
+
+func (r *repository) Head() (*plumbing.Reference, error) {
+	var head *plumbing.Reference
+	cmd := exec.Command(r.gocmd, "symbolic-ref", "--short", "HEAD")
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("output %s error %w", buf, err)
+	}
+	br := bytes.NewBuffer(buf)
+	for {
+		line, err := br.ReadString('\n')
+		if err != nil {
+			if err == io.EOF && line == "" {
+				break
+			} else if err != io.EOF && line == "" {
+				return nil, err
+			}
+		}
+		fields := strings.Fields(line)
+		if len(fields) != 2 {
+			return nil, fmt.Errorf("invalid fields %s", line)
+		}
+		head = plumbing.NewReferenceFromStrings("HEAD", fields[0])
+	}
+	return head, nil
+}
+
+type worktree struct {
+	gocmd string
+}
+
+func (r *repository) Worktree() (Worktree, error) {
+	return &worktree{gocmd: r.gocmd}, nil
+}
+
+func (w *worktree) Checkout(opts *git.CheckoutOptions) error {
+	args := []string{"checkout"}
+	if opts.Create {
+		args = append(args, "-b", opts.Branch.Short())
+	}
+	if opts.Force {
+		args = append(args, "-f")
+	}
+	if opts.Hash.IsZero() {
+		args = append(args, opts.Branch.Short())
+	} else {
+		args = append(args, opts.Hash.String())
+	}
+	cmd := exec.Command(w.gocmd, args...)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("output %s error %w", buf, err)
+	}
+
+	return nil
+}
+
+func (w *worktree) Status() (git.Status, error) {
+	return git.Status{}, nil
+}
+
+func (w *worktree) Reset(opts *git.ResetOptions) error {
+	args := []string{"reset"}
+	if opts.Mode == git.HardReset {
+		args = append(args, "--hard")
+	}
+
+	args = append(args, opts.Commit.String())
+
+	cmd := exec.Command(w.gocmd, args...)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return err
+	}
+	_ = buf
+	return nil
+}
+
+func (w *worktree) Commit(msg string, opts *git.CommitOptions) (plumbing.Hash, error) {
+	cmd := exec.Command(w.gocmd, `commit`,
+		fmt.Sprintf(`--author="%s <%s>"`, opts.Author.Name, opts.Author.Email),
+		"-m", msg,
+		fmt.Sprintf(`--date="%s"`, opts.Author.When.Format(`Mon Jan _2 15:04:05 2006 -0700`)),
+	)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return plumbing.ZeroHash, fmt.Errorf("output %s error %w", buf, err)
+	}
+
+	var head *plumbing.Reference
+	cmd = exec.Command(w.gocmd, "show-ref", "HEAD")
+	buf, err = cmd.CombinedOutput()
+	if err != nil {
+		return plumbing.ZeroHash, err
+	}
+	br := bytes.NewBuffer(buf)
+	for {
+		line, err := br.ReadString('\n')
+		if err != nil {
+			if err == io.EOF && line == "" {
+				break
+			} else if err != io.EOF && line == "" {
+				return plumbing.ZeroHash, err
+			}
+		}
+		fields := strings.Fields(line)
+		if len(fields) != 2 {
+			return plumbing.ZeroHash, fmt.Errorf("invalid fields %s", line)
+		}
+		head = plumbing.NewReferenceFromStrings("HEAD", fields[0])
+	}
+
+	return head.Hash(), nil
+}
+
+func (w *worktree) PullContext(ctx context.Context, opts *git.PullOptions) error {
+	args := []string{"pull"}
+	if opts.Force {
+		args = append(args, "-f")
+	}
+	if opts.Depth != 0 {
+		args = append(args, fmt.Sprintf("--depth=%d", opts.Depth))
+	}
+
+	cmd := exec.CommandContext(ctx, w.gocmd, args...)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("output %s error %w", buf, err)
+	}
+
+	return nil
+}
+
+func (w *worktree) AddWithOptions(opts *git.AddOptions) error {
+	cmd := exec.Command(w.gocmd, "add", opts.Path)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("output %s error %w", buf, err)
+	}
+
+	return nil
+}

internal/source/gitea/gitea.go

@@ -14,19 +14,21 @@ import (
 	"text/template"
 	"time"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/configcli"
-	"git.unistack.org/unistack-org/pkgdash/internal/modules"
 	"github.com/go-git/go-git/v5"
 	gitconfig "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	httpauth "github.com/go-git/go-git/v5/plumbing/transport/http"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/configcli"
+	"go.unistack.org/pkgdash/internal/modules"
+	gogit "go.unistack.org/pkgdash/internal/source/git"
 )
 
 var ErrPRNotExist = errors.New("pull request does not exist")
 
 type Gitea struct {
+	logger     logger.Logger
 	URL        string
 	Username   string
 	Password   string
@@ -37,8 +39,9 @@ type Gitea struct {
 	pulls      []*giteaPull
 }
 
-func NewGitea(cfg configcli.Config) *Gitea {
+func NewGitea(cfg configcli.Config, log logger.Logger) *Gitea {
 	return &Gitea{
+		logger:     log,
 		URL:        cfg.Source.APIURL,
 		Username:   cfg.Source.Username,
 		Password:   cfg.Source.Password,
@@ -66,21 +69,21 @@ func (g *Gitea) Name() string {
 }
 
 func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod modules.Update) error {
-	logger.Debug(ctx, fmt.Sprintf("RequestOpen start, mod title: %s", path))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestOpen start, mod title: %s", path))
 
 	var buf []byte
 	var err error
 	// создания шаблона названия для пулл реквеста
 	tplTitle, err := template.New("pull_request_title").Parse(g.PRTitle)
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
 	}
 
 	wTitle := bytes.NewBuffer(nil)
 	// создания шаблона тела для пулл реквеста
 	tplBody, err := template.New("pull_request_body").Parse(g.PRTitle)
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
 	}
 
 	wBody := bytes.NewBuffer(nil)
@@ -92,103 +95,120 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 	}
 
 	if err = tplTitle.Execute(wTitle, data); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
+		g.logger.Error(ctx, "failed to execute template", err)
+		return err
 	}
 	if err = tplBody.Execute(wBody, data); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
+		g.logger.Error(ctx, "failed to execute template", err)
+		return err
 	}
 
 	// открытие гит репозитория с опцией обхода репозитория для нахождения .git
-	repo, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
+	repo, err := gogit.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
 	}
 	// извлекаем ссылки с объектами из удаленного объекта??
 	if err = repo.FetchContext(ctx, &git.FetchOptions{
-		//	Auth:  &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
+		Auth:  &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
 		Force: true,
 	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		logger.Fatal(ctx, fmt.Sprintf("failed to fetch repo : %v", err))
+		g.logger.Error(ctx, "failed to fetch repo", err)
+		return err
 	} // обновляем репозиторий
 
-	var headRef *plumbing.Reference // вроде ссылка на гит
+	var headRef *plumbing.Reference
-	refIter, err := repo.Branches() //получение веток
+
+	branches, err := repo.Branches()
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to get branches: %v", err))
+		g.logger.Error(ctx, "cant get repo branches", err)
 		return err
 	}
-	for {
+
-		ref, err := refIter.Next()
+	for _, ref := range branches {
-		if err != nil {
+		if ref.Name().Short() == branch {
+
+			headRef = plumbing.NewHashReference(ref.Name(), ref.Hash())
+			g.logger.Info(ctx, "headRef set to "+headRef.String())
 			break
 		}
-		if ref.Name().Short() == branch { //todo вот тут возможно нужно переделать
-			headRef = ref
-			break
 	}
-	} //перебираем получение ветки и когда находим нужную выходим из цикла записав ветку в headRef
-	refIter.Close()
 
 	if headRef == nil {
-		logger.Fatal(ctx, "failed to get repo branch head")
+		g.logger.Error(ctx, "failed to get repo branch head")
 		return err
 	} // Не получили нужную ветку
 
-	logger.Info(ctx, fmt.Sprintf("repo head %s", headRef))
+	g.logger.Info(ctx, "repo head "+headRef.String())
 
 	wtree, err := repo.Worktree() // todo вроде рабочее дерево не нужно
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to get worktree: %v", err))
+		g.logger.Error(ctx, "failed to get worktree", err)
+		return err
 	}
-	defer checkout(wtree, *headRef)
 
-	g.pulls, err = GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
 	if err != nil && err != ErrPRNotExist {
-		logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		g.logger.Error(ctx, "GetPulls error", err)
 		return err
 	}
 
 	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) && strings.Contains(pull.Base.Ref, branch) {
-			logger.Info(ctx, fmt.Sprintf("PR for %s exists %s, call RequestUpdate", path, pull.URL))
+			g.logger.Info(ctx, fmt.Sprintf("PR for %s exists %s, call RequestUpdate", path, pull.URL))
 			return g.RequestUpdate(ctx, branch, path, mod)
 		} // хотим проверить есть ли пулл реквест для этой ветки, если есть то выходим
 	}
 
-	logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
+	g.logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
 
-	logger.Info(ctx, "reset worktree")
+	wstatus, err := wtree.Status()
+	if err != nil {
+		g.logger.Error(ctx, "failed to get worktree status", err)
+		return err
+	}
+
+	g.logger.Info(ctx, "worktree status "+wstatus.String())
+	/*
+		g.logger.Info(ctx, "try to reset worktree to "+headRef.Hash().String())
 		if err = wtree.Reset(&git.ResetOptions{Commit: headRef.Hash(), Mode: git.HardReset}); err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to reset repo branch: %v", err))
+			g.logger.Error(ctx, "failed to reset repo branch to "+headRef.Hash().String(), err)
+			return err
 		} // вроде меняем ветку todo вроде можно удалить
-
+	*/
 	if err = wtree.PullContext(ctx, &git.PullOptions{
 		Auth: &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
-		Depth: 1,
+		// Depth: 1,
 		//	RemoteURL :
 		Force:      true,
 		RemoteName: "origin",
 	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) //подтягиваем изменения с удаленого репозитория
+		g.logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) // подтягиваем изменения с удаленого репозитория
+		return err
 	}
 
-	logger.Info(ctx, fmt.Sprintf("checkout ref %s", headRef))
+	g.logger.Info(ctx, fmt.Sprintf("checkout ref %s", headRef))
+
 	if err = wtree.Checkout(&git.CheckoutOptions{
 		Hash:   headRef.Hash(),
 		Branch: plumbing.NewBranchReferenceName(fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version)),
 		Create: true,
 		Force:  true,
-	}); err != nil {
+	}); err != nil && err != git.ErrBranchExists {
-		logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
 		return err
 	} // создаем новую ветку
 
+	defer func() {
+		_ = g.checkout(wtree, headRef)
+	}()
+
 	epath, err := exec.LookPath("go")
 	if errors.Is(err, exec.ErrDot) {
 		err = nil
 	}
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
 	} // ищем go файл
 
 	var cmd *exec.Cmd
@@ -196,30 +216,35 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-droprequire=%s", mod.Module.Path))
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		return err
 	}
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-require=%s@%s", path, mod.Version))
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		return err
 	} // пытаемся выполнить команду go mod edit с новой версией модуля
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "tidy")
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
+		return err
 	} // пытаемся выполнить команду go mod tidy пытаемся подтянуть новую версию модуля
 
-	logger.Info(ctx, "worktree add go.mod")
+	g.logger.Info(ctx, "worktree add go.mod")
-	if _, err = wtree.Add("go.mod"); err != nil {
+	if err = wtree.AddWithOptions(&git.AddOptions{Path: "go.mod"}); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to add file: %v", err))
+		return err
 	}
 
-	logger.Info(ctx, "worktree add go.sum")
+	g.logger.Info(ctx, "worktree add go.sum")
-	if _, err = wtree.Add("go.sum"); err != nil {
+	if err = wtree.AddWithOptions(&git.AddOptions{Path: "go.sum"}); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to add file: %v", err))
+		return err
 	}
 
-	logger.Info(ctx, "worktree commit")
+	g.logger.Info(ctx, "worktree commit")
 	_, err = wtree.Commit(wTitle.String(), &git.CommitOptions{
 		Parents: []plumbing.Hash{headRef.Hash()},
 		Author: &object.Signature{
@@ -229,19 +254,21 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 		},
 	}) // хотим за коммитить изменения
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to commit: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to commit: %v", err))
+		return err
 	}
 
 	refspec := gitconfig.RefSpec(fmt.Sprintf("+refs/heads/pkgdash/go_modules/%s-%s:refs/heads/pkgdash/go_modules/%s-%s", path, mod.Version, path, mod.Version)) // todo как будто нужно переделать
 
-	logger.Info(ctx, fmt.Sprintf("try to push refspec %s", refspec))
+	g.logger.Info(ctx, fmt.Sprintf("try to push refspec %s", refspec))
 
 	if err = repo.PushContext(ctx, &git.PushOptions{
 		RefSpecs: []gitconfig.RefSpec{refspec},
 		Auth:     &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
 		Force:    true,
 	}); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to push repo branch: %v", err))
+		g.logger.Error(ctx, "failed to push repo branch", err)
+		return err
 	} // пытаемся за пушить изменения
 
 	body := map[string]string{
@@ -250,15 +277,15 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 		"head":  fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version),
 		"title": wTitle.String(),
 	}
-	logger.Info(ctx, fmt.Sprintf("raw body: %#+v", body))
+	g.logger.Info(ctx, fmt.Sprintf("raw body: %#+v", body))
 
 	buf, err = json.Marshal(body)
 	if err != nil {
+		g.logger.Error(ctx, "failed to marshal", err)
 		return err
 	}
 
-	logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
+	g.logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
-
 	req, err := http.NewRequestWithContext(
 		ctx,
 		http.MethodPost,
@@ -266,14 +293,16 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 		bytes.NewReader(buf),
 	)
 	if err != nil {
+		g.logger.Error(ctx, "http request error", err)
 		return err
 	}
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("Authorization", g.Password)
+	req.Header.Add("Authorization", "Bearer "+g.Password)
 
 	rsp, err := http.DefaultClient.Do(req)
 	if err != nil {
+		g.logger.Error(ctx, "failed to call http request", err)
 		return err
 	} // Вроде создаем новый реквест на создание пулл реквеста
 	if rsp.StatusCode != http.StatusCreated {
@@ -281,92 +310,86 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 		return fmt.Errorf("unknown error: %s", buf)
 	}
 
-	logger.Info(ctx, fmt.Sprintf("PR create for %s-%s", path, mod.Version))
+	g.logger.Info(ctx, fmt.Sprintf("PR create for %s-%s", path, mod.Version))
-
-	repo, err = git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
-	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
-	}
 
 	return nil
 }
 
 func (g *Gitea) RequestClose(ctx context.Context, branch string, path string) error {
-	logger.Debug(ctx, fmt.Sprintf("RequestClose start, mod title: %s", path))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestClose start, mod title: %s", path))
+	var err error
 
-	pulls, err := GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
 	if err != nil {
-		logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
 		return err
 	}
 
 	prExist := false
 	var b string // Name of the branch to be deleted
-	for _, pull := range pulls {
+	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) && pull.Base.Ref == branch {
-			logger.Info(ctx, fmt.Sprintf("PR for %s exists: %s", path, pull.URL))
+			g.logger.Info(ctx, fmt.Sprintf("PR for %s exists: %s", path, pull.URL))
 			prExist = true
 			b = pull.Head.Ref
 		}
 	}
 	if !prExist {
-		logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
+		g.logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
 		return ErrPRNotExist
 	}
 
-	req, err := DeleteBranch(ctx, g.URL, g.Owner, g.Repository, b, g.Password)
+	req, err := g.DeleteBranch(ctx, g.URL, g.Owner, g.Repository, b, g.Password)
 	if err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to create request for delete the branch: %s, err: %s", branch, err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to create request for delete the branch: %s, err: %s", branch, err))
 		return err
 	}
 	rsp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to do request for delete the branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
+		g.logger.Error(ctx, fmt.Sprintf("failed to do request for delete the branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
 		return err
 	}
 
-	logger.Info(ctx, fmt.Sprintf("Delete branch for %s successful", path))
+	g.logger.Info(ctx, fmt.Sprintf("Delete branch for %s successful", path))
 	return nil
 }
 
 func (g *Gitea) RequestUpdate(ctx context.Context, branch string, path string, mod modules.Update) error {
-	logger.Debug(ctx, fmt.Sprintf("RequestUpdate start, mod title: %s", path))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestUpdate start, mod title: %s", path))
 	var err error
 
-	if len(g.pulls) == 0 {
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
-		g.pulls, err = GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
 	if err != nil {
-			logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
 		return err
 	}
-	}
 
 	prExist := false
 	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) && pull.Base.Ref == branch {
-			logger.Info(ctx, fmt.Sprintf("don't skip %s since pr exist %s", path, pull.URL)) //todo
+			g.logger.Info(ctx, fmt.Sprintf("don't skip %s since pr exist %s", path, pull.URL)) // todo
 			tVersion := getVersions(pull.Head.Ref)                                             // Надо взять просто из названия ветки последнюю версию
 			if modules.IsNewerVersion(tVersion, mod.Version, false) {
-				reqDel, err := DeleteBranch(ctx, g.URL, g.Owner, g.Repository, pull.Head.Ref, g.Password)
+				reqDel, err := g.DeleteBranch(ctx, g.URL, g.Owner, g.Repository, pull.Head.Ref, g.Password)
 				if err != nil {
-					logger.Error(ctx, fmt.Sprintf("Error with create request for branch: %s, err: %s", branch, err))
+					g.logger.Error(ctx, fmt.Sprintf("Error with create request for branch: %s, err: %s", branch, err))
 					return err
 				}
 				rsp, err := http.DefaultClient.Do(reqDel)
 				if err != nil {
-					logger.Error(ctx, fmt.Sprintf("Error with do request for branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
+					g.logger.Error(ctx, fmt.Sprintf("Error with do request for branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
 					return err
 				}
-				logger.Info(ctx, fmt.Sprintf("Old pr %s successful delete", pull.Head.Ref))
+				g.logger.Info(ctx, fmt.Sprintf("Old pr %s successful delete", pull.Head.Ref))
 			} else {
-				logger.Debug(ctx, "The existing PR is relevant")
+				g.logger.Debug(ctx, "The existing PR is relevant")
 				return nil
 			}
 			prExist = true
 		}
 	}
 	if !prExist {
-		logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
+		g.logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
 		return ErrPRNotExist
 	}
 
@@ -374,11 +397,12 @@ func (g *Gitea) RequestUpdate(ctx context.Context, branch string, path string, m
 }
 
 func (g *Gitea) RequestList(ctx context.Context, branch string) (map[string]string, error) {
-	logger.Debug(ctx, fmt.Sprintf("RequestList for %s", branch))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestList for %s", branch))
 	var err error
 
-	g.pulls, err = GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
 	if err != nil {
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
 		return nil, err
 	}
 
@@ -403,7 +427,7 @@ func getVersions(s string) string {
 	return version
 }
 
-func DeleteBranch(ctx context.Context, url, owner, repo, branch, password string) (*http.Request, error) {
+func (g *Gitea) DeleteBranch(ctx context.Context, url, owner, repo, branch, password string) (*http.Request, error) {
 	var buf []byte
 	req, err := http.NewRequestWithContext(ctx, http.MethodDelete, fmt.Sprintf("https://%s/api/v1/repos/%s/%s/branches/%s", url, owner, repo, branch), bytes.NewReader(buf))
 	if err != nil {
@@ -411,11 +435,11 @@ func DeleteBranch(ctx context.Context, url, owner, repo, branch, password string
 	}
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("Authorization", password)
+	req.Header.Add("Authorization", "Bearer "+password)
 	return req, err
 }
 
-func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*giteaPull, error) {
+func (g *Gitea) GetPulls(ctx context.Context, url, owner, repo, password string) ([]*giteaPull, error) {
 	var pullsAll []*giteaPull
 	page := 1
 
@@ -432,7 +456,7 @@ func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*giteaP
 
 		req.Header.Add("Accept", "application/json")
 		req.Header.Add("Content-Type", "application/json")
-		req.Header.Add("Authorization", password)
+		req.Header.Add("Authorization", "Bearer "+password)
 
 		rsp, err := http.DefaultClient.Do(req) // выполнение запроса
 		if err != nil {
@@ -444,13 +468,13 @@ func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*giteaP
 		switch rsp.StatusCode {
 		case http.StatusOK:
 			if err = json.Unmarshal(buf, &pulls); err != nil {
-				logger.Error(ctx, fmt.Sprintf("failed to decode response %s err: %v", buf, err))
+				g.logger.Error(ctx, fmt.Sprintf("failed to decode response %s err: %v", buf, err))
 				return nil, err
 			}
 			pullsAll = append(pullsAll, pulls...)
 			page++
 		case http.StatusNotFound:
-			logger.Info(ctx, fmt.Sprintf("pull-request is not exist for %s", repo))
+			g.logger.Info(ctx, fmt.Sprintf("pull-request is not exist for %s", repo))
 			return nil, ErrPRNotExist
 		default:
 			return nil, fmt.Errorf("unknown error: %s", buf)
@@ -464,9 +488,18 @@ func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*giteaP
 	return pullsAll, nil
 }
 
-func checkout(w *git.Worktree, ref plumbing.Reference) {
+func (g *Gitea) checkout(w gogit.Worktree, ref *plumbing.Reference) error {
 	ctx := context.Background()
-	if err := w.Reset(&git.ResetOptions{Commit: ref.Hash(), Mode: git.HardReset}); err != nil {
+	g.logger.Debug(ctx, "checkout: "+ref.Name().Short())
-		logger.Fatal(ctx, fmt.Sprintf("failed to reset: %v", err))
+
+	if err := w.Checkout(&git.CheckoutOptions{
+		Branch: ref.Name(),
+		Create: false,
+		Force:  true,
+		Keep:   false,
+	}); err != nil {
+		g.logger.Error(ctx, "failed to reset", err)
+		return err
 	}
+	return nil
 }

internal/source/github/github.go

@@ -13,19 +13,20 @@ import (
 	"text/template"
 	"time"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/configcli"
-	"git.unistack.org/unistack-org/pkgdash/internal/modules"
 	"github.com/go-git/go-git/v5"
 	gitconfig "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	httpauth "github.com/go-git/go-git/v5/plumbing/transport/http"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/configcli"
+	"go.unistack.org/pkgdash/internal/modules"
 )
 
 var ErrPRNotExist = errors.New("pull request does not exist")
 
 type Github struct {
+	logger     logger.Logger
 	URL        string
 	Username   string
 	Password   string
@@ -34,10 +35,12 @@ type Github struct {
 	Repository string
 	Owner      string
 	pulls      []*githubPull
+	baseRef    *plumbing.Reference
 }
 
-func NewGithub(cfg configcli.Config) *Github {
+func NewGithub(cfg configcli.Config, log logger.Logger) *Github {
 	return &Github{
+		logger:     log,
 		URL:        cfg.Source.APIURL,
 		Username:   cfg.Source.Username,
 		Password:   cfg.Source.Password,
@@ -65,21 +68,21 @@ func (g *Github) Name() string {
 }
 
 func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mod modules.Update) error {
-	logger.Debug(ctx, fmt.Sprintf("RequestOpen start, mod title: %s", path))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestOpen start, mod title: %s", path))
 
 	var buf []byte
 	var err error
 	// создания шаблона названия для пулл реквеста
 	tplTitle, err := template.New("pull_request_title").Parse(g.PRTitle)
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
 	}
 
 	wTitle := bytes.NewBuffer(nil)
 	// создания шаблона тела для пулл реквеста
 	tplBody, err := template.New("pull_request_body").Parse(g.PRTitle)
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
 	}
 
 	wBody := bytes.NewBuffer(nil)
@@ -91,29 +94,37 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 	}
 
 	if err = tplTitle.Execute(wTitle, data); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
 	}
 	if err = tplBody.Execute(wBody, data); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
 	}
 
 	// открытие гит репозитория с опцией обхода репозитория для нахождения .git
 	repo, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
 	}
 	// извлекаем ссылки с объектами из удаленного объекта??
 	if err = repo.FetchContext(ctx, &git.FetchOptions{
 		//	Auth:  &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
 		Force: true,
 	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		logger.Fatal(ctx, fmt.Sprintf("failed to fetch repo : %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to fetch repo : %v", err))
 	} // обновляем репозиторий
 
 	var headRef *plumbing.Reference // вроде ссылка на гит
+
+	if g.baseRef == nil {
+		g.baseRef, err = repo.Head()
+		if err != nil {
+			g.logger.Fatal(ctx, fmt.Sprintf("Error head: %s", err))
+		}
+	}
+
 	refIter, err := repo.Branches() // получение веток
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to get branches: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to get branches: %v", err))
 		return err
 	}
 	for {
@@ -129,35 +140,36 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 	refIter.Close()
 
 	if headRef == nil {
-		logger.Fatal(ctx, "failed to get repo branch head")
+		g.logger.Fatal(ctx, "failed to get repo branch head")
 		return err
 	} // Не получили нужную ветку
 
-	logger.Info(ctx, fmt.Sprintf("repo head %s", headRef))
+	g.logger.Info(ctx, fmt.Sprintf("repo head %s", headRef))
 
 	wtree, err := repo.Worktree() // todo вроде рабочее дерево не нужно
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to get worktree: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to get worktree: %v", err))
 	}
+	defer g.checkout(*wtree, *g.baseRef)
 
-	g.pulls, err = GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
 	if err != nil && err != ErrPRNotExist {
-		logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
 		return err
 	}
 
 	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) && strings.Contains(pull.Base.Ref, branch) {
-			logger.Info(ctx, fmt.Sprintf("PR for %s exists %s, call RequestUpdate", path, pull.URL))
+			g.logger.Info(ctx, fmt.Sprintf("PR for %s exists %s, call RequestUpdate", path, pull.URL))
 			return g.RequestUpdate(ctx, branch, path, mod)
 		} // хотим проверить есть ли пулл реквест для этой ветки, если есть то выходим
 	}
 
-	logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
+	g.logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
 
-	logger.Info(ctx, "reset worktree")
+	g.logger.Info(ctx, "reset worktree")
 	if err = wtree.Reset(&git.ResetOptions{Commit: headRef.Hash(), Mode: git.HardReset}); err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to reset repo branch: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to reset repo branch: %v", err))
 	} // вроде меняем ветку todo вроде можно удалить
 
 	if err = wtree.PullContext(ctx, &git.PullOptions{
@@ -167,17 +179,17 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 		Force:      true,
 		RemoteName: "origin",
 	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) //подтягиваем изменения с удаленого репозитория
+		g.logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) // подтягиваем изменения с удаленого репозитория
 	}
 
-	logger.Info(ctx, fmt.Sprintf("checkout ref %s", headRef))
+	g.logger.Info(ctx, fmt.Sprintf("checkout ref %s", headRef))
 	if err = wtree.Checkout(&git.CheckoutOptions{
 		Hash:   headRef.Hash(),
 		Branch: plumbing.NewBranchReferenceName(fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version)),
 		Create: true,
 		Force:  true,
 	}); err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
 		return err
 	} // создаем новую ветку
 
@@ -186,7 +198,7 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 		err = nil
 	}
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
 	} // ищем go файл
 
 	var cmd *exec.Cmd
@@ -194,30 +206,30 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-droprequire=%s", mod.Module.Path))
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
 	}
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-require=%s@%s", path, mod.Version))
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
 	} // пытаемся выполнить команду go mod edit с новой версией модуля
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "tidy")
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
 	} // пытаемся выполнить команду go mod tidy пытаемся подтянуть новую версию модуля
 
-	logger.Info(ctx, "worktree add go.mod")
+	g.logger.Info(ctx, "worktree add go.mod")
 	if _, err = wtree.Add("go.mod"); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
 	}
 
-	logger.Info(ctx, "worktree add go.sum")
+	g.logger.Info(ctx, "worktree add go.sum")
 	if _, err = wtree.Add("go.sum"); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
 	}
 
-	logger.Info(ctx, "worktree commit")
+	g.logger.Info(ctx, "worktree commit")
 	_, err = wtree.Commit(wTitle.String(), &git.CommitOptions{
 		Parents: []plumbing.Hash{headRef.Hash()},
 		Author: &object.Signature{
@@ -227,19 +239,19 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 		},
 	}) // хотим за коммитить изменения
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to commit: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to commit: %v", err))
 	}
 
 	refspec := gitconfig.RefSpec(fmt.Sprintf("+refs/heads/pkgdash/go_modules/%s-%s:refs/heads/pkgdash/go_modules/%s-%s", path, mod.Version, path, mod.Version)) // todo как будто нужно переделать
 
-	logger.Info(ctx, fmt.Sprintf("try to push refspec %s", refspec))
+	g.logger.Info(ctx, fmt.Sprintf("try to push refspec %s", refspec))
 
 	if err = repo.PushContext(ctx, &git.PushOptions{
 		RefSpecs: []gitconfig.RefSpec{refspec},
 		Auth:     &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
 		Force:    true,
 	}); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to push repo branch: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to push repo branch: %v", err))
 	} // пытаемся за пушить изменения
 
 	body := map[string]string{
@@ -248,14 +260,14 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 		"head":  fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version),
 		"title": wTitle.String(),
 	}
-	logger.Info(ctx, fmt.Sprintf("raw body: %#+v", body))
+	g.logger.Info(ctx, fmt.Sprintf("raw body: %#+v", body))
 
 	buf, err = json.Marshal(body)
 	if err != nil {
 		return err
 	}
 
-	logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
+	g.logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
 
 	req, err := http.NewRequestWithContext(
 		ctx,
@@ -268,7 +280,7 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 	}
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("Authorization", g.Password)
+	req.Header.Add("Authorization", "Bearer "+g.Password)
 
 	rsp, err := http.DefaultClient.Do(req)
 	if err != nil {
@@ -279,26 +291,48 @@ func (g *Github) RequestOpen(ctx context.Context, branch string, path string, mo
 		return fmt.Errorf("unknown error: %s", buf)
 	}
 
-	logger.Info(ctx, fmt.Sprintf("PR create for %s-%s", path, mod.Version))
+	g.logger.Info(ctx, fmt.Sprintf("PR create for %s-%s", path, mod.Version))
 
 	repo, err = git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
 	}
 
 	return nil
 }
+
 func (g *Github) RequestClose(ctx context.Context, branch string, path string) error {
 	return fmt.Errorf("implement me")
 }
+
 func (g *Github) RequestUpdate(ctx context.Context, branch string, path string, mod modules.Update) error {
 	return fmt.Errorf("implement me")
 }
+
 func (g *Github) RequestList(ctx context.Context, branch string) (map[string]string, error) {
-	return nil, fmt.Errorf("implement me")
+	g.logger.Debug(ctx, fmt.Sprintf("RequestList for %s", branch))
+	var err error
+
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
+	if err != nil {
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		return nil, err
 	}
 
-func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*githubPull, error) {
+	var path string
+	rMap := make(map[string]string)
+
+	for _, pull := range g.pulls {
+		if !strings.HasPrefix(pull.Title, "Bump ") || pull.Base.Ref != branch { // добавляем только реквесты бота по обновлению модулей
+			continue
+		}
+		path = strings.Split(pull.Title, " ")[1] // todo Работет только для дефолтного шаблона
+		rMap[path] = pull.Title
+	}
+	return rMap, nil
+}
+
+func (g *Github) GetPulls(ctx context.Context, url, owner, repo, password string) ([]*githubPull, error) {
 	var pullsAll []*githubPull
 	page := 1
 
@@ -315,7 +349,7 @@ func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*github
 
 		req.Header.Add("Accept", "application/json")
 		req.Header.Add("Content-Type", "application/json")
-		req.Header.Add("Authorization", password)
+		req.Header.Add("Authorization", "Bearer "+password)
 
 		rsp, err := http.DefaultClient.Do(req) // выполнение запроса
 		if err != nil {
@@ -327,13 +361,13 @@ func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*github
 		switch rsp.StatusCode {
 		case http.StatusOK:
 			if err = json.Unmarshal(buf, &pulls); err != nil {
-				logger.Error(ctx, fmt.Sprintf("failed to decode response %s err: %v", buf, err))
+				g.logger.Error(ctx, fmt.Sprintf("failed to decode response %s err: %v", buf, err))
 				return nil, err
 			}
 			pullsAll = append(pullsAll, pulls...)
 			page++
 		case http.StatusNotFound:
-			logger.Info(ctx, fmt.Sprintf("pull-request is not exist for %s", repo))
+			g.logger.Info(ctx, fmt.Sprintf("pull-request is not exist for %s", repo))
 			return nil, ErrPRNotExist
 		default:
 			return nil, fmt.Errorf("unknown error: %s", buf)
@@ -346,3 +380,17 @@ func GetPulls(ctx context.Context, url, owner, repo, password string) ([]*github
 
 	return pullsAll, nil
 }
+
+func (g *Github) checkout(w git.Worktree, ref plumbing.Reference) {
+	ctx := context.Background()
+	g.logger.Debug(ctx, fmt.Sprintf("Checkout: %s", ref.Name().Short()))
+
+	if err := w.Checkout(&git.CheckoutOptions{
+		Branch: ref.Name(),
+		Create: false,
+		Force:  true,
+		Keep:   false,
+	}); err != nil {
+		g.logger.Error(ctx, fmt.Sprintf("failed to reset: %v", err))
+	}
+}

internal/source/gitlab/gitlab.go

@@ -10,23 +10,25 @@ import (
 	"net/http"
 	"os/exec"
 	"regexp"
+	"strconv"
 	"strings"
 	"text/template"
 	"time"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/configcli"
-	"git.unistack.org/unistack-org/pkgdash/internal/modules"
 	"github.com/go-git/go-git/v5"
 	gitconfig "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	httpauth "github.com/go-git/go-git/v5/plumbing/transport/http"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/configcli"
+	"go.unistack.org/pkgdash/internal/modules"
 )
 
 var ErrPRNotExist = errors.New("pull request does not exist")
 
 type Gitlab struct {
+	logger       logger.Logger
 	URL          string
 	Username     string
 	Password     string
@@ -36,10 +38,12 @@ type Gitlab struct {
 	RepositoryId string
 	Owner        string
 	pulls        []*gitlabPull
+	baseRef      *plumbing.Reference
 }
 
-func NewGitlab(cfg configcli.Config) *Gitlab {
+func NewGitlab(cfg configcli.Config, log logger.Logger) *Gitlab {
 	return &Gitlab{
+		logger:     log,
 		URL:        cfg.Source.APIURL,
 		Username:   cfg.Source.Username,
 		Password:   cfg.Source.Password,
@@ -58,26 +62,31 @@ type gitlabPull struct {
 	ID     int64  `json:"id"`
 }
 
+type gitlabProject struct {
+	Id   int64  `json:"id"`
+	Name string `json:"name"`
+}
+
 func (g *Gitlab) Name() string {
 	return "gitlab"
 }
 
 func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mod modules.Update) error {
-	logger.Debug(ctx, fmt.Sprintf("RequestOpen start, mod title: %s", path))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestOpen start, mod title: %s", path))
 
 	var buf []byte
 	var err error
 	// создания шаблона названия для пулл реквеста
 	tplTitle, err := template.New("pull_request_title").Parse(g.PRTitle)
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
 	}
 
 	wTitle := bytes.NewBuffer(nil)
 	// создания шаблона тела для пулл реквеста
 	tplBody, err := template.New("pull_request_body").Parse(g.PRTitle)
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
 	}
 
 	wBody := bytes.NewBuffer(nil)
@@ -89,31 +98,37 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 	}
 
 	if err = tplTitle.Execute(wTitle, data); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
 	}
 	if err = tplBody.Execute(wBody, data); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to execute template: %v", err))
 	}
 
 	// открытие гит репозитория с опцией обхода репозитория для нахождения .git
 	repo, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
 	}
 	// извлекаем ссылки с объектами из удаленного объекта??
 	if err = repo.FetchContext(ctx, &git.FetchOptions{
 		//	Auth:  &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
 		Force: true,
 	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		logger.Fatal(ctx, fmt.Sprintf("failed to fetch repo : %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to fetch repo : %v", err))
 	} // обновляем репозиторий
 
 	var headRef *plumbing.Reference // вроде ссылка на гит
 
+	if g.baseRef == nil {
+		g.baseRef, err = repo.Head()
+		if err != nil {
+			g.logger.Fatal(ctx, fmt.Sprintf("Error head: %s", err))
+		}
+	}
+
 	refIter, err := repo.Branches() // получение веток
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to get branches: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to get branches: %v", err))
-		return err
 	}
 	for {
 		ref, err := refIter.Next()
@@ -128,38 +143,38 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 	refIter.Close()
 
 	if headRef == nil {
-		logger.Fatal(ctx, "failed to get repo branch head")
+		g.logger.Fatal(ctx, "failed to get repo branch head")
 		return err
 	} // Не получили нужную ветку
 
-	logger.Info(ctx, fmt.Sprintf("repo head %s", headRef))
+	g.logger.Info(ctx, fmt.Sprintf("repo head %s", headRef))
 
 	wtree, err := repo.Worktree() // todo вроде рабочее дерево не нужно
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to get worktree: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to get worktree: %v", err))
 	}
-	defer checkout(wtree, *headRef)
+	defer g.checkout(*wtree, *g.baseRef)
 
-	g.pulls, err = GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
 	if err != nil && err != ErrPRNotExist {
-		logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
 		return err
 	}
 
 	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) {
-			logger.Info(ctx, fmt.Sprintf("PR for %s exists %s, call RequestUpdate", path, pull.URL))
+			g.logger.Info(ctx, fmt.Sprintf("PR for %s exists %s, call RequestUpdate", path, pull.URL))
 			return g.RequestUpdate(ctx, branch, path, mod)
 		} // хотим проверить есть ли пулл реквест для этой ветки, если есть то выходим
 	}
 
-	logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
+	g.logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
 
 	sourceBranch := fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version)
 
-	logger.Info(ctx, "reset worktree")
+	g.logger.Info(ctx, "reset worktree")
 	if err = wtree.Reset(&git.ResetOptions{Commit: headRef.Hash(), Mode: git.HardReset}); err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to reset repo branch: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to reset repo branch: %v", err))
 	}
 
 	if err = wtree.PullContext(ctx, &git.PullOptions{
@@ -169,17 +184,17 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 		Force:      true,
 		RemoteName: "origin",
 	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) //подтягиваем изменения с удаленого репозитория
+		g.logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) // подтягиваем изменения с удаленого репозитория
 	}
 
-	logger.Info(ctx, fmt.Sprintf("checkout ref %s", headRef))
+	g.logger.Info(ctx, fmt.Sprintf("checkout ref %s", headRef))
 	if err = wtree.Checkout(&git.CheckoutOptions{
 		Hash:   headRef.Hash(),
 		Branch: plumbing.NewBranchReferenceName(sourceBranch),
 		Create: true,
 		Force:  true,
 	}); err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
 		return err
 	} // создаем новую ветку
 
@@ -188,7 +203,7 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 		err = nil
 	}
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
 	} // ищем go файл
 
 	var cmd *exec.Cmd
@@ -196,30 +211,30 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-droprequire=%s", mod.Module.Path))
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
 	}
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-require=%s@%s", path, mod.Version))
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to run go mod edit: %s err: %v", out, err))
 	} // пытаемся выполнить команду go mod edit с новой версией модуля
 
 	cmd = exec.CommandContext(ctx, epath, "mod", "tidy")
 	if out, err = cmd.CombinedOutput(); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
 	} // пытаемся выполнить команду go mod tidy пытаемся подтянуть новую версию модуля
 
-	logger.Info(ctx, "worktree add go.mod")
+	g.logger.Info(ctx, "worktree add go.mod")
 	if _, err = wtree.Add("go.mod"); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
 	}
 
-	logger.Info(ctx, "worktree add go.sum")
+	g.logger.Info(ctx, "worktree add go.sum")
 	if _, err = wtree.Add("go.sum"); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to add file: %v", err))
 	}
 
-	logger.Info(ctx, "worktree commit")
+	g.logger.Info(ctx, "worktree commit")
 	_, err = wtree.Commit(wTitle.String(), &git.CommitOptions{
 		Parents: []plumbing.Hash{headRef.Hash()},
 		Author: &object.Signature{
@@ -229,19 +244,19 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 		},
 	}) // хотим за коммитить изменения
 	if err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to commit: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to commit: %v", err))
 	}
 
 	refspec := gitconfig.RefSpec(fmt.Sprintf("+refs/heads/pkgdash/go_modules/%s-%s:refs/heads/pkgdash/go_modules/%s-%s", path, mod.Version, path, mod.Version)) // todo как будто нужно переделать
 
-	logger.Info(ctx, fmt.Sprintf("try to push refspec %s", refspec))
+	g.logger.Info(ctx, fmt.Sprintf("try to push refspec %s", refspec))
 
 	if err = repo.PushContext(ctx, &git.PushOptions{
 		RefSpecs: []gitconfig.RefSpec{refspec},
 		Auth:     &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
 		Force:    true,
 	}); err != nil {
-		logger.Fatal(ctx, fmt.Sprintf("failed to push repo branch: %v", err))
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to push repo branch: %v", err))
 	} // пытаемся за пушить изменения
 
 	body := map[string]string{
@@ -251,14 +266,14 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 		"title":         wTitle.String(),
 		"description":   wBody.String(),
 	}
-	logger.Info(ctx, fmt.Sprintf("raw body: %#+v", body))
+	g.logger.Info(ctx, fmt.Sprintf("raw body: %#+v", body))
 
 	buf, err = json.Marshal(body)
 	if err != nil {
 		return err
 	}
 
-	logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
+	g.logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
 
 	req, err := http.NewRequestWithContext(
 		ctx,
@@ -271,7 +286,7 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 	}
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("Authorization", g.Password)
+	req.Header.Add("Authorization", "Bearer "+g.Password)
 
 	rsp, err := http.DefaultClient.Do(req)
 	if err != nil {
@@ -282,87 +297,91 @@ func (g *Gitlab) RequestOpen(ctx context.Context, branch string, path string, mo
 		return fmt.Errorf("unknown error: %s", buf)
 	}
 
-	logger.Info(ctx, fmt.Sprintf("PR create for %s-%s", path, mod.Version))
+	g.logger.Info(ctx, fmt.Sprintf("PR create for %s-%s", path, mod.Version))
 
 	return nil
 }
 
 func (g *Gitlab) RequestClose(ctx context.Context, branch string, path string) error {
-	logger.Debug(ctx, fmt.Sprintf("RequestClose start, mod title: %s", path))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestClose start, mod title: %s", path))
+	var err error
 
-	pulls, err := GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
 	if err != nil {
-		logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
 		return err
 	}
 
 	prExist := false
 	var b string // Name of the branch to be deleted
-	for _, pull := range pulls {
+	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) {
-			logger.Info(ctx, fmt.Sprintf("PR for %s exists: %s", path, pull.URL))
+			g.logger.Info(ctx, fmt.Sprintf("PR for %s exists: %s", path, pull.URL))
 			prExist = true
 			b = pull.Source
 		}
 	}
 	if !prExist {
-		logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
+		g.logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
 		return ErrPRNotExist
 	}
 
-	req, err := DeleteBranch(ctx, g.URL, g.RepositoryId, b, g.Password)
+	req, err := g.DeleteBranch(ctx, g.URL, g.RepositoryId, b, g.Password)
 	if err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to create request for delete the branch: %s, err: %s", branch, err))
+		g.logger.Error(ctx, fmt.Sprintf("failed to create request for delete the branch: %s, err: %s", branch, err))
 		return err
 	}
 	rsp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		logger.Error(ctx, fmt.Sprintf("failed to do request for delete the branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
+		g.logger.Error(ctx, fmt.Sprintf("failed to do request for delete the branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
 		return err
 	}
 
-	logger.Info(ctx, fmt.Sprintf("Delete branch for %s successful", path))
+	g.logger.Info(ctx, fmt.Sprintf("Delete branch for %s successful", path))
 	return nil
 }
 
 func (g *Gitlab) RequestUpdate(ctx context.Context, branch string, path string, mod modules.Update) error {
-	logger.Debug(ctx, fmt.Sprintf("RequestUpdate start, mod title: %s", path))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestUpdate start, mod title: %s", path))
 	var err error
 
-	if len(g.pulls) == 0 {
+	g.RepositoryId, err = g.GetRepoID(ctx, g.URL, g.Owner, g.Repository, g.Password)
-		g.pulls, err = GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
+	if err != nil || g.RepositoryId == "" {
-		if err != nil {
+		return fmt.Errorf("project id is empty")
-			logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
-			return err
 	}
+
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
+	if err != nil {
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
+		return err
 	}
 
 	prExist := false
 	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) {
-			logger.Info(ctx, fmt.Sprintf("don't skip %s since pr exist %s", path, pull.URL)) //todo
+			g.logger.Info(ctx, fmt.Sprintf("don't skip %s since pr exist %s", path, pull.URL)) // todo
 			tVersion := getVersions(pull.Source)                                               // Надо взять просто из названия ветки последнюю версию
 			if modules.IsNewerVersion(tVersion, mod.Version, false) {
-				reqDel, err := DeleteBranch(ctx, g.URL, g.RepositoryId, pull.Source, g.Password)
+				reqDel, err := g.DeleteBranch(ctx, g.URL, g.RepositoryId, pull.Source, g.Password)
 				if err != nil {
-					logger.Error(ctx, fmt.Sprintf("Error with create request for branch: %s, err: %s", branch, err))
+					g.logger.Error(ctx, fmt.Sprintf("Error with create request for branch: %s, err: %s", branch, err))
 					return err
 				}
 				rsp, err := http.DefaultClient.Do(reqDel)
 				if err != nil {
-					logger.Error(ctx, fmt.Sprintf("Error with do request for branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
+					g.logger.Error(ctx, fmt.Sprintf("Error with do request for branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
 					return err
 				}
-				logger.Info(ctx, fmt.Sprintf("Old pr %s successful delete", pull.Source))
+				g.logger.Info(ctx, fmt.Sprintf("Old pr %s successful delete", pull.Source))
 			} else {
-				logger.Debug(ctx, "The existing PR is relevant")
+				g.logger.Debug(ctx, "The existing PR is relevant")
 				return nil
 			}
 			prExist = true
 		}
 	}
 	if !prExist {
-		logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
+		g.logger.Error(ctx, fmt.Sprintf("skip %s since pr does not exist", path))
 		return ErrPRNotExist
 	}
 
@@ -370,11 +389,17 @@ func (g *Gitlab) RequestUpdate(ctx context.Context, branch string, path string,
 }
 
 func (g *Gitlab) RequestList(ctx context.Context, branch string) (map[string]string, error) {
-	logger.Debug(ctx, fmt.Sprintf("RequestList for %s", branch))
+	g.logger.Debug(ctx, fmt.Sprintf("RequestList for %s", branch))
 	var err error
 
-	g.pulls, err = GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
+	g.RepositoryId, err = g.GetRepoID(ctx, g.URL, g.Owner, g.Repository, g.Password)
+	if err != nil || g.RepositoryId == "" {
+		return nil, fmt.Errorf("project id is empty")
+	}
+
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.RepositoryId, branch, g.Password)
 	if err != nil {
+		g.logger.Error(ctx, fmt.Sprintf("GetPulls error: %s", err))
 		return nil, err
 	}
 
@@ -399,7 +424,7 @@ func getVersions(s string) string {
 	return version
 }
 
-func DeleteBranch(ctx context.Context, url, projectId, branch, password string) (*http.Request, error) {
+func (g *Gitlab) DeleteBranch(ctx context.Context, url, projectId, branch, password string) (*http.Request, error) {
 	var buf []byte
 	req, err := http.NewRequestWithContext(ctx, http.MethodDelete, fmt.Sprintf("https://%s/api/v4/projects/%s/repository/branches/%s", url, projectId, branch), bytes.NewReader(buf))
 	if err != nil {
@@ -407,11 +432,11 @@ func DeleteBranch(ctx context.Context, url, projectId, branch, password string)
 	}
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("Authorization", password)
+	req.Header.Add("Authorization", "Bearer "+password)
 	return req, err
 }
 
-func GetPulls(ctx context.Context, url, projectId, branch, password string) ([]*gitlabPull, error) {
+func (g *Gitlab) GetPulls(ctx context.Context, url, projectId, branch, password string) ([]*gitlabPull, error) {
 	pulls := make([]*gitlabPull, 0, 10)
 	req, err := http.NewRequestWithContext(
 		ctx,
@@ -424,7 +449,7 @@ func GetPulls(ctx context.Context, url, projectId, branch, password string) ([]*
 
 	req.Header.Add("Accept", "application/json")
 	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("Authorization", password)
+	req.Header.Add("Authorization", "Bearer "+password)
 
 	rsp, err := http.DefaultClient.Do(req) // выполнение запроса
 	if err != nil {
@@ -436,21 +461,62 @@ func GetPulls(ctx context.Context, url, projectId, branch, password string) ([]*
 	switch rsp.StatusCode {
 	case http.StatusOK:
 		if err = json.Unmarshal(buf, &pulls); err != nil {
-			logger.Error(ctx, fmt.Sprintf("failed to decode response %s err: %v", buf, err))
+			g.logger.Error(ctx, fmt.Sprintf("failed to decode response %s err: %v", buf, err))
 			return nil, err
 		}
 		return pulls, nil
 	case http.StatusNotFound:
-		logger.Info(ctx, fmt.Sprintf("pull-request is not exist for %s", projectId))
+		g.logger.Info(ctx, fmt.Sprintf("pull-request is not exist for %s", projectId))
 		return nil, ErrPRNotExist
 	default:
 		return nil, fmt.Errorf("unknown error: %s", buf)
 	}
 }
 
-func checkout(w *git.Worktree, ref plumbing.Reference) {
+func (g *Gitlab) GetRepoID(ctx context.Context, url, owner, repo, password string) (rId string, err error) {
+	var buf []byte
+	projects := make([]*gitlabProject, 0, 10)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf("https://%s/api/v4/users/%s/projects?owned=true", url, owner), nil)
+	if err != nil {
+		return
+	}
+	req.Header.Add("Accept", "application/json")
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("Authorization", password)
+
+	rsp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return
+	}
+
+	buf, _ = io.ReadAll(rsp.Body)
+
+	switch rsp.StatusCode {
+	case http.StatusOK:
+		if err = json.Unmarshal(buf, &projects); err != nil {
+			g.logger.Error(ctx, fmt.Sprintf("failed to decode response %s err: %v", buf, err))
+		}
+		for _, p := range projects {
+			if p.Name == repo {
+				rId = strconv.Itoa(int(p.Id))
+			}
+		}
+		return
+	default:
+		return rId, fmt.Errorf("unknown error: %s", buf)
+	}
+}
+
+func (g *Gitlab) checkout(w git.Worktree, ref plumbing.Reference) {
 	ctx := context.Background()
-	if err := w.Reset(&git.ResetOptions{Commit: ref.Hash(), Mode: git.HardReset}); err != nil {
+	g.logger.Debug(ctx, fmt.Sprintf("Checkout: %s", ref.Name().Short()))
-		logger.Fatal(ctx, fmt.Sprintf("failed to reset: %v", err))
+
+	if err := w.Checkout(&git.CheckoutOptions{
+		Branch: ref.Name(),
+		Create: false,
+		Force:  true,
+		Keep:   false,
+	}); err != nil {
+		g.logger.Error(ctx, fmt.Sprintf("failed to reset: %v", err))
 	}
 }

internal/source/gogs/gogs.go

@@ -4,17 +4,20 @@ import (
 	"context"
 	"fmt"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/configcli"
+	"go.unistack.org/micro/v3/logger"
-	"git.unistack.org/unistack-org/pkgdash/internal/modules"
+	"go.unistack.org/pkgdash/internal/configcli"
+	"go.unistack.org/pkgdash/internal/modules"
 )
 
 type Gogs struct {
+	logger   logger.Logger
 	Username string
 	Password string
 }
 
-func NewGogs(cfg configcli.Config) *Gogs {
+func NewGogs(cfg configcli.Config, log logger.Logger) *Gogs {
 	return &Gogs{
+		logger:   log,
 		Username: cfg.Source.Username,
 		Password: cfg.Source.Password,
 	}
@@ -27,12 +30,15 @@ func (g *Gogs) Name() string {
 func (g *Gogs) RequestOpen(ctx context.Context, branch string, path string, mod modules.Update) error {
 	return fmt.Errorf("implement me")
 }
+
 func (g *Gogs) RequestClose(ctx context.Context, branch string, path string) error {
 	return fmt.Errorf("implement me")
 }
+
 func (g *Gogs) RequestUpdate(ctx context.Context, branch string, path string, mod modules.Update) error {
 	return fmt.Errorf("implement me")
 }
+
 func (g *Gogs) RequestList(ctx context.Context, branch string) (map[string]string, error) {
 	return nil, fmt.Errorf("implement me")
 }

internal/source/source.go

@@ -3,12 +3,13 @@ package source
 import (
 	"context"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/configcli"
+	"go.unistack.org/micro/v3/logger"
-	"git.unistack.org/unistack-org/pkgdash/internal/modules"
+	"go.unistack.org/pkgdash/internal/configcli"
-	"git.unistack.org/unistack-org/pkgdash/internal/source/gitea"
+	"go.unistack.org/pkgdash/internal/modules"
-	"git.unistack.org/unistack-org/pkgdash/internal/source/github"
+	"go.unistack.org/pkgdash/internal/source/gitea"
-	"git.unistack.org/unistack-org/pkgdash/internal/source/gitlab"
+	"go.unistack.org/pkgdash/internal/source/github"
-	"git.unistack.org/unistack-org/pkgdash/internal/source/gogs"
+	"go.unistack.org/pkgdash/internal/source/gitlab"
+	"go.unistack.org/pkgdash/internal/source/gogs"
 )
 
 type SourceControl interface {
@@ -19,16 +20,16 @@ type SourceControl interface {
 	RequestList(ctx context.Context, branch string) (map[string]string, error)
 }
 
-func NewSourceControl(cfg configcli.Config) SourceControl {
+func NewSourceControl(cfg configcli.Config, log logger.Logger) SourceControl {
 	switch cfg.Source.TypeGit {
 	case "github":
-		return github.NewGithub(cfg)
+		return github.NewGithub(cfg, log)
 	case "gitlab":
-		return gitlab.NewGitlab(cfg)
+		return gitlab.NewGitlab(cfg, log)
 	case "gitea":
-		return gitea.NewGitea(cfg)
+		return gitea.NewGitea(cfg, log)
 	case "gogs":
-		return gogs.NewGogs(cfg)
+		return gogs.NewGogs(cfg, log)
 	}
 	return nil
 }

internal/storage/postgres_tmp/storage.go

@@ -10,14 +10,14 @@ import (
 	"fmt"
 	"strings"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/config"
+	"go.unistack.org/pkgdash/internal/config"
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	"go.unistack.org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	pb "go.unistack.org/pkgdash/proto"
-	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v3"
 	mpgx "github.com/golang-migrate/migrate/v4/database/pgx"
 	"github.com/golang-migrate/migrate/v4/source/iofs"
 	"github.com/lib/pq"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
 )
 
 const (

internal/storage/postgres_tmp/storage_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
+	"go.unistack.org/pkgdash/internal/models"
 )
 
 func TestGenerate(t *testing.T) {

internal/storage/sqlite/storage.go

@@ -6,27 +6,26 @@ import (
 	"fmt"
 	"time"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	"git.unistack.org/unistack-org/pkgdash/internal/storage"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
 	"github.com/jmoiron/sqlx"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/models"
+	"go.unistack.org/pkgdash/internal/storage"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func init() {
-	storage.RegisterStorage("sqlite", NewStorage())
+	storage.RegisterStorage("sqlite", NewStorage)
 }
 
 var _ storage.Storage = (*Sqlite)(nil)
 
 type Sqlite struct {
+	logger logger.Logger
 	db     *sqlx.DB
 }
 
-func NewStorage() func(*sqlx.DB) interface{} {
+func NewStorage(log logger.Logger, db *sqlx.DB) interface{} {
-	return func(db *sqlx.DB) interface{} {
+	return &Sqlite{db: db, logger: log}
-		return &Sqlite{db: db}
-	}
 }
 
 func (s *Sqlite) PackageModulesCreate(ctx context.Context, pkg *models.Package, modules []*models.Module) error {
@@ -126,7 +125,7 @@ func (s *Sqlite) CommentCreate(ctx context.Context, req *pb.CommentCreateReq) (*
 	defer func() {
 		if err != nil {
 			if rollbackErr := tx.Rollback(); rollbackErr != nil {
-				logger.Error(ctx, "AddComment: unable to rollback: %v", rollbackErr)
+				s.logger.Error(ctx, "AddComment: unable to rollback: %v", rollbackErr)
 			}
 		} else {
 			err = tx.Commit()

internal/storage/storage.go

@@ -5,16 +5,17 @@ import (
 	"errors"
 	"time"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
 	"github.com/jmoiron/sqlx"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
-func RegisterStorage(name string, fn func(*sqlx.DB) interface{}) {
+func RegisterStorage(name string, fn func(logger.Logger, *sqlx.DB) interface{}) {
 	storages[name] = fn
 }
 
-var storages = map[string]func(*sqlx.DB) interface{}{}
+var storages = map[string]func(logger.Logger, *sqlx.DB) interface{}{}
 
 type Storage interface {
 	PackageModulesCreate(ctx context.Context, pkg *models.Package, modules []*models.Module) error
@@ -35,12 +36,12 @@ type Storage interface {
 	ModuleCreate(ctx context.Context, modules []*models.Module) error
 }
 
-func NewStorage(name string, db *sqlx.DB) (Storage, error) {
+func NewStorage(name string, log logger.Logger, db *sqlx.DB) (Storage, error) {
-	function, ok := storages[name]
+	fn, ok := storages[name]
 	if !ok {
 		return nil, errors.New("incorrect name store")
 	}
-	store := function(db)
+	store := fn(log, db)
 	database, ok := store.(Storage)
 	if !ok {
 		return nil, errors.New("dont implements interface Storage")

internal/storage/storage_test.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"testing"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/storage/sqlite"
+	"go.unistack.org/pkgdash/internal/storage/sqlite"
-	pb "git.unistack.org/unistack-org/pkgdash/proto"
+	pb "go.unistack.org/pkgdash/proto"
 )
 
 func TestGetModule(t *testing.T) {

internal/worker/worker.go

@@ -12,20 +12,20 @@ import (
 	"sync"
 	"time"
 
-	"git.unistack.org/unistack-org/pkgdash/internal/models"
-	"git.unistack.org/unistack-org/pkgdash/internal/modules"
-	"git.unistack.org/unistack-org/pkgdash/internal/storage"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/filemode"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/storage/memory"
 	"github.com/pkg/errors"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/pkgdash/internal/models"
+	"go.unistack.org/pkgdash/internal/modules"
+	"go.unistack.org/pkgdash/internal/storage"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/mod/module"
 )
 
-func Run(ctx context.Context, store storage.Storage, td time.Duration) {
+func Run(ctx context.Context, log logger.Logger, store storage.Storage, td time.Duration) {
 	modTicker := time.NewTicker(5 * time.Second)
 	defer modTicker.Stop()
 	pkgTicker := time.NewTicker(5 * time.Second)
@@ -42,13 +42,13 @@ func Run(ctx context.Context, store storage.Storage, td time.Duration) {
 				if err != sql.ErrNoRows {
 					continue
 				}
-				logger.Fatal(ctx, "failed to get packages to process: %v", err)
+				log.Fatal(ctx, "failed to get packages to process: %v", err)
 			}
 			wg.Add(len(packages))
 			for _, pkg := range packages {
 				go func(p *models.Package) {
-					if err := parseModFile(ctx, store, p); err != nil {
+					if err := parseModFile(ctx, log, store, p); err != nil {
-						logger.Error(ctx, "failed to process package %s: %v", p.Name, err)
+						log.Error(ctx, "failed to process package %s: %v", p.Name, err)
 					}
 					p.LastCheck.Time = time.Now()
 					wg.Done()
@@ -56,7 +56,7 @@ func Run(ctx context.Context, store storage.Storage, td time.Duration) {
 			}
 			wg.Wait()
 			if err = store.PackagesUpdateLastCheck(ctx, packages); err != nil {
-				logger.Error(ctx, "update packages last_check %#+v, err: %v", packages, err)
+				log.Error(ctx, "update packages last_check %#+v, err: %v", packages, err)
 			}
 		case <-modTicker.C:
 			modules, err := store.ModulesProcess(ctx, td)
@@ -64,17 +64,17 @@ func Run(ctx context.Context, store storage.Storage, td time.Duration) {
 				if err != sql.ErrNoRows {
 					continue
 				}
-				logger.Fatal(ctx, "failed to get modules to process: %v", err)
+				log.Fatal(ctx, "failed to get modules to process: %v", err)
 			}
-			if err := processModules(ctx, store, modules); err != nil {
+			if err := processModules(ctx, log, store, modules); err != nil {
-				logger.Error(ctx, "failed to process modules: %v", err)
+				log.Error(ctx, "failed to process modules: %v", err)
 			}
 		}
 	}
 }
 
-func parseModFile(ctx context.Context, store storage.Storage, pkg *models.Package) error {
+func parseModFile(ctx context.Context, log logger.Logger, store storage.Storage, pkg *models.Package) error {
-	logger.Info(ctx, "process package %v", pkg)
+	log.Info(ctx, "process package %v", pkg)
 
 	u, err := url.Parse(pkg.URL)
 	if err != nil {
@@ -125,7 +125,7 @@ func parseModFile(ctx context.Context, store storage.Storage, pkg *models.Packag
 	err = tree.Files().ForEach(func(file *object.File) error {
 		if file == nil {
 			err = errors.New("file pointer is nil")
-			logger.Error(ctx, "file tree error", err)
+			log.Error(ctx, "file tree error", err)
 			return err
 		}
 
@@ -156,14 +156,14 @@ func parseModFile(ctx context.Context, store storage.Storage, pkg *models.Packag
 	})
 
 	if err = store.PackageModulesCreate(ctx, pkg, modules); err != nil {
-		logger.Error(ctx, "failed to set create modules: %v", err)
+		log.Error(ctx, "failed to set create modules: %v", err)
 		return err
 	}
 
 	return nil
 }
 
-func processModules(ctx context.Context, store storage.Storage, mods []*models.Module) error {
+func processModules(ctx context.Context, log logger.Logger, store storage.Storage, mods []*models.Module) error {
 	mvs := make(map[string]*models.Module, len(mods))
 
 	for _, mod := range mods {
@@ -182,7 +182,7 @@ func processModules(ctx context.Context, store storage.Storage, mods []*models.M
 		Modules: mvsu,
 		OnUpdate: func(u modules.Update) {
 			if u.Err != nil {
-				logger.Error(ctx, "%s: failed: %v", u.Module.Path, u.Err)
+				log.Error(ctx, "%s: failed: %v", u.Module.Path, u.Err)
 			} else {
 				mvs[u.Module.Path].Version = u.Version
 			}

proto/micro_errors.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v4.0.2
+// protoc-gen-go-micro version: v3.10.4
 
 package pkgdashpb
 

proto/pkgdash.pb.go

@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v4.24.4
+// 	protoc        v5.28.3
 // source: pkgdash.proto
 
 package pkgdashpb
 
 import (
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	_ "go.unistack.org/micro-proto/v4/api"
+	_ "go.unistack.org/micro-proto/v3/api"
-	_ "go.unistack.org/micro-proto/v4/openapiv3"
+	_ "go.unistack.org/micro-proto/v3/openapiv3"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
@@ -2034,11 +2034,10 @@ var file_pkgdash_proto_rawDesc = []byte{
 	0x9e, 0x03, 0x25, 0x2a, 0x0a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x42,
 	0x17, 0x0a, 0x15, 0x12, 0x13, 0x0a, 0x11, 0x2e, 0x70, 0x6b, 0x67, 0x64, 0x61, 0x73, 0x68, 0x2e,
 	0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x73, 0x70, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x0d, 0x12, 0x0b,
-	0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x42, 0x36, 0x5a, 0x34, 0x67,
+	0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x42, 0x29, 0x5a, 0x27, 0x67,
-	0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x75,
+	0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70,
-	0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x70, 0x6b, 0x67, 0x64,
+	0x6b, 0x67, 0x64, 0x61, 0x73, 0x68, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x70, 0x6b, 0x67,
-	0x61, 0x73, 0x68, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x70, 0x6b, 0x67, 0x64, 0x61, 0x73,
+	0x64, 0x61, 0x73, 0x68, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x68, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

proto/pkgdash.proto

@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "openapiv3/annotations.proto";
 import "validate/validate.proto";
 
-option go_package = "go.unistack.org/unistack-org/pkgdash/proto;pkgdashpb";
+option go_package = "go.unistack.org/pkgdash/proto;pkgdashpb";
 
 service Pkgdash {
   rpc PackageLookup(PackageLookupReq) returns (PackageLookupRsp) {

proto/pkgdash_micro.pb.go

@@ -1,37 +1,36 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v4.0.2
+// - protoc-gen-go-micro v3.10.4
-// - protoc              v4.24.4
+// - protoc              v5.28.3
 // source: pkgdash.proto
 
 package pkgdashpb
 
 import (
 	context "context"
-	_ "go.unistack.org/micro/v4/client"
+	client "go.unistack.org/micro/v3/client"
-	options "go.unistack.org/micro/v4/options"
 )
 
 var (
-	PkgdashServiceName = "PkgdashService"
+	PkgdashName = "Pkgdash"
 )
 
-type PkgdashServiceClient interface {
+type PkgdashClient interface {
-	PackageLookup(ctx context.Context, req *PackageLookupReq, opts ...options.Option) (*PackageLookupRsp, error)
+	PackageLookup(ctx context.Context, req *PackageLookupReq, opts ...client.CallOption) (*PackageLookupRsp, error)
-	PackageCreate(ctx context.Context, req *PackageCreateReq, opts ...options.Option) (*PackageCreateRsp, error)
+	PackageCreate(ctx context.Context, req *PackageCreateReq, opts ...client.CallOption) (*PackageCreateRsp, error)
-	PackageDelete(ctx context.Context, req *PackageDeleteReq, opts ...options.Option) (*PackageDeleteRsp, error)
+	PackageDelete(ctx context.Context, req *PackageDeleteReq, opts ...client.CallOption) (*PackageDeleteRsp, error)
-	PackageList(ctx context.Context, req *PackageListReq, opts ...options.Option) (*PackageListRsp, error)
+	PackageList(ctx context.Context, req *PackageListReq, opts ...client.CallOption) (*PackageListRsp, error)
-	HandlerList(ctx context.Context, req *HandlerListReq, opts ...options.Option) (*HandlerListRsp, error)
+	HandlerList(ctx context.Context, req *HandlerListReq, opts ...client.CallOption) (*HandlerListRsp, error)
-	PackageModules(ctx context.Context, req *PackageModulesReq, opts ...options.Option) (*PackageModulesRsp, error)
+	PackageModules(ctx context.Context, req *PackageModulesReq, opts ...client.CallOption) (*PackageModulesRsp, error)
-	PackageUpdate(ctx context.Context, req *PackageUpdateReq, opts ...options.Option) (*PackageUpdateRsp, error)
+	PackageUpdate(ctx context.Context, req *PackageUpdateReq, opts ...client.CallOption) (*PackageUpdateRsp, error)
-	CommentCreate(ctx context.Context, req *CommentCreateReq, opts ...options.Option) (*CommentCreateRsp, error)
+	CommentCreate(ctx context.Context, req *CommentCreateReq, opts ...client.CallOption) (*CommentCreateRsp, error)
-	CommentLookup(ctx context.Context, req *CommentLookupReq, opts ...options.Option) (*CommentLookupRsp, error)
+	CommentLookup(ctx context.Context, req *CommentLookupReq, opts ...client.CallOption) (*CommentLookupRsp, error)
-	CommentList(ctx context.Context, req *CommentListReq, opts ...options.Option) (*CommentListRsp, error)
+	CommentList(ctx context.Context, req *CommentListReq, opts ...client.CallOption) (*CommentListRsp, error)
-	CommentDelete(ctx context.Context, req *CommentDeleteReq, opts ...options.Option) (*CommentDeleteRsp, error)
+	CommentDelete(ctx context.Context, req *CommentDeleteReq, opts ...client.CallOption) (*CommentDeleteRsp, error)
-	ModuleList(ctx context.Context, req *ModuleListReq, opts ...options.Option) (*ModuleListRsp, error)
+	ModuleList(ctx context.Context, req *ModuleListReq, opts ...client.CallOption) (*ModuleListRsp, error)
 }
 
-type PkgdashServiceServer interface {
+type PkgdashServer interface {
 	PackageLookup(ctx context.Context, req *PackageLookupReq, rsp *PackageLookupRsp) error
 	PackageCreate(ctx context.Context, req *PackageCreateReq, rsp *PackageCreateRsp) error
 	PackageDelete(ctx context.Context, req *PackageDeleteReq, rsp *PackageDeleteRsp) error

proto/pkgdash_micro_http.pb.go

@@ -1,114 +1,113 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v4.0.2
+// protoc-gen-go-micro version: v3.10.4
 // source: pkgdash.proto
 
 package pkgdashpb
 
 import (
 	context "context"
-	v41 "go.unistack.org/micro-client-http/v4"
+	v31 "go.unistack.org/micro-client-http/v3"
-	v4 "go.unistack.org/micro-server-http/v4"
+	v3 "go.unistack.org/micro-server-http/v3"
-	client "go.unistack.org/micro/v4/client"
+	client "go.unistack.org/micro/v3/client"
-	options "go.unistack.org/micro/v4/options"
+	server "go.unistack.org/micro/v3/server"
-	server "go.unistack.org/micro/v4/server"
 	http "net/http"
 )
 
 var (
-	PkgdashServiceServerEndpoints = []v4.EndpointMetadata{
+	PkgdashServerEndpoints = []v3.EndpointMetadata{
 		{
-			Name:   "PkgdashService.PackageLookup",
+			Name:   "Pkgdash.PackageLookup",
 			Path:   "/v1/packages/{id}",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackageCreate",
+			Name:   "Pkgdash.PackageCreate",
 			Path:   "/v1/packages",
 			Method: "POST",
 			Body:   "*",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackageDelete",
+			Name:   "Pkgdash.PackageDelete",
 			Path:   "/v1/packages/{id}",
 			Method: "DELETE",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackageList",
+			Name:   "Pkgdash.PackageList",
 			Path:   "/v1/packages",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.HandlerList",
+			Name:   "Pkgdash.HandlerList",
 			Path:   "/v1/packages/{package}/handlers",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackageModules",
+			Name:   "Pkgdash.PackageModules",
 			Path:   "/v1/packages/{package}/modules",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.PackageUpdate",
+			Name:   "Pkgdash.PackageUpdate",
 			Path:   "/v1/packages/{id}",
 			Method: "PUT",
 			Body:   "*",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentCreate",
+			Name:   "Pkgdash.CommentCreate",
 			Path:   "/v1/packages/{package}/comments",
 			Method: "POST",
 			Body:   "*",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentLookup",
+			Name:   "Pkgdash.CommentLookup",
 			Path:   "/v1/comments/{id}",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentLookup",
+			Name:   "Pkgdash.CommentLookup",
 			Path:   "/v1/comments/{package}/comments/{id}",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentList",
+			Name:   "Pkgdash.CommentList",
 			Path:   "/v1/packages/{package}/comments",
 			Method: "GET",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentDelete",
+			Name:   "Pkgdash.CommentDelete",
 			Path:   "/v1/packages/{package_id}/comments/{id}",
 			Method: "DELETE",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.CommentDelete",
+			Name:   "Pkgdash.CommentDelete",
 			Path:   "/v1/comments/{id}",
 			Method: "DELETE",
 			Body:   "",
 			Stream: false,
 		},
 		{
-			Name:   "PkgdashService.ModuleList",
+			Name:   "Pkgdash.ModuleList",
 			Path:   "/v1/modules",
 			Method: "GET",
 			Body:   "",
@@ -117,288 +116,288 @@ var (
 	}
 )
 
-type pkgdashServiceClient struct {
+type pkgdashClient struct {
 	c    client.Client
 	name string
 }
 
-func NewPkgdashServiceClient(name string, c client.Client) PkgdashServiceClient {
+func NewPkgdashClient(name string, c client.Client) PkgdashClient {
-	return &pkgdashServiceClient{c: c, name: name}
+	return &pkgdashClient{c: c, name: name}
 }
 
-func (c *pkgdashServiceClient) PackageLookup(ctx context.Context, req *PackageLookupReq, opts ...options.Option) (*PackageLookupRsp, error) {
+func (c *pkgdashClient) PackageLookup(ctx context.Context, req *PackageLookupReq, opts ...client.CallOption) (*PackageLookupRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodGet),
+		v31.Method(http.MethodGet),
-		v41.Path("/v1/packages/{id}"),
+		v31.Path("/v1/packages/{id}"),
 	)
 	rsp := &PackageLookupRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageLookup", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.PackageLookup", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) PackageCreate(ctx context.Context, req *PackageCreateReq, opts ...options.Option) (*PackageCreateRsp, error) {
+func (c *pkgdashClient) PackageCreate(ctx context.Context, req *PackageCreateReq, opts ...client.CallOption) (*PackageCreateRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodPost),
+		v31.Method(http.MethodPost),
-		v41.Path("/v1/packages"),
+		v31.Path("/v1/packages"),
-		v41.Body("*"),
+		v31.Body("*"),
 	)
 	rsp := &PackageCreateRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageCreate", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.PackageCreate", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) PackageDelete(ctx context.Context, req *PackageDeleteReq, opts ...options.Option) (*PackageDeleteRsp, error) {
+func (c *pkgdashClient) PackageDelete(ctx context.Context, req *PackageDeleteReq, opts ...client.CallOption) (*PackageDeleteRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodDelete),
+		v31.Method(http.MethodDelete),
-		v41.Path("/v1/packages/{id}"),
+		v31.Path("/v1/packages/{id}"),
 	)
 	rsp := &PackageDeleteRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageDelete", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.PackageDelete", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) PackageList(ctx context.Context, req *PackageListReq, opts ...options.Option) (*PackageListRsp, error) {
+func (c *pkgdashClient) PackageList(ctx context.Context, req *PackageListReq, opts ...client.CallOption) (*PackageListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodGet),
+		v31.Method(http.MethodGet),
-		v41.Path("/v1/packages"),
+		v31.Path("/v1/packages"),
 	)
 	rsp := &PackageListRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageList", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.PackageList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) HandlerList(ctx context.Context, req *HandlerListReq, opts ...options.Option) (*HandlerListRsp, error) {
+func (c *pkgdashClient) HandlerList(ctx context.Context, req *HandlerListReq, opts ...client.CallOption) (*HandlerListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodGet),
+		v31.Method(http.MethodGet),
-		v41.Path("/v1/packages/{package}/handlers"),
+		v31.Path("/v1/packages/{package}/handlers"),
 	)
 	rsp := &HandlerListRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.HandlerList", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.HandlerList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) PackageModules(ctx context.Context, req *PackageModulesReq, opts ...options.Option) (*PackageModulesRsp, error) {
+func (c *pkgdashClient) PackageModules(ctx context.Context, req *PackageModulesReq, opts ...client.CallOption) (*PackageModulesRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodGet),
+		v31.Method(http.MethodGet),
-		v41.Path("/v1/packages/{package}/modules"),
+		v31.Path("/v1/packages/{package}/modules"),
 	)
 	rsp := &PackageModulesRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageModules", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.PackageModules", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) PackageUpdate(ctx context.Context, req *PackageUpdateReq, opts ...options.Option) (*PackageUpdateRsp, error) {
+func (c *pkgdashClient) PackageUpdate(ctx context.Context, req *PackageUpdateReq, opts ...client.CallOption) (*PackageUpdateRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodPut),
+		v31.Method(http.MethodPut),
-		v41.Path("/v1/packages/{id}"),
+		v31.Path("/v1/packages/{id}"),
-		v41.Body("*"),
+		v31.Body("*"),
 	)
 	rsp := &PackageUpdateRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.PackageUpdate", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.PackageUpdate", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) CommentCreate(ctx context.Context, req *CommentCreateReq, opts ...options.Option) (*CommentCreateRsp, error) {
+func (c *pkgdashClient) CommentCreate(ctx context.Context, req *CommentCreateReq, opts ...client.CallOption) (*CommentCreateRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodPost),
+		v31.Method(http.MethodPost),
-		v41.Path("/v1/packages/{package}/comments"),
+		v31.Path("/v1/packages/{package}/comments"),
-		v41.Body("*"),
+		v31.Body("*"),
 	)
 	rsp := &CommentCreateRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentCreate", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.CommentCreate", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) CommentLookup(ctx context.Context, req *CommentLookupReq, opts ...options.Option) (*CommentLookupRsp, error) {
+func (c *pkgdashClient) CommentLookup(ctx context.Context, req *CommentLookupReq, opts ...client.CallOption) (*CommentLookupRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodGet),
+		v31.Method(http.MethodGet),
-		v41.Path("/v1/comments/{id}"),
+		v31.Path("/v1/comments/{id}"),
 	)
 	rsp := &CommentLookupRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentLookup", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.CommentLookup", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) CommentList(ctx context.Context, req *CommentListReq, opts ...options.Option) (*CommentListRsp, error) {
+func (c *pkgdashClient) CommentList(ctx context.Context, req *CommentListReq, opts ...client.CallOption) (*CommentListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodGet),
+		v31.Method(http.MethodGet),
-		v41.Path("/v1/packages/{package}/comments"),
+		v31.Path("/v1/packages/{package}/comments"),
 	)
 	rsp := &CommentListRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentList", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.CommentList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) CommentDelete(ctx context.Context, req *CommentDeleteReq, opts ...options.Option) (*CommentDeleteRsp, error) {
+func (c *pkgdashClient) CommentDelete(ctx context.Context, req *CommentDeleteReq, opts ...client.CallOption) (*CommentDeleteRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodDelete),
+		v31.Method(http.MethodDelete),
-		v41.Path("/v1/packages/{package_id}/comments/{id}"),
+		v31.Path("/v1/packages/{package_id}/comments/{id}"),
 	)
 	rsp := &CommentDeleteRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.CommentDelete", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.CommentDelete", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-func (c *pkgdashServiceClient) ModuleList(ctx context.Context, req *ModuleListReq, opts ...options.Option) (*ModuleListRsp, error) {
+func (c *pkgdashClient) ModuleList(ctx context.Context, req *ModuleListReq, opts ...client.CallOption) (*ModuleListRsp, error) {
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &ErrorRsp{}
 	opts = append(opts,
-		v41.ErrorMap(errmap),
+		v31.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v41.Method(http.MethodGet),
+		v31.Method(http.MethodGet),
-		v41.Path("/v1/modules"),
+		v31.Path("/v1/modules"),
 	)
 	rsp := &ModuleListRsp{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "PkgdashService.ModuleList", req), rsp, opts...)
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Pkgdash.ModuleList", req), rsp, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return rsp, nil
 }
 
-type pkgdashServiceServer struct {
+type pkgdashServer struct {
-	PkgdashServiceServer
+	PkgdashServer
 }
 
-func (h *pkgdashServiceServer) PackageLookup(ctx context.Context, req *PackageLookupReq, rsp *PackageLookupRsp) error {
+func (h *pkgdashServer) PackageLookup(ctx context.Context, req *PackageLookupReq, rsp *PackageLookupRsp) error {
-	return h.PkgdashServiceServer.PackageLookup(ctx, req, rsp)
+	return h.PkgdashServer.PackageLookup(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) PackageCreate(ctx context.Context, req *PackageCreateReq, rsp *PackageCreateRsp) error {
+func (h *pkgdashServer) PackageCreate(ctx context.Context, req *PackageCreateReq, rsp *PackageCreateRsp) error {
-	return h.PkgdashServiceServer.PackageCreate(ctx, req, rsp)
+	return h.PkgdashServer.PackageCreate(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) PackageDelete(ctx context.Context, req *PackageDeleteReq, rsp *PackageDeleteRsp) error {
+func (h *pkgdashServer) PackageDelete(ctx context.Context, req *PackageDeleteReq, rsp *PackageDeleteRsp) error {
-	return h.PkgdashServiceServer.PackageDelete(ctx, req, rsp)
+	return h.PkgdashServer.PackageDelete(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) PackageList(ctx context.Context, req *PackageListReq, rsp *PackageListRsp) error {
+func (h *pkgdashServer) PackageList(ctx context.Context, req *PackageListReq, rsp *PackageListRsp) error {
-	return h.PkgdashServiceServer.PackageList(ctx, req, rsp)
+	return h.PkgdashServer.PackageList(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) HandlerList(ctx context.Context, req *HandlerListReq, rsp *HandlerListRsp) error {
+func (h *pkgdashServer) HandlerList(ctx context.Context, req *HandlerListReq, rsp *HandlerListRsp) error {
-	return h.PkgdashServiceServer.HandlerList(ctx, req, rsp)
+	return h.PkgdashServer.HandlerList(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) PackageModules(ctx context.Context, req *PackageModulesReq, rsp *PackageModulesRsp) error {
+func (h *pkgdashServer) PackageModules(ctx context.Context, req *PackageModulesReq, rsp *PackageModulesRsp) error {
-	return h.PkgdashServiceServer.PackageModules(ctx, req, rsp)
+	return h.PkgdashServer.PackageModules(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) PackageUpdate(ctx context.Context, req *PackageUpdateReq, rsp *PackageUpdateRsp) error {
+func (h *pkgdashServer) PackageUpdate(ctx context.Context, req *PackageUpdateReq, rsp *PackageUpdateRsp) error {
-	return h.PkgdashServiceServer.PackageUpdate(ctx, req, rsp)
+	return h.PkgdashServer.PackageUpdate(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) CommentCreate(ctx context.Context, req *CommentCreateReq, rsp *CommentCreateRsp) error {
+func (h *pkgdashServer) CommentCreate(ctx context.Context, req *CommentCreateReq, rsp *CommentCreateRsp) error {
-	return h.PkgdashServiceServer.CommentCreate(ctx, req, rsp)
+	return h.PkgdashServer.CommentCreate(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) CommentLookup(ctx context.Context, req *CommentLookupReq, rsp *CommentLookupRsp) error {
+func (h *pkgdashServer) CommentLookup(ctx context.Context, req *CommentLookupReq, rsp *CommentLookupRsp) error {
-	return h.PkgdashServiceServer.CommentLookup(ctx, req, rsp)
+	return h.PkgdashServer.CommentLookup(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) CommentList(ctx context.Context, req *CommentListReq, rsp *CommentListRsp) error {
+func (h *pkgdashServer) CommentList(ctx context.Context, req *CommentListReq, rsp *CommentListRsp) error {
-	return h.PkgdashServiceServer.CommentList(ctx, req, rsp)
+	return h.PkgdashServer.CommentList(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) CommentDelete(ctx context.Context, req *CommentDeleteReq, rsp *CommentDeleteRsp) error {
+func (h *pkgdashServer) CommentDelete(ctx context.Context, req *CommentDeleteReq, rsp *CommentDeleteRsp) error {
-	return h.PkgdashServiceServer.CommentDelete(ctx, req, rsp)
+	return h.PkgdashServer.CommentDelete(ctx, req, rsp)
 }
 
-func (h *pkgdashServiceServer) ModuleList(ctx context.Context, req *ModuleListReq, rsp *ModuleListRsp) error {
+func (h *pkgdashServer) ModuleList(ctx context.Context, req *ModuleListReq, rsp *ModuleListRsp) error {
-	return h.PkgdashServiceServer.ModuleList(ctx, req, rsp)
+	return h.PkgdashServer.ModuleList(ctx, req, rsp)
 }
 
-func RegisterPkgdashServiceServer(s server.Server, sh PkgdashServiceServer, opts ...options.Option) error {
+func RegisterPkgdashServer(s server.Server, sh PkgdashServer, opts ...server.HandlerOption) error {
-	type pkgdashService interface {
+	type pkgdash interface {
 		PackageLookup(ctx context.Context, req *PackageLookupReq, rsp *PackageLookupRsp) error
 		PackageCreate(ctx context.Context, req *PackageCreateReq, rsp *PackageCreateRsp) error
 		PackageDelete(ctx context.Context, req *PackageDeleteReq, rsp *PackageDeleteRsp) error
@@ -412,11 +411,11 @@ func RegisterPkgdashServiceServer(s server.Server, sh PkgdashServiceServer, opts
 		CommentDelete(ctx context.Context, req *CommentDeleteReq, rsp *CommentDeleteRsp) error
 		ModuleList(ctx context.Context, req *ModuleListReq, rsp *ModuleListRsp) error
 	}
-	type PkgdashService struct {
+	type Pkgdash struct {
-		pkgdashService
+		pkgdash
 	}
-	h := &pkgdashServiceServer{sh}
+	h := &pkgdashServer{sh}
-	var nopts []options.Option
+	var nopts []server.HandlerOption
-	nopts = append(nopts, v4.HandlerEndpoints(PkgdashServiceServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(PkgdashServerEndpoints))
-	return s.Handle(&PkgdashService{h}, append(nopts, opts...)...)
+	return s.Handle(s.NewHandler(&Pkgdash{h}, append(nopts, opts...)...))
 }