Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update repository handling to use new directory struct #97

Merged
merged 3 commits into from
Jan 20, 2024
Merged

Update repository handling to use new directory struct #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b408751
:sparkles: Update parka to use the new directories for repositories
wesen Jan 20, 2024
982a22f
:arrow_up: Bump dependencies
wesen Jan 20, 2024
e2670b2
:ambulance: Fix missing parameters in NewCommandHandlerFromConfigFile
wesen Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssm v1.37.5
github.com/gin-gonic/contrib v0.0.0-20221130124618-7e01895a63f2
github.com/gin-gonic/gin v1.9.0
github.com/go-go-golems/clay v0.1.8
github.com/go-go-golems/glazed v0.5.7
github.com/go-go-golems/clay v0.1.9
github.com/go-go-golems/glazed v0.5.8
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.30.0
github.com/spf13/cobra v1.7.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH8
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-go-golems/clay v0.1.8 h1:65cxzA2T9TxjtDKfKG+1a/HhB6G/XlK+wETDybUZaD0=
github.com/go-go-golems/clay v0.1.8/go.mod h1:4DtxJs314X0tk2LT/ubIVX55k2hM8hMmmOwB5Zcd7NI=
github.com/go-go-golems/glazed v0.5.7 h1:Papb53cZnb2kDezUHYGAEdy5wjO7VkcInBbm1xIZWM8=
github.com/go-go-golems/glazed v0.5.7/go.mod h1:K1600pUk7xB/LKmvIafRWyfAdxE1sboruqQ9Jia8V9M=
github.com/go-go-golems/clay v0.1.9 h1:CveV2T+HdCIzPMeoGb8btcsXgKZuc8XUYNEJX+jn9YQ=
github.com/go-go-golems/clay v0.1.9/go.mod h1:ovEpMRRJQ3ndnoc9qKh9T+TTPAtWYvyHjupwo191GpU=
github.com/go-go-golems/glazed v0.5.8 h1:28/sBWfAgt4JYi+M3y/h27mSk5pRW2Og4Iim54fg61M=
github.com/go-go-golems/glazed v0.5.8/go.mod h1:K1600pUk7xB/LKmvIafRWyfAdxE1sboruqQ9Jia8V9M=
github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
github.com/go-openapi/strfmt v0.21.7 h1:rspiXgNWgeUzhjo1YU01do6qsahtJNByjLVbPLNHb8k=
Expand Down
2 changes: 1 addition & 1 deletion pkg/handlers/command/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func NewCommandHandlerFromConfig(
}

cmds_, err := loaders.LoadCommandsFromFS(
fs_, filePath,
fs_, filePath, config_.File,
loader, []cmds.CommandDescriptionOption{}, []alias.Option{})
if err != nil {
return nil, errors.Wrap(err, "failed to load commands from file")
Expand Down
13 changes: 11 additions & 2 deletions pkg/handlers/config-file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,18 @@ func NewRepositoryFactoryFromReaderLoaders(
fsLoader loaders.CommandLoader,
) RepositoryFactory {
return func(dirs []string) (*repositories.Repository, error) {
directories := []repositories.Directory{}
for _, dir := range dirs {
directories = append(directories, repositories.Directory{
FS: os.DirFS(dir),
RootDirectory: ".",
RootDocDirectory: "doc",
Name: dir,
SourcePrefix: "file",
})
}
r := repositories.NewRepository(
repositories.WithFS(os.DirFS(".")),
repositories.WithDirectories(dirs...),
repositories.WithDirectories(directories...),
repositories.WithUpdateCallback(func(cmd cmds.Command) error {
description := cmd.Description()
log.Info().Str("name", description.Name).
Expand Down