Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/cli-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
pull_request:
paths:
- ".github/workflows/cli-e2e-tests.yml"
- "cmd/hatchet-cli/cli/templates/**"
- "cmd/hatchet-cli/cli/quickstart.go"
- "cmd/hatchet-cli/cli/internal/templater/**"
- "cmd/hatchet-cli/cli/quickstart_e2e_test.go"
Expand All @@ -17,7 +16,6 @@ on:
- main
paths:
- ".github/workflows/cli-e2e-tests.yml"
- "cmd/hatchet-cli/cli/templates/**"
- "cmd/hatchet-cli/cli/quickstart.go"
- "cmd/hatchet-cli/cli/internal/templater/**"
- "cmd/hatchet-cli/cli/quickstart_e2e_test.go"
Expand Down
11 changes: 5 additions & 6 deletions cmd/hatchet-cli/cli/quickstart.go
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
package cli

import (
"embed"
"fmt"
"os"
"strings"

"github.com/charmbracelet/huh"
"github.com/charmbracelet/lipgloss"
quickstarts "github.com/hatchet-dev/hatchet-quickstarts"
"github.com/spf13/cobra"

"github.com/hatchet-dev/hatchet/cmd/hatchet-cli/cli/internal/config/cli"
"github.com/hatchet-dev/hatchet/cmd/hatchet-cli/cli/internal/styles"
"github.com/hatchet-dev/hatchet/cmd/hatchet-cli/cli/internal/templater"
)

//go:embed all:templates/*
var content embed.FS

var quickstartCmd = &cobra.Command{
Use: "quickstart",
Short: "Generate a quickstart Hatchet worker project",
Expand Down Expand Up @@ -114,13 +111,15 @@ func GenerateQuickstart(language, packageManager, projectName, dir string) (stri
PackageManager: packageManager,
}

err := templater.ProcessMultiSource(content, language, packageManager, dir, templateData)
templatesFS := quickstarts.TemplatesFS()

err := templater.ProcessMultiSource(templatesFS, language, packageManager, dir, templateData)
if err != nil {
return "", fmt.Errorf("could not process templates: %w", err)
}

// Process POST_QUICKSTART.md if it exists
postQuickstart, err := templater.ProcessPostQuickstartMultiSource(content, language, packageManager, templateData)
postQuickstart, err := templater.ProcessPostQuickstartMultiSource(templatesFS, language, packageManager, templateData)
if err != nil {
return "", fmt.Errorf("could not process post-quickstart content: %w", err)
}
Expand Down
2 changes: 0 additions & 2 deletions cmd/hatchet-cli/cli/templates/go/.env.sample

This file was deleted.

3 changes: 0 additions & 3 deletions cmd/hatchet-cli/cli/templates/go/.gitignore

This file was deleted.

24 changes: 0 additions & 24 deletions cmd/hatchet-cli/cli/templates/go/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions cmd/hatchet-cli/cli/templates/go/POST_QUICKSTART.md

This file was deleted.

50 changes: 0 additions & 50 deletions cmd/hatchet-cli/cli/templates/go/README.md

This file was deleted.

26 changes: 0 additions & 26 deletions cmd/hatchet-cli/cli/templates/go/client/client.go.embed

This file was deleted.

35 changes: 0 additions & 35 deletions cmd/hatchet-cli/cli/templates/go/cmd/run/main.go.embed

This file was deleted.

36 changes: 0 additions & 36 deletions cmd/hatchet-cli/cli/templates/go/cmd/worker/main.go.embed

This file was deleted.

92 changes: 0 additions & 92 deletions cmd/hatchet-cli/cli/templates/go/go.mod.embed

This file was deleted.

Loading
Loading