git-pr

created pr with 16.1 on 2024-08-18T15:28:14Z · by c8ef7d19

added 16.2 on 2024-08-18T15:31:36Z · by c8ef7d19


                      1:  3bd44da ! 1:  9002592 chore(pgs): add validation to project names

added 16.3 on 2024-08-18T16:05:53Z · by c8ef7d19


                      1:  9002592 = 1:  9002592 chore(pgs): add validation to project names


                      -:  ------- > 2:  cd17cf4 chore: update pobj


                      -:  ------- > 3:  a00def2 chore: complete impl

changed pr name to feat: private obj store service on 2024-08-18T16:06:30Z · by c8ef7d19

added 16.4 on 2024-08-18T16:39:07Z · by c8ef7d19


                      1:  9002592 = 1:  9002592 chore(pgs): add validation to project names


                      2:  cd17cf4 = 2:  cd17cf4 chore: update pobj


                      3:  a00def2 = 3:  a00def2 chore: complete impl


                      -:  ------- > 4:  0ed7dc9 chore: update pobj


                      -:  ------- > 5:  8ff1131 working!

added 16.5 on 2024-08-19T02:01:34Z · by c8ef7d19


                      1:  9002592 = 1:  9002592 chore(pgs): add validation to project names


                      2:  cd17cf4 = 2:  cd17cf4 chore: update pobj


                      3:  a00def2 = 3:  a00def2 chore: complete impl


                      4:  0ed7dc9 = 4:  0ed7dc9 chore: update pobj


                      5:  8ff1131 = 5:  8ff1131 working!


                      -:  ------- > 6:  0c8ad0d chore(obj): prep service def

cmds

checkout latest patchset:

ssh pr.pico.sh print 16 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 16.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 16

Patchset `16.4` on 2024-08-18T16:39:07Z · commit a00def2

chore(pgs): add validation to project names

Eric Bower 2024-08-18T15:27:37Z

chore: update pobj

Eric Bower 2024-08-18T15:57:19Z

→ chore: complete impl

Eric Bower 2024-08-18T16:02:22Z

chore: update pobj

Eric Bower 2024-08-18T16:33:25Z

working!

Eric Bower 2024-08-18T16:37:25Z

chore: complete impl

Eric Bower 2024-08-18T16:02:22Z

Semantic diff summary

1 added, 3 modified, 2 signature changed, 0 removed across 2 analyzed files

cmd/obj/ssh/main.go

function_declaration main added

obj/ssh.go

chunk lines 10-17 modified
type_declaration AssetNamesPriv modified
method_declaration BucketName signature changed
method_declaration ObjectName signature changed
function_declaration StartSshServer modified

+7 -0 cmd/obj/ssh/main.go #

......@@ -0,0 +1,7 @@
package main

import "github.com/picosh/pico/obj"

func main() {
	obj.StartSshServer()
}

+15 -13 obj/ssh.go #

