rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Embed third-party data.json in seed command binary

Browse Source 
Replace the --data flag with go:embed so the dataset is baked into the
proboctl binary and the seed command needs no external file argument.

Signed-off-by: Émile Ré <emile@probo.com>
This commit is contained in:
Émile Ré
2026-05-15 08:55:24 +04:00
parent b3c67fb0e2
commit 1a9cef7a9d
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/proboctl/seed/common-third-parties/common_third_parties.go
View File

@@ -15,11 +15,12 @@
package commonthirdparties package commonthirdparties
import ( import (
"bytes"
"context" "context"
_ "embed"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"os"
"time" "time"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@@ -30,6 +31,9 @@ import (
"go.probo.inc/probo/pkg/slug" "go.probo.inc/probo/pkg/slug"
) )
//go:embed data/data.json
var dataJSON []byte
type thirdPartyData struct { type thirdPartyData struct {
Name string `json:"name"` Name string `json:"name"`
Category *string `json:"category,omitempty"` Category *string `json:"category,omitempty"`
@@ -51,12 +55,10 @@ type thirdPartyData struct {
} }
func NewCmdCommonThirdParties(f *cmdutil.Factory) *cobra.Command { func NewCmdCommonThirdParties(f *cmdutil.Factory) *cobra.Command {
var flagData string
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "common-third-parties", Use: "common-third-parties",
Short: "Seed common third parties from a data.json file", Short: "Seed common third parties",
Long: "Seed the common_third_parties table from a JSON file. " + Long: "Seed the common_third_parties table from the embedded dataset. " +
"Re-running is safe: existing rows are upserted on conflict (slug) " + "Re-running is safe: existing rows are upserted on conflict (slug) " +
"so ids and created_at are preserved.", "so ids and created_at are preserved.",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
@@ -64,7 +66,7 @@ func NewCmdCommonThirdParties(f *cmdutil.Factory) *cobra.Command {
errOut := f.IOStreams.ErrOut errOut := f.IOStreams.ErrOut
ctx := cmd.Context() ctx := cmd.Context()
thirdParties, err := loadThirdParties(flagData) thirdParties, err := loadThirdParties()
if err != nil { if err != nil {
return fmt.Errorf("cannot load third-party data: %w", err) return fmt.Errorf("cannot load third-party data: %w", err)
} }
@@ -74,7 +76,7 @@ func NewCmdCommonThirdParties(f *cmdutil.Factory) *cobra.Command {
return fmt.Errorf("cannot create pg client: %w", err) return fmt.Errorf("cannot create pg client: %w", err)
} }
_, _ = fmt.Fprintf(out, "seeding %d common third parties from %s\n", len(thirdParties), flagData) _, _ = fmt.Fprintf(out, "seeding %d common third parties\n", len(thirdParties))
var inserted, updated, domainsInserted, domainsUpdated int var inserted, updated, domainsInserted, domainsUpdated int
@@ -156,25 +158,17 @@ func NewCmdCommonThirdParties(f *cmdutil.Factory) *cobra.Command {
}, },
} }
cmd.Flags().StringVar(&flagData, "data", "", "Path to the third-party data.json file")
_ = cmd.MarkFlagRequired("data")
return cmd return cmd
} }
func loadThirdParties(path string) ([]thirdPartyData, error) { func loadThirdParties() ([]thirdPartyData, error) {
f, err := os.Open(path)
if err != nil {
return nil, fmt.Errorf("cannot open %s: %w", path, err)
}
defer func() { _ = f.Close() }()
var thirdParties []thirdPartyData var thirdParties []thirdPartyData
dec := json.NewDecoder(f)
dec := json.NewDecoder(bytes.NewReader(dataJSON))
dec.DisallowUnknownFields() dec.DisallowUnknownFields()
if err := dec.Decode(&thirdParties); err != nil { if err := dec.Decode(&thirdParties); err != nil {
return nil, fmt.Errorf("cannot decode %s: %w", path, err) return nil, fmt.Errorf("cannot decode embedded data.json: %w", err)
} }
return thirdParties, nil return thirdParties, nil