fixup to get working code

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

.gitea/pkgdashcli.yaml

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

cmd/pkgdashcli/main.go

@@ -265,7 +265,7 @@ func Execute(ctx context.Context, log logger.Logger, gitSource source.SourceCont
 	case "checkupdate":
 		js, err := json.Marshal(mvs)
 		fmt.Println(fmt.Sprintf(`Modules get update: %s, %s`, js, err))
-	case "open":
+	case "update":
 		if cliCfg.Path != "" { // update one dep
 			path = cliCfg.Path
 			if mod, ok = mvs[path]; !ok {
@@ -294,35 +294,6 @@ func Execute(ctx context.Context, log logger.Logger, gitSource source.SourceCont
 				log.Debug(ctx, fmt.Sprintf("Update successful for %s", path))
 			}
 		}
-	case "update":
-		if cliCfg.Path != "" { // update one dep
-			path = cliCfg.Path
-			if mod, ok = mvs[path]; !ok {
-				log.Fatal(ctx, fmt.Sprintf("For %s update not exist", path))
-			}
-			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.RequestUpdate(ctx, branch, path, mod); err != nil {
-					log.Fatal(ctx, fmt.Sprintf("failed to create pr: %v", err))
-				}
-			}
-			log.Debug(ctx, fmt.Sprintf("Update successful for %s", path))
-			return
-		}
-		for _, branch := range cfg.Branches { // update all dep
-			for path, mod = range mvs {
-				log.Debug(ctx, fmt.Sprintf("Start update %s from %s to %s", path, mod.Module.Version, mod.Version))
-				err := gitSource.RequestUpdate(ctx, branch, path, mod)
-				if err != nil {
-					if strings.Contains(err.Error(), "already exists") {
-						log.Debug(ctx, fmt.Sprintf("skip %s, branch already exists", path))
-						continue
-					}
-					log.Fatal(ctx, fmt.Sprintf("failed to create pr: %v", err))
-				}
-				log.Debug(ctx, fmt.Sprintf("Update successful for %s", path))
-			}
-		}
 	case "close":
 		if cliCfg.Path != "" { // close one dep
 			path = cliCfg.Path

go.mod

@@ -7,8 +7,9 @@ toolchain go1.23.3
 require (
 	github.com/envoyproxy/protoc-gen-validate v1.1.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/v5 v5.5.4
+	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
@@ -46,8 +47,6 @@ require (
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/jackc/pgx/v4 v4.18.3 // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
-	github.com/lib/pq v1.10.9 // 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
@@ -70,7 +69,6 @@ require (
 	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.6.0 // indirect
-	github.com/golang-migrate/migrate/v4 v4.18.1
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/gnostic v0.7.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect

go.sum

@@ -609,6 +609,8 @@ github.com/KimMachineGun/automemlimit v0.6.1/go.mod h1:T7xYht7B8r6AG/AqFcUdc7fzd
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
+github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
@@ -644,6 +646,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/cilium/ebpf v0.9.1 h1:64sn2K3UKw8NbP/blsixRpF3nXuyhz/VjRlRzvlBRu4=
 github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
 github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -669,20 +673,22 @@ github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzA
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
+github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/cyphar/filepath-securejoin v0.3.5 h1:L81NHjquoQmcPgXcttUS9qTSR/+bXry6pbSINQGpjj4=
 github.com/cyphar/filepath-securejoin v0.3.5/go.mod h1:edhVd3c6OXKjUmSrVa/tGJRS9joFTxlslFCAyaxigkE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dhui/dktest v0.4.3 h1:wquqUxAFdcUgabAVLvSCOKOlag5cIZuaOjYIBOWdsR0=
-github.com/dhui/dktest v0.4.3/go.mod h1:zNK8IwktWzQRm6I/l2Wjp7MakiyaFWv4G1hjmodmMTs=
-github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
-github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4=
-github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
-github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
+github.com/dhui/dktest v0.4.0 h1:z05UmuXZHO/bgj/ds2bGMBu8FI4WA+Ag/m3ghL+om7M=
+github.com/dhui/dktest v0.4.0/go.mod h1:v/Dbz1LgCBOi2Uki2nUqLBGa83hWBGFMu5MrgMDCc78=
+github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
+github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
+github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
@@ -714,8 +720,6 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
@@ -746,10 +750,6 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
 github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
@@ -764,8 +764,8 @@ github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPh
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-migrate/migrate/v4 v4.18.1 h1:JML/k+t4tpHCpQTCAD62Nu43NUFzHY4CV3uAuvHGC+Y=
-github.com/golang-migrate/migrate/v4 v4.18.1/go.mod h1:HAX6m3sQgcdO81tdjn5exv20+3Kb13cmGli1hrD6hks=
+github.com/golang-migrate/migrate/v4 v4.17.0 h1:rd40H3QXU0AA4IoLllFcEAEo9dYKRHYND2gB4p7xcaU=
+github.com/golang-migrate/migrate/v4 v4.17.0/go.mod h1:+Cp2mtLP4/aXDTKb9wmXYitdrNx2HGs45rbWAo6OsKM=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
@@ -773,6 +773,8 @@ github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -960,14 +962,12 @@ github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgS
 github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
 github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA=
 github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
-github.com/jackc/pgx/v5 v5.5.4 h1:Xp2aQS8uXButQdnCMWNmvx6UysWQQC+u1EoizjguY+8=
-github.com/jackc/pgx/v5 v5.5.4/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
+github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU=
+github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jdx/go-netrc v1.0.0 h1:QbLMLyCZGj0NA8glAhxUpf1zDg6cxnWgMBbjq40W0gQ=
@@ -1030,8 +1030,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
-github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -1042,8 +1040,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
+github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
@@ -1076,8 +1074,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
@@ -1096,7 +1094,8 @@ github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
+github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
 github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
@@ -1151,14 +1150,6 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
-go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
-go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
-go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
-go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
-go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
-go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
 go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
@@ -1290,6 +1281,8 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1608,6 +1601,8 @@ golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
 golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/source/gitea/gitea.go

@@ -22,7 +22,7 @@ import (
 	"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"
+	gogit "go.unistack.org/pkgdash/internal/source/git"
 )
 
 var ErrPRNotExist = errors.New("pull request does not exist")
@@ -104,24 +104,134 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 	}
 
 	// открытие гит репозитория с опцией обхода репозитория для нахождения .git
-	repo, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
+	repo, err := gogit.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
 	if err != nil {
 		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 {
+		g.logger.Error(ctx, "failed to fetch repo", err)
+		return err
+	} // обновляем репозиторий
 
-	wtree, headRef, err := g.fetchCheckout(ctx, repo, branch, path, mod)
+	var headRef *plumbing.Reference
+
+	branches, err := repo.Branches()
 	if err != nil {
-		g.logger.Error(ctx, "failed to checkout", err)
+		g.logger.Error(ctx, "cant get repo branches", err)
+		return err
 	}
 
+	for _, ref := range branches {
+		if ref.Name().Short() == branch {
+
+			headRef = plumbing.NewHashReference(ref.Name(), ref.Hash())
+			g.logger.Info(ctx, "headRef set to "+headRef.String())
+			break
+		}
+	}
+
+	if headRef == nil {
+		g.logger.Error(ctx, "failed to get repo branch head")
+		return err
+	} // Не получили нужную ветку
+
+	g.logger.Info(ctx, "repo head "+headRef.String())
+
+	wtree, err := repo.Worktree() // todo вроде рабочее дерево не нужно
+	if err != nil {
+		g.logger.Error(ctx, "failed to get worktree", err)
+		return err
+	}
+
+	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
+	if err != nil && err != ErrPRNotExist {
+		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) {
+			g.logger.Info(ctx, fmt.Sprintf("PR for %s exists %s, call RequestUpdate", path, pull.URL))
+			return g.RequestUpdate(ctx, branch, path, mod)
+		} // хотим проверить есть ли пулл реквест для этой ветки, если есть то выходим
+	}
+
+	g.logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
+
+	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 {
+			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,
+		//	RemoteURL :
+		Force:      true,
+		RemoteName: "origin",
+	}); err != nil && err != git.NoErrAlreadyUpToDate {
+		g.logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) // подтягиваем изменения с удаленого репозитория
+		return err
+	}
+
+	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 != git.ErrBranchExists {
+		g.logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
+		return err
+	} // создаем новую ветку
+
 	defer func() {
 		_ = g.checkout(wtree, headRef)
 	}()
 
-	if err = g.scopeUpdateDep(ctx, path, mod); err != nil {
+	epath, err := exec.LookPath("go")
+	if errors.Is(err, exec.ErrDot) {
+		err = nil
+	}
+	if err != nil {
+		g.logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
+	} // ищем go файл
+
+	var cmd *exec.Cmd
+	var out []byte
+
+	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-droprequire=%s", mod.Module.Path))
+	if out, err = cmd.CombinedOutput(); err != nil {
+		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 {
+		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 {
+		g.logger.Error(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
+		return err
+	} // пытаемся выполнить команду go mod tidy пытаемся подтянуть новую версию модуля
+
 	g.logger.Info(ctx, "worktree add go.mod")
 	if err = wtree.AddWithOptions(&git.AddOptions{Path: "go.mod"}); err != nil {
 		g.logger.Error(ctx, fmt.Sprintf("failed to add file: %v", err))
@@ -161,12 +271,40 @@ func (g *Gitea) RequestOpen(ctx context.Context, branch string, path string, mod
 		return err
 	} // пытаемся за пушить изменения
 
-	rsp, err := g.postPullRequest(ctx, wBody, wTitle, branch, path, mod)
+	body := map[string]string{
+		"base":  branch,
+		"body":  wBody.String(),
+		"head":  fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version),
+		"title": wTitle.String(),
+	}
+	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
 	}
 
-	// Вроде создаем новый реквест на создание пулл реквеста
+	g.logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
+	req, err := http.NewRequestWithContext(
+		ctx,
+		http.MethodPost,
+		fmt.Sprintf("https://%s/api/v1/repos/%s/%s/pulls", g.URL, g.Owner, g.Repository),
+		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", "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 {
 		buf, _ = io.ReadAll(rsp.Body)
 		return fmt.Errorf("unknown error: %s", buf)
@@ -227,20 +365,27 @@ func (g *Gitea) RequestUpdate(ctx context.Context, branch string, path string, m
 	}
 
 	prExist := false
-	var pullId int64
-	var targetBranch plumbing.ReferenceName
-
 	for _, pull := range g.pulls {
 		if strings.Contains(pull.Title, path) && pull.Base.Ref == branch {
 			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) {
+			if modules.IsNewerVersion(tVersion, mod.Version, false) {
+				reqDel, err := g.DeleteBranch(ctx, g.URL, g.Owner, g.Repository, pull.Head.Ref, g.Password)
+				if err != nil {
+					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 {
+					g.logger.Error(ctx, fmt.Sprintf("Error with do request for branch: %s, err: %s, code: %v", branch, err, rsp.StatusCode))
+					return err
+				}
+				g.logger.Info(ctx, fmt.Sprintf("Old pr %s successful delete", pull.Head.Ref))
+			} else {
 				g.logger.Debug(ctx, "The existing PR is relevant")
 				return nil
 			}
 			prExist = true
-			pullId = pull.ID
-			targetBranch = plumbing.ReferenceName(pull.Head.Ref)
 		}
 	}
 	if !prExist {
@@ -248,103 +393,7 @@ func (g *Gitea) RequestUpdate(ctx context.Context, branch string, path string, m
 		return ErrPRNotExist
 	}
 
-	// создания шаблона названия для пулл реквеста
-	tplTitle, err := template.New("pull_request_title").Parse(g.PRTitle)
-	if err != nil {
-		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 {
-		g.logger.Fatal(ctx, fmt.Sprintf("failed to parse template: %v", err))
-	}
-
-	wBody := bytes.NewBuffer(nil)
-
-	data := map[string]string{
-		"Name":       path,
-		"VersionOld": mod.Module.Version,
-		"VersionNew": mod.Version,
-	}
-
-	if err = tplTitle.Execute(wTitle, data); err != nil {
-		g.logger.Error(ctx, "failed to execute template", err)
-		return err
-	}
-	if err = tplBody.Execute(wBody, data); err != nil {
-		g.logger.Error(ctx, "failed to execute template", err)
-		return err
-	}
-
-	// открытие гит репозитория с опцией обхода репозитория для нахождения .git
-	repo, err := git.PlainOpenWithOptions(".", &git.PlainOpenOptions{DetectDotGit: true})
-	if err != nil {
-		g.logger.Fatal(ctx, fmt.Sprintf("failed to open repo: %v", err))
-	}
-
-	wtree, headRef, err := g.fetchCheckout(ctx, repo, targetBranch.Short(), path, mod)
-	if err != nil {
-		g.logger.Error(ctx, "failed to checkout", err)
-		return err
-	}
-
-	defer func() {
-		_ = g.checkout(wtree, headRef)
-	}()
-
-	if err = g.scopeUpdateDep(ctx, path, mod); err != nil {
-		return err
-	}
-
-	g.logger.Info(ctx, "worktree add go.mod")
-	if err = wtree.AddWithOptions(&git.AddOptions{Path: "go.mod"}); err != nil {
-		g.logger.Error(ctx, fmt.Sprintf("failed to add file: %v", err))
-		return err
-	}
-
-	g.logger.Info(ctx, "worktree add go.sum")
-	if err = wtree.AddWithOptions(&git.AddOptions{Path: "go.sum"}); err != nil {
-		g.logger.Error(ctx, fmt.Sprintf("failed to add file: %v", err))
-		return err
-	}
-
-	g.logger.Info(ctx, "worktree commit")
-	_, err = wtree.Commit(wTitle.String(), &git.CommitOptions{
-		Parents: []plumbing.Hash{headRef.Hash()},
-		Author: &object.Signature{
-			Name:  "gitea-actions",
-			Email: "info@unistack.org",
-			When:  time.Now(),
-		},
-	}) // хотим за коммитить изменения
-	if err != nil {
-		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 как будто нужно переделать
-
-	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 {
-		g.logger.Error(ctx, "failed to push repo branch", err)
-		return err
-	} // пытаемся за пушить изменения
-
-	err = g.patchPullRequest(ctx, wBody, wTitle, pullId)
-	if err != nil {
-		return err
-	}
-
-	g.logger.Info(ctx, fmt.Sprintf("PR update for %s-%s", path, mod.Version))
-
-	return nil
+	return g.RequestOpen(ctx, branch, path, mod)
 }
 
 func (g *Gitea) RequestList(ctx context.Context, branch string) (map[string]string, error) {
@@ -439,9 +488,9 @@ func (g *Gitea) GetPulls(ctx context.Context, url, owner, repo, password string)
 	return pullsAll, nil
 }
 
-func (g *Gitea) checkout(w *git.Worktree, ref *plumbing.Reference) error {
+func (g *Gitea) checkout(w gogit.Worktree, ref *plumbing.Reference) error {
 	ctx := context.Background()
-	g.logger.Debug(ctx, "checkout: "+ref.String())
+	g.logger.Debug(ctx, "checkout: "+ref.Name().Short())
 
 	if err := w.Checkout(&git.CheckoutOptions{
 		Branch: ref.Name(),
@@ -454,223 +503,3 @@ func (g *Gitea) checkout(w *git.Worktree, ref *plumbing.Reference) error {
 	}
 	return nil
 }
-
-func (g Gitea) fetchCheckout(ctx context.Context, repo *git.Repository, branch, path string, mod modules.Update) (*git.Worktree, *plumbing.Reference, error) {
-	// обновляем ветки
-	if err := repo.FetchContext(ctx, &git.FetchOptions{
-		Auth:  &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
-		Force: true,
-	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		g.logger.Error(ctx, "failed to fetch repo", err)
-		return nil, nil, err
-	}
-
-	var headRef *plumbing.Reference
-
-	branches, err := repo.Branches()
-	if err != nil {
-		g.logger.Error(ctx, "cant get repo branch", err)
-		return nil, nil, err
-	}
-
-	for {
-		ref, err := branches.Next()
-		if err != nil {
-			return nil, nil, err
-		}
-		if ref.Name().Short() == branch {
-			//Получаем ссылку на нужную ветку
-			headRef = ref
-			g.logger.Info(ctx, "headRef set to "+headRef.String())
-			break
-		}
-	}
-
-	if headRef == nil {
-		g.logger.Error(ctx, "failed to get repo branch head")
-		return nil, nil, err
-	} // Не получили нужную ветку
-
-	g.logger.Info(ctx, "repo head "+headRef.String())
-
-	wtree, err := repo.Worktree()
-	if err != nil {
-		g.logger.Error(ctx, "failed to get worktree", err)
-		return nil, nil, err
-	}
-
-	if err = wtree.Reset(&git.ResetOptions{
-		Mode: git.HardReset,
-	}); err != nil {
-		g.logger.Error(ctx, "reset work_tree error: ", err)
-		return nil, nil, err
-	}
-
-	g.pulls, err = g.GetPulls(ctx, g.URL, g.Owner, g.Repository, g.Password)
-	if err != nil && err != ErrPRNotExist {
-		g.logger.Error(ctx, "GetPulls error", err)
-		return nil, nil, err
-	}
-
-	var pullExist bool
-	for _, pull := range g.pulls {
-		if strings.Contains(pull.Title, path) && (strings.Contains(pull.Base.Ref, branch) || strings.Contains(pull.Head.Ref, branch)) {
-			pullExist = true
-		} // хотим проверить есть ли пулл реквест для этой ветки, если есть то выходим
-	}
-
-	g.logger.Info(ctx, fmt.Sprintf("update %s from %s to %s", path, mod.Module.Version, mod.Version))
-
-	wstatus, err := wtree.Status()
-	if err != nil {
-		g.logger.Error(ctx, "failed to get worktree status", err)
-		return nil, nil, err
-	}
-
-	g.logger.Info(ctx, "worktree status "+wstatus.String())
-
-	if err = wtree.PullContext(ctx, &git.PullOptions{
-		Auth: &httpauth.BasicAuth{Username: g.Username, Password: g.Password},
-		// Depth: 1,
-		//	RemoteURL :
-		ReferenceName: headRef.Name(),
-		Force:         true,
-		RemoteName:    "origin",
-	}); err != nil && err != git.NoErrAlreadyUpToDate {
-		g.logger.Error(ctx, fmt.Sprintf("failed to pull repo: %v", err)) // подтягиваем изменения с удаленого репозитория
-		return nil, nil, err
-	}
-
-	g.logger.Info(ctx, fmt.Sprintf("checkout ref %s", headRef))
-
-	if pullExist {
-		if err = wtree.Checkout(&git.CheckoutOptions{
-			Branch: headRef.Name(),
-			Create: false,
-			Force:  true,
-		}); err != nil && err != git.ErrBranchExists {
-			g.logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
-			return nil, nil, err
-		} //переходим на существующею
-	} else {
-		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 != git.ErrBranchExists {
-			g.logger.Error(ctx, fmt.Sprintf("failed to checkout tree: %v", err))
-			return nil, nil, err
-		} // создаем новую ветку
-	}
-	return wtree, headRef, nil
-}
-
-func (g *Gitea) postPullRequest(ctx context.Context, wBody, wTitle *bytes.Buffer, branch, path string, mod modules.Update) (*http.Response, error) {
-	body := map[string]string{
-		"base":  branch,
-		"body":  wBody.String(),
-		"head":  fmt.Sprintf("pkgdash/go_modules/%s-%s", path, mod.Version),
-		"title": wTitle.String(),
-	}
-	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 nil, err
-	}
-
-	g.logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
-	req, err := http.NewRequestWithContext(
-		ctx,
-		http.MethodPost,
-		fmt.Sprintf("https://%s/api/v1/repos/%s/%s/pulls", g.URL, g.Owner, g.Repository),
-		bytes.NewReader(buf),
-	)
-	if err != nil {
-		g.logger.Error(ctx, "http request error", err)
-		return nil, err
-	}
-	req.Header.Add("Accept", "application/json")
-	req.Header.Add("Content-Type", "application/json")
-	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 rsp, err
-	}
-
-	return rsp, nil
-}
-
-func (g *Gitea) patchPullRequest(ctx context.Context, wBody, wTitle *bytes.Buffer, indexPR int64) error {
-	body := map[string]string{
-		"body":  wBody.String(),
-		"title": wTitle.String(),
-	}
-	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
-	}
-
-	g.logger.Info(ctx, fmt.Sprintf("marshal body: %s", buf))
-	req, err := http.NewRequestWithContext(
-		ctx,
-		http.MethodPatch,
-		fmt.Sprintf("https://%s/api/v1/repos/%s/%s/pulls/%d", g.URL, g.Owner, g.Repository, indexPR),
-		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", "Bearer "+g.Password)
-
-	_, err = http.DefaultClient.Do(req)
-	if err != nil {
-		g.logger.Error(ctx, "failed to call http request", err)
-		return err
-	}
-
-	return nil
-}
-
-func (g *Gitea) scopeUpdateDep(ctx context.Context, path string, mod modules.Update) error {
-	epath, err := exec.LookPath("go")
-	if errors.Is(err, exec.ErrDot) {
-		err = nil
-	}
-	if err != nil {
-		g.logger.Fatal(ctx, fmt.Sprintf("failed to find go command: %v", err))
-	} // ищем go файл
-
-	var cmd *exec.Cmd
-	var out []byte
-
-	cmd = exec.CommandContext(ctx, epath, "mod", "edit", fmt.Sprintf("-droprequire=%s", mod.Module.Path))
-	if out, err = cmd.CombinedOutput(); err != nil {
-		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 {
-		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 {
-		g.logger.Error(ctx, fmt.Sprintf("failed to run go mod tidy: %s err: %v", out, err))
-		return err
-	} // пытаемся выполнить команду go mod tidy пытаемся подтянуть новую версию модуля
-
-	return nil
-}

internal/storage/postgres_tmp/storage.go

@@ -10,14 +10,14 @@ import (
 	"fmt"
 	"strings"
 
+	"go.unistack.org/pkgdash/internal/config"
+	"go.unistack.org/pkgdash/internal/models"
+	pb "go.unistack.org/pkgdash/proto"
 	"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/v3/logger"
-	"go.unistack.org/pkgdash/internal/config"
-	"go.unistack.org/pkgdash/internal/models"
-	pb "go.unistack.org/pkgdash/proto"
 )
 
 const (