......@@ -10,8 +10,8 @@ import (
	"syscall"
	"time"

	"github.com/charmbracelet/ssh"
	"github.com/charmbracelet/wish"
	"github.com/picosh/pico/db"
	"github.com/picosh/pico/db/postgres"
	"github.com/picosh/pico/filehandlers/util"
	"github.com/picosh/pico/shared"

......@@ -20,19 +20,20 @@ import (
	"github.com/picosh/send/send/utils"
)

type AssetNamesPriv struct {
	DBPool db.DB
}
type AssetNamesPriv struct{}

var _ pobj.AssetNames = &AssetNamesPriv{}
var _ pobj.AssetNames = (*AssetNamesPriv)(nil)

func (an *AssetNamesPriv) BucketName(userName string) string {
	user, _ := an.DBPool.FindUserForName(userName)
	return shared.GetAssetBucketName(user.ID)
func (an *AssetNamesPriv) BucketName(sesh ssh.Session) (string, error) {
	user, err := util.GetUser(sesh.Context())
	if err != nil {
		return "", err
	}
	return shared.GetAssetBucketName(user.ID), nil
}
func (an *AssetNamesPriv) ObjectName(entry *utils.FileEntry) string {
	return filepath.Join("pico-private", entry.Filepath)
func (an *AssetNamesPriv) ObjectName(sesh ssh.Session, entry *utils.FileEntry) (string, error) {
	return filepath.Join("/pico-private", entry.Filepath), nil
}

func StartSshServer() {

......@@ -50,10 +51,12 @@ func StartSshServer() {
	} else {
		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
	}

	assetNames := &AssetNamesPriv{
		DBPool: dbpool,
	if err != nil {
		logger.Error(err.Error())
		return
	}

	assetNames := &AssetNamesPriv{}
	objcfg := &pobj.Config{
		Logger:     logger,
		Storage:    st,

......@@ -61,7 +64,6 @@ func StartSshServer() {
	}

	handler := pobj.NewUploadAssetHandler(objcfg)

	sshAuth := util.NewSshAuthHandler(dbpool, logger, cfg)
	s, err := wish.NewServer(
		wish.WithAddress(fmt.Sprintf("%s:%s", host, port)),

...	...		@@ -0,0 +1,7 @@
	1	+	package main
	2	+
	3	+	import "github.com/picosh/pico/obj"
	4	+
	5	+	func main() {
	6	+	obj.StartSshServer()
	7	+	}

...	...		@@ -10,8 +10,8 @@ import (
10	10		"syscall"
11	11		"time"
12	12
	13	+	"github.com/charmbracelet/ssh"
13	14		"github.com/charmbracelet/wish"
14		-	"github.com/picosh/pico/db"
15	15		"github.com/picosh/pico/db/postgres"
16	16		"github.com/picosh/pico/filehandlers/util"
17	17		"github.com/picosh/pico/shared"

...	...		@@ -20,19 +20,20 @@ import (
20	20		"github.com/picosh/send/send/utils"
21	21		)
22	22
23		-	type AssetNamesPriv struct {
24		-	DBPool db.DB
25		-	}
	23	+	type AssetNamesPriv struct{}
26	24
27	25		var _ pobj.AssetNames = &AssetNamesPriv{}
28	26		var _ pobj.AssetNames = (*AssetNamesPriv)(nil)
29	27
30		-	func (an *AssetNamesPriv) BucketName(userName string) string {
31		-	user, _ := an.DBPool.FindUserForName(userName)
32		-	return shared.GetAssetBucketName(user.ID)
	28	+	func (an *AssetNamesPriv) BucketName(sesh ssh.Session) (string, error) {
	29	+	user, err := util.GetUser(sesh.Context())
	30	+	if err != nil {
	31	+	return "", err
	32	+	}
	33	+	return shared.GetAssetBucketName(user.ID), nil
33	34		}
34		-	func (an AssetNamesPriv) ObjectName(entry utils.FileEntry) string {
35		-	return filepath.Join("pico-private", entry.Filepath)
	35	+	func (an AssetNamesPriv) ObjectName(sesh ssh.Session, entry utils.FileEntry) (string, error) {
	36	+	return filepath.Join("/pico-private", entry.Filepath), nil
36	37		}
37	38
38	39		func StartSshServer() {

...	...		@@ -50,10 +51,12 @@ func StartSshServer() {
50	51		} else {
51	52		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
52	53		}
53		-
54		-	assetNames := &AssetNamesPriv{
55		-	DBPool: dbpool,
	54	+	if err != nil {
	55	+	logger.Error(err.Error())
	56	+	return
56	57		}
	58	+
	59	+	assetNames := &AssetNamesPriv{}
57	60		objcfg := &pobj.Config{
58	61		Logger: logger,
59	62		Storage: st,

...	...		@@ -61,7 +64,6 @@ func StartSshServer() {
61	64		}
62	65
63	66		handler := pobj.NewUploadAssetHandler(objcfg)
64		-
65	67		sshAuth := util.NewSshAuthHandler(dbpool, logger, cfg)
66	68		s, err := wish.NewServer(
67	69		wish.WithAddress(fmt.Sprintf("%s:%s", host, port)),

git-pr

Patchset 16.4 on 2024-08-18T16:39:07Z · commit a00def2

Patchset `16.4` on 2024-08-18T16:39:07Z · commit a00def2