Implemented --no-vendor

Signed-off-by: Richard Jones <richard@dagger.io>
This commit is contained in:
Richard Jones 2022-02-14 14:26:37 -07:00
parent eee71d0382
commit 071c3bafe1
No known key found for this signature in database
GPG Key ID: CFB3A382EB166F4C
2 changed files with 8 additions and 3 deletions

View File

@ -146,6 +146,7 @@ func europaUp(ctx context.Context, cl *client.Client, args ...string) error {
Args: args, Args: args,
With: viper.GetStringSlice("with"), With: viper.GetStringSlice("with"),
Target: viper.GetString("target"), Target: viper.GetString("target"),
Vendor: !viper.GetBool("no-vendor"),
}) })
if err != nil { if err != nil {
lg.Fatal().Err(err).Msg("failed to load plan") lg.Fatal().Err(err).Msg("failed to load plan")
@ -226,6 +227,7 @@ func init() {
upCmd.Flags().String("output", "", "Write computed output. Prints on stdout if set to-") upCmd.Flags().String("output", "", "Write computed output. Prints on stdout if set to-")
upCmd.Flags().StringArrayP("with", "w", []string{}, "") upCmd.Flags().StringArrayP("with", "w", []string{}, "")
upCmd.Flags().StringP("target", "t", "", "Run a single target of the DAG (for debugging only)") upCmd.Flags().StringP("target", "t", "", "Run a single target of the DAG (for debugging only)")
upCmd.Flags().Bool("no-vendor", false, "Force up, disable inputs check")
if err := viper.BindPFlags(upCmd.Flags()); err != nil { if err := viper.BindPFlags(upCmd.Flags()); err != nil {
panic(err) panic(err)

View File

@ -29,15 +29,18 @@ type Config struct {
Args []string Args []string
With []string With []string
Target string Target string
Vendor bool
} }
func Load(ctx context.Context, cfg Config) (*Plan, error) { func Load(ctx context.Context, cfg Config) (*Plan, error) {
log.Ctx(ctx).Debug().Interface("args", cfg.Args).Msg("loading plan") log.Ctx(ctx).Debug().Interface("args", cfg.Args).Msg("loading plan")
if cfg.Vendor {
// FIXME: vendoring path // FIXME: vendoring path
if err := pkg.Vendor(ctx, ""); err != nil { if err := pkg.Vendor(ctx, ""); err != nil {
return nil, err return nil, err
} }
}
v, err := compiler.Build("", nil, cfg.Args...) v, err := compiler.Build("", nil, cfg.Args...)
if err != nil { if err != nil {