changed workspace to project
Signed-off-by: Richard Jones <richard@dagger.io>
This commit is contained in:
parent
541c8c078f
commit
7061ac816e
@ -13,37 +13,37 @@ import (
|
|||||||
"go.dagger.io/dagger/state"
|
"go.dagger.io/dagger/state"
|
||||||
)
|
)
|
||||||
|
|
||||||
func CurrentWorkspace(ctx context.Context) *state.Workspace {
|
func CurrentProject(ctx context.Context) *state.Project {
|
||||||
lg := log.Ctx(ctx)
|
lg := log.Ctx(ctx)
|
||||||
|
|
||||||
if workspacePath := viper.GetString("workspace"); workspacePath != "" {
|
if projectPath := viper.GetString("project"); projectPath != "" {
|
||||||
workspace, err := state.Open(ctx, workspacePath)
|
project, err := state.Open(ctx, projectPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.
|
lg.
|
||||||
Fatal().
|
Fatal().
|
||||||
Err(err).
|
Err(err).
|
||||||
Str("path", workspacePath).
|
Str("path", projectPath).
|
||||||
Msg("failed to open workspace")
|
Msg("failed to open project")
|
||||||
}
|
}
|
||||||
return workspace
|
return project
|
||||||
}
|
}
|
||||||
|
|
||||||
workspace, err := state.Current(ctx)
|
project, err := state.Current(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.
|
lg.
|
||||||
Fatal().
|
Fatal().
|
||||||
Err(err).
|
Err(err).
|
||||||
Msg("failed to determine current workspace")
|
Msg("failed to determine current project")
|
||||||
}
|
}
|
||||||
return workspace
|
return project
|
||||||
}
|
}
|
||||||
|
|
||||||
func CurrentEnvironmentState(ctx context.Context, workspace *state.Workspace) *state.State {
|
func CurrentEnvironmentState(ctx context.Context, project *state.Project) *state.State {
|
||||||
lg := log.Ctx(ctx)
|
lg := log.Ctx(ctx)
|
||||||
|
|
||||||
environmentName := viper.GetString("environment")
|
environmentName := viper.GetString("environment")
|
||||||
if environmentName != "" {
|
if environmentName != "" {
|
||||||
st, err := workspace.Get(ctx, environmentName)
|
st, err := project.Get(ctx, environmentName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.
|
lg.
|
||||||
Fatal().
|
Fatal().
|
||||||
@ -53,7 +53,7 @@ func CurrentEnvironmentState(ctx context.Context, workspace *state.Workspace) *s
|
|||||||
return st
|
return st
|
||||||
}
|
}
|
||||||
|
|
||||||
environments, err := workspace.List(ctx)
|
environments, err := project.List(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.
|
lg.
|
||||||
Fatal().
|
Fatal().
|
||||||
@ -76,7 +76,7 @@ func CurrentEnvironmentState(ctx context.Context, workspace *state.Workspace) *s
|
|||||||
Fatal().
|
Fatal().
|
||||||
Err(err).
|
Err(err).
|
||||||
Strs("environments", envNames).
|
Strs("environments", envNames).
|
||||||
Msg("multiple environments available in the workspace, select one with `--environment`")
|
Msg("multiple environments available in the project, select one with `--environment`")
|
||||||
}
|
}
|
||||||
|
|
||||||
return environments[0]
|
return environments[0]
|
||||||
|
@ -32,9 +32,9 @@ func commandName(cmd *cobra.Command) string {
|
|||||||
return strings.Join(parts, " ")
|
return strings.Join(parts, " ")
|
||||||
}
|
}
|
||||||
|
|
||||||
// TrackWorkspaceCommand is like TrackCommand but includes workspace and
|
// TrackProjectCommand is like TrackCommand but includes project and
|
||||||
// optionally environment metadata.
|
// optionally environment metadata.
|
||||||
func TrackWorkspaceCommand(ctx context.Context, cmd *cobra.Command, w *state.Workspace, env *state.State, props ...*telemetry.Property) chan struct{} {
|
func TrackProjectCommand(ctx context.Context, cmd *cobra.Command, w *state.Project, env *state.State, props ...*telemetry.Property) chan struct{} {
|
||||||
props = append([]*telemetry.Property{
|
props = append([]*telemetry.Property{
|
||||||
{
|
{
|
||||||
// Hash the repository URL for privacy
|
// Hash the repository URL for privacy
|
||||||
@ -42,8 +42,8 @@ func TrackWorkspaceCommand(ctx context.Context, cmd *cobra.Command, w *state.Wor
|
|||||||
Value: hash(gitRepoURL(w.Path)),
|
Value: hash(gitRepoURL(w.Path)),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// The workspace path might contain the username (e.g. /home/user/workspace), so we hash itfor privacy.
|
// The project path might contain the username (e.g. /home/user/project), so we hash itfor privacy.
|
||||||
Name: "workspace_path_hash",
|
Name: "project_path_hash",
|
||||||
Value: hash(w.Path),
|
Value: hash(w.Path),
|
||||||
},
|
},
|
||||||
}, props...)
|
}, props...)
|
||||||
|
@ -34,14 +34,14 @@ var editCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
st := common.CurrentEnvironmentState(ctx, workspace)
|
st := common.CurrentEnvironmentState(ctx, project)
|
||||||
|
|
||||||
lg = lg.With().
|
lg = lg.With().
|
||||||
Str("environment", st.Name).
|
Str("environment", st.Name).
|
||||||
Logger()
|
Logger()
|
||||||
|
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, st)
|
||||||
|
|
||||||
data, err := yaml.Marshal(st)
|
data, err := yaml.Marshal(st)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -92,7 +92,7 @@ var editCmd = &cobra.Command{
|
|||||||
lg.Fatal().Err(err).Str("environment", st.Name).Msg("invalid input")
|
lg.Fatal().Err(err).Str("environment", st.Name).Msg("invalid input")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := workspace.Save(ctx, st); err != nil {
|
if err := project.Save(ctx, st); err != nil {
|
||||||
lg.Fatal().Err(err).Msg("failed to save state")
|
lg.Fatal().Err(err).Msg("failed to save state")
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -12,7 +12,7 @@ import (
|
|||||||
|
|
||||||
var initCmd = &cobra.Command{
|
var initCmd = &cobra.Command{
|
||||||
Use: "init",
|
Use: "init",
|
||||||
Short: "Initialize a new empty workspace",
|
Short: "Initialize a new empty project",
|
||||||
Args: cobra.NoArgs,
|
Args: cobra.NoArgs,
|
||||||
PreRun: func(cmd *cobra.Command, args []string) {
|
PreRun: func(cmd *cobra.Command, args []string) {
|
||||||
// Fix Viper bug for duplicate flags:
|
// Fix Viper bug for duplicate flags:
|
||||||
@ -25,7 +25,7 @@ var initCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
dir := viper.GetString("workspace")
|
dir := viper.GetString("project")
|
||||||
if dir == "" {
|
if dir == "" {
|
||||||
cwd, err := os.Getwd()
|
cwd, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -37,12 +37,12 @@ var initCmd = &cobra.Command{
|
|||||||
dir = cwd
|
dir = cwd
|
||||||
}
|
}
|
||||||
|
|
||||||
workspace, err := state.Init(ctx, dir)
|
project, err := state.Init(ctx, dir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.Fatal().Err(err).Msg("failed to initialize workspace")
|
lg.Fatal().Err(err).Msg("failed to initialize project")
|
||||||
}
|
}
|
||||||
|
|
||||||
<-common.TrackWorkspaceCommand(ctx, cmd, workspace, nil)
|
<-common.TrackProjectCommand(ctx, cmd, project, nil)
|
||||||
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -37,11 +37,11 @@ var dirCmd = &cobra.Command{
|
|||||||
lg.Fatal().Err(err).Str("path", args[1]).Msg("dir doesn't exists")
|
lg.Fatal().Err(err).Str("path", args[1]).Msg("dir doesn't exists")
|
||||||
}
|
}
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
if !strings.HasPrefix(p, workspace.Path) {
|
if !strings.HasPrefix(p, project.Path) {
|
||||||
lg.Fatal().Err(err).Str("path", args[1]).Msg("dir is outside the workspace")
|
lg.Fatal().Err(err).Str("path", args[1]).Msg("dir is outside the project")
|
||||||
}
|
}
|
||||||
p, err = filepath.Rel(workspace.Path, p)
|
p, err = filepath.Rel(project.Path, p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.Fatal().Err(err).Str("path", args[1]).Msg("unable to resolve path")
|
lg.Fatal().Err(err).Str("path", args[1]).Msg("unable to resolve path")
|
||||||
}
|
}
|
||||||
|
@ -32,14 +32,14 @@ var listCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
st := common.CurrentEnvironmentState(ctx, workspace)
|
st := common.CurrentEnvironmentState(ctx, project)
|
||||||
|
|
||||||
lg = lg.With().
|
lg = lg.With().
|
||||||
Str("environment", st.Name).
|
Str("environment", st.Name).
|
||||||
Logger()
|
Logger()
|
||||||
|
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, st)
|
||||||
|
|
||||||
c := common.NewClient(ctx)
|
c := common.NewClient(ctx)
|
||||||
err := c.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
|
err := c.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
|
||||||
|
@ -40,14 +40,14 @@ func init() {
|
|||||||
func updateEnvironmentInput(ctx context.Context, cmd *cobra.Command, target string, input state.Input) {
|
func updateEnvironmentInput(ctx context.Context, cmd *cobra.Command, target string, input state.Input) {
|
||||||
lg := *log.Ctx(ctx)
|
lg := *log.Ctx(ctx)
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
st := common.CurrentEnvironmentState(ctx, workspace)
|
st := common.CurrentEnvironmentState(ctx, project)
|
||||||
|
|
||||||
lg = lg.With().
|
lg = lg.With().
|
||||||
Str("environment", st.Name).
|
Str("environment", st.Name).
|
||||||
Logger()
|
Logger()
|
||||||
|
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st, &telemetry.Property{
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, st, &telemetry.Property{
|
||||||
Name: "input_target",
|
Name: "input_target",
|
||||||
Value: target,
|
Value: target,
|
||||||
})
|
})
|
||||||
@ -71,7 +71,7 @@ func updateEnvironmentInput(ctx context.Context, cmd *cobra.Command, target stri
|
|||||||
lg.Fatal().Err(err).Msg("invalid input")
|
lg.Fatal().Err(err).Msg("invalid input")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := workspace.Save(ctx, st); err != nil {
|
if err := project.Save(ctx, st); err != nil {
|
||||||
lg.Fatal().Err(err).Msg("cannot update environment")
|
lg.Fatal().Err(err).Msg("cannot update environment")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,11 +22,11 @@ var unsetCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
st := common.CurrentEnvironmentState(ctx, workspace)
|
st := common.CurrentEnvironmentState(ctx, project)
|
||||||
st.RemoveInputs(args[0])
|
st.RemoveInputs(args[0])
|
||||||
|
|
||||||
if err := workspace.Save(ctx, st); err != nil {
|
if err := project.Save(ctx, st); err != nil {
|
||||||
lg.Fatal().Err(err).Str("environment", st.Name).Msg("cannot update environment")
|
lg.Fatal().Err(err).Str("environment", st.Name).Msg("cannot update environment")
|
||||||
}
|
}
|
||||||
lg.Info().Str("environment", st.Name).Msg("updated environment")
|
lg.Info().Str("environment", st.Name).Msg("updated environment")
|
||||||
|
@ -29,10 +29,10 @@ var listCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, nil)
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, nil)
|
||||||
|
|
||||||
environments, err := workspace.List(ctx)
|
environments, err := project.List(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.
|
lg.
|
||||||
Fatal().
|
Fatal().
|
||||||
|
@ -24,11 +24,11 @@ const tmpBasePath = "./cue.mod/tmp"
|
|||||||
type file struct {
|
type file struct {
|
||||||
require []*require
|
require []*require
|
||||||
|
|
||||||
workspacePath string
|
projectPath string
|
||||||
}
|
}
|
||||||
|
|
||||||
func readPath(workspacePath string) (*file, error) {
|
func readPath(projectPath string) (*file, error) {
|
||||||
p := path.Join(workspacePath, filePath)
|
p := path.Join(projectPath, filePath)
|
||||||
|
|
||||||
f, err := os.Open(p)
|
f, err := os.Open(p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -47,7 +47,7 @@ func readPath(workspacePath string) (*file, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
modFile.workspacePath = workspacePath
|
modFile.projectPath = projectPath
|
||||||
|
|
||||||
return modFile, nil
|
return modFile, nil
|
||||||
}
|
}
|
||||||
@ -102,7 +102,7 @@ func nonEmptyLines(b []byte) []string {
|
|||||||
func (f *file) processRequire(req *require, upgrade bool) (bool, error) {
|
func (f *file) processRequire(req *require, upgrade bool) (bool, error) {
|
||||||
var isNew bool
|
var isNew bool
|
||||||
|
|
||||||
tmpPath := path.Join(f.workspacePath, tmpBasePath, req.repo)
|
tmpPath := path.Join(f.projectPath, tmpBasePath, req.repo)
|
||||||
if err := os.MkdirAll(tmpPath, 0755); err != nil {
|
if err := os.MkdirAll(tmpPath, 0755); err != nil {
|
||||||
return false, fmt.Errorf("error creating tmp dir for cloning package")
|
return false, fmt.Errorf("error creating tmp dir for cloning package")
|
||||||
}
|
}
|
||||||
@ -117,7 +117,7 @@ func (f *file) processRequire(req *require, upgrade bool) (bool, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
existing := f.search(req)
|
existing := f.search(req)
|
||||||
destPath := path.Join(f.workspacePath, destBasePath)
|
destPath := path.Join(f.projectPath, destBasePath)
|
||||||
|
|
||||||
// requirement is new, so we should move the files and add it to the mod file
|
// requirement is new, so we should move the files and add it to the mod file
|
||||||
if existing == nil {
|
if existing == nil {
|
||||||
@ -167,7 +167,7 @@ func (f *file) processRequire(req *require, upgrade bool) (bool, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (f *file) write() error {
|
func (f *file) write() error {
|
||||||
return ioutil.WriteFile(path.Join(f.workspacePath, filePath), f.contents().Bytes(), 0600)
|
return ioutil.WriteFile(path.Join(f.projectPath, filePath), f.contents().Bytes(), 0600)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *file) contents() *bytes.Buffer {
|
func (f *file) contents() *bytes.Buffer {
|
||||||
|
@ -25,15 +25,15 @@ var getCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
st := common.CurrentEnvironmentState(ctx, workspace)
|
st := common.CurrentEnvironmentState(ctx, project)
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st, &telemetry.Property{
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, st, &telemetry.Property{
|
||||||
Name: "packages",
|
Name: "packages",
|
||||||
Value: args,
|
Value: args,
|
||||||
})
|
})
|
||||||
|
|
||||||
// read mod file in the current dir
|
// read mod file in the current dir
|
||||||
modFile, err := readPath(workspace.Path)
|
modFile, err := readPath(project.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
lg.Fatal().Err(err).Msg("error loading module file")
|
lg.Fatal().Err(err).Msg("error loading module file")
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ var newCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
|
|
||||||
if viper.GetString("environment") != "" {
|
if viper.GetString("environment") != "" {
|
||||||
lg.
|
lg.
|
||||||
@ -32,7 +32,7 @@ var newCmd = &cobra.Command{
|
|||||||
}
|
}
|
||||||
name := args[0]
|
name := args[0]
|
||||||
|
|
||||||
st, err := workspace.Create(ctx, name, state.Plan{
|
st, err := project.Create(ctx, name, state.Plan{
|
||||||
Package: viper.GetString("package"),
|
Package: viper.GetString("package"),
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ var newCmd = &cobra.Command{
|
|||||||
lg.Fatal().Err(err).Msg("failed to create environment")
|
lg.Fatal().Err(err).Msg("failed to create environment")
|
||||||
}
|
}
|
||||||
|
|
||||||
<-common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
|
<-common.TrackProjectCommand(ctx, cmd, project, st)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,14 +31,14 @@ var listCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
st := common.CurrentEnvironmentState(ctx, workspace)
|
st := common.CurrentEnvironmentState(ctx, project)
|
||||||
|
|
||||||
lg = lg.With().
|
lg = lg.With().
|
||||||
Str("environment", st.Name).
|
Str("environment", st.Name).
|
||||||
Logger()
|
Logger()
|
||||||
|
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, st)
|
||||||
|
|
||||||
cl := common.NewClient(ctx)
|
cl := common.NewClient(ctx)
|
||||||
err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
|
err := cl.Do(ctx, st, func(ctx context.Context, env *environment.Environment, s solver.Solver) error {
|
||||||
|
@ -27,8 +27,8 @@ var queryCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
state := common.CurrentEnvironmentState(ctx, workspace)
|
state := common.CurrentEnvironmentState(ctx, project)
|
||||||
|
|
||||||
lg = lg.With().
|
lg = lg.With().
|
||||||
Str("environment", state.Name).
|
Str("environment", state.Name).
|
||||||
@ -40,7 +40,7 @@ var queryCmd = &cobra.Command{
|
|||||||
cuePath = cue.ParsePath(args[0])
|
cuePath = cue.ParsePath(args[0])
|
||||||
}
|
}
|
||||||
|
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, state)
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, state)
|
||||||
|
|
||||||
cueVal := compiler.NewValue()
|
cueVal := compiler.NewValue()
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ func init() {
|
|||||||
"External cache sources (eg. user/app:cache, type=local,src=path/to/dir)")
|
"External cache sources (eg. user/app:cache, type=local,src=path/to/dir)")
|
||||||
|
|
||||||
rootCmd.PersistentFlags().StringP("environment", "e", "", "Select an environment")
|
rootCmd.PersistentFlags().StringP("environment", "e", "", "Select an environment")
|
||||||
rootCmd.PersistentFlags().StringP("workspace", "w", "", "Specify a workspace (defaults to current git repository)")
|
rootCmd.PersistentFlags().String("project", "", "Specify a project directory (defaults to current)")
|
||||||
|
|
||||||
rootCmd.PersistentPreRun = func(cmd *cobra.Command, _ []string) {
|
rootCmd.PersistentPreRun = func(cmd *cobra.Command, _ []string) {
|
||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
|
@ -34,14 +34,14 @@ var upCmd = &cobra.Command{
|
|||||||
lg := logger.New()
|
lg := logger.New()
|
||||||
ctx := lg.WithContext(cmd.Context())
|
ctx := lg.WithContext(cmd.Context())
|
||||||
|
|
||||||
workspace := common.CurrentWorkspace(ctx)
|
project := common.CurrentProject(ctx)
|
||||||
st := common.CurrentEnvironmentState(ctx, workspace)
|
st := common.CurrentEnvironmentState(ctx, project)
|
||||||
|
|
||||||
lg = lg.With().
|
lg = lg.With().
|
||||||
Str("environment", st.Name).
|
Str("environment", st.Name).
|
||||||
Logger()
|
Logger()
|
||||||
|
|
||||||
doneCh := common.TrackWorkspaceCommand(ctx, cmd, workspace, st)
|
doneCh := common.TrackProjectCommand(ctx, cmd, project, st)
|
||||||
|
|
||||||
cl := common.NewClient(ctx)
|
cl := common.NewClient(ctx)
|
||||||
|
|
||||||
@ -56,7 +56,7 @@ var upCmd = &cobra.Command{
|
|||||||
}
|
}
|
||||||
|
|
||||||
st.Computed = env.Computed().JSON().PrettyString()
|
st.Computed = env.Computed().JSON().PrettyString()
|
||||||
if err := workspace.Save(ctx, st); err != nil {
|
if err := project.Save(ctx, st); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,10 +108,10 @@ func (dir dirInput) Compile(_ string, state *State) (*compiler.Value, error) {
|
|||||||
|
|
||||||
p := dir.Path
|
p := dir.Path
|
||||||
if !filepath.IsAbs(p) {
|
if !filepath.IsAbs(p) {
|
||||||
p = filepath.Clean(path.Join(state.Workspace, dir.Path))
|
p = filepath.Clean(path.Join(state.Project, dir.Path))
|
||||||
}
|
}
|
||||||
if !strings.HasPrefix(p, state.Workspace) {
|
if !strings.HasPrefix(p, state.Project) {
|
||||||
return nil, fmt.Errorf("%q is outside the workspace", dir.Path)
|
return nil, fmt.Errorf("%q is outside the project", dir.Path)
|
||||||
}
|
}
|
||||||
|
|
||||||
llb := fmt.Sprintf(
|
llb := fmt.Sprintf(
|
||||||
|
@ -32,11 +32,11 @@ const (
|
|||||||
computedFile = "computed.json"
|
computedFile = "computed.json"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Workspace struct {
|
type Project struct {
|
||||||
Path string
|
Path string
|
||||||
}
|
}
|
||||||
|
|
||||||
func Init(ctx context.Context, dir string) (*Workspace, error) {
|
func Init(ctx context.Context, dir string) (*Project, error) {
|
||||||
root, err := filepath.Abs(dir)
|
root, err := filepath.Abs(dir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -57,12 +57,12 @@ func Init(ctx context.Context, dir string) (*Workspace, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return &Workspace{
|
return &Project{
|
||||||
Path: root,
|
Path: root,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func Open(ctx context.Context, dir string) (*Workspace, error) {
|
func Open(ctx context.Context, dir string) (*Project, error) {
|
||||||
_, err := os.Stat(path.Join(dir, daggerDir))
|
_, err := os.Stat(path.Join(dir, daggerDir))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, os.ErrNotExist) {
|
if errors.Is(err, os.ErrNotExist) {
|
||||||
@ -76,12 +76,12 @@ func Open(ctx context.Context, dir string) (*Workspace, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return &Workspace{
|
return &Project{
|
||||||
Path: root,
|
Path: root,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func Current(ctx context.Context) (*Workspace, error) {
|
func Current(ctx context.Context) (*Project, error) {
|
||||||
current, err := os.Getwd()
|
current, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -103,11 +103,11 @@ func Current(ctx context.Context) (*Workspace, error) {
|
|||||||
return nil, ErrNotInit
|
return nil, ErrNotInit
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *Workspace) envPath(name string) string {
|
func (w *Project) envPath(name string) string {
|
||||||
return path.Join(w.Path, daggerDir, envDir, name)
|
return path.Join(w.Path, daggerDir, envDir, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *Workspace) List(ctx context.Context) ([]*State, error) {
|
func (w *Project) List(ctx context.Context) ([]*State, error) {
|
||||||
var (
|
var (
|
||||||
environments = []*State{}
|
environments = []*State{}
|
||||||
err error
|
err error
|
||||||
@ -139,7 +139,7 @@ func (w *Workspace) List(ctx context.Context) ([]*State, error) {
|
|||||||
return environments, nil
|
return environments, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *Workspace) Get(ctx context.Context, name string) (*State, error) {
|
func (w *Project) Get(ctx context.Context, name string) (*State, error) {
|
||||||
envPath, err := filepath.Abs(w.envPath(name))
|
envPath, err := filepath.Abs(w.envPath(name))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -179,7 +179,7 @@ func (w *Workspace) Get(ctx context.Context, name string) (*State, error) {
|
|||||||
st.Plan.Module = planRelPath
|
st.Plan.Module = planRelPath
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
st.Workspace = w.Path
|
st.Project = w.Path
|
||||||
|
|
||||||
computed, err := os.ReadFile(path.Join(envPath, stateDir, computedFile))
|
computed, err := os.ReadFile(path.Join(envPath, stateDir, computedFile))
|
||||||
if err == nil {
|
if err == nil {
|
||||||
@ -189,7 +189,7 @@ func (w *Workspace) Get(ctx context.Context, name string) (*State, error) {
|
|||||||
return &st, nil
|
return &st, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *Workspace) Save(ctx context.Context, st *State) error {
|
func (w *Project) Save(ctx context.Context, st *State) error {
|
||||||
data, err := yaml.Marshal(st)
|
data, err := yaml.Marshal(st)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -234,7 +234,7 @@ func (w *Workspace) Save(ctx context.Context, st *State) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *Workspace) Create(ctx context.Context, name string, plan Plan) (*State, error) {
|
func (w *Project) Create(ctx context.Context, name string, plan Plan) (*State, error) {
|
||||||
if _, err := w.Get(ctx, name); err == nil {
|
if _, err := w.Get(ctx, name); err == nil {
|
||||||
return nil, ErrExist
|
return nil, ErrExist
|
||||||
}
|
}
|
||||||
@ -257,8 +257,8 @@ func (w *Workspace) Create(ctx context.Context, name string, plan Plan) (*State,
|
|||||||
manifestPath := path.Join(envPath, manifestFile)
|
manifestPath := path.Join(envPath, manifestFile)
|
||||||
|
|
||||||
st := &State{
|
st := &State{
|
||||||
Path: envPath,
|
Path: envPath,
|
||||||
Workspace: w.Path,
|
Project: w.Path,
|
||||||
Plan: Plan{
|
Plan: Plan{
|
||||||
Package: pkg,
|
Package: pkg,
|
||||||
},
|
},
|
||||||
@ -293,7 +293,7 @@ func (w *Workspace) Create(ctx context.Context, name string, plan Plan) (*State,
|
|||||||
return st, nil
|
return st, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *Workspace) cleanPackageName(ctx context.Context, pkg string) (string, error) {
|
func (w *Project) cleanPackageName(ctx context.Context, pkg string) (string, error) {
|
||||||
lg := log.
|
lg := log.
|
||||||
Ctx(ctx).
|
Ctx(ctx).
|
||||||
With().
|
With().
|
||||||
@ -325,7 +325,7 @@ func (w *Workspace) cleanPackageName(ctx context.Context, pkg string) (string, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !strings.HasPrefix(p, w.Path) {
|
if !strings.HasPrefix(p, w.Path) {
|
||||||
lg.Fatal().Err(err).Msg("package is outside the workspace")
|
lg.Fatal().Err(err).Msg("package is outside the project")
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
@ -12,7 +12,7 @@ import (
|
|||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestWorkspace(t *testing.T) {
|
func TestProject(t *testing.T) {
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
|
|
||||||
keychain.EnsureDefaultKey(ctx)
|
keychain.EnsureDefaultKey(ctx)
|
||||||
@ -25,39 +25,39 @@ func TestWorkspace(t *testing.T) {
|
|||||||
require.ErrorIs(t, ErrNotInit, err)
|
require.ErrorIs(t, ErrNotInit, err)
|
||||||
|
|
||||||
// Init
|
// Init
|
||||||
workspace, err := Init(ctx, root)
|
project, err := Init(ctx, root)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, root, workspace.Path)
|
require.Equal(t, root, project.Path)
|
||||||
|
|
||||||
// Create
|
// Create
|
||||||
st, err := workspace.Create(ctx, "test", Plan{
|
st, err := project.Create(ctx, "test", Plan{
|
||||||
Module: ".",
|
Module: ".",
|
||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, "test", st.Name)
|
require.Equal(t, "test", st.Name)
|
||||||
|
|
||||||
// Open
|
// Open
|
||||||
workspace, err = Open(ctx, root)
|
project, err = Open(ctx, root)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, root, workspace.Path)
|
require.Equal(t, root, project.Path)
|
||||||
|
|
||||||
// List
|
// List
|
||||||
envs, err := workspace.List(ctx)
|
envs, err := project.List(ctx)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Len(t, envs, 1)
|
require.Len(t, envs, 1)
|
||||||
require.Equal(t, "test", envs[0].Name)
|
require.Equal(t, "test", envs[0].Name)
|
||||||
|
|
||||||
// Get
|
// Get
|
||||||
env, err := workspace.Get(ctx, "test")
|
env, err := project.Get(ctx, "test")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, "test", env.Name)
|
require.Equal(t, "test", env.Name)
|
||||||
|
|
||||||
// Save
|
// Save
|
||||||
require.NoError(t, env.SetInput("foo", TextInput("bar")))
|
require.NoError(t, env.SetInput("foo", TextInput("bar")))
|
||||||
require.NoError(t, workspace.Save(ctx, env))
|
require.NoError(t, project.Save(ctx, env))
|
||||||
workspace, err = Open(ctx, root)
|
project, err = Open(ctx, root)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
env, err = workspace.Get(ctx, "test")
|
env, err = project.Get(ctx, "test")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Contains(t, env.Inputs, "foo")
|
require.Contains(t, env.Inputs, "foo")
|
||||||
}
|
}
|
||||||
@ -77,28 +77,28 @@ func TestEncryption(t *testing.T) {
|
|||||||
|
|
||||||
root, err := os.MkdirTemp(os.TempDir(), "dagger-*")
|
root, err := os.MkdirTemp(os.TempDir(), "dagger-*")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
workspace, err := Init(ctx, root)
|
project, err := Init(ctx, root)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
_, err = workspace.Create(ctx, "test", Plan{
|
_, err = project.Create(ctx, "test", Plan{
|
||||||
Module: ".",
|
Module: ".",
|
||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Set a plaintext input, make sure it is not encrypted
|
// Set a plaintext input, make sure it is not encrypted
|
||||||
st, err := workspace.Get(ctx, "test")
|
st, err := project.Get(ctx, "test")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, st.SetInput("plain", TextInput("plain")))
|
require.NoError(t, st.SetInput("plain", TextInput("plain")))
|
||||||
require.NoError(t, workspace.Save(ctx, st))
|
require.NoError(t, project.Save(ctx, st))
|
||||||
o := readManifest(st)
|
o := readManifest(st)
|
||||||
require.Contains(t, o.Inputs, "plain")
|
require.Contains(t, o.Inputs, "plain")
|
||||||
require.Equal(t, "plain", string(*o.Inputs["plain"].Text))
|
require.Equal(t, "plain", string(*o.Inputs["plain"].Text))
|
||||||
|
|
||||||
// Set a secret input, make sure it's encrypted
|
// Set a secret input, make sure it's encrypted
|
||||||
st, err = workspace.Get(ctx, "test")
|
st, err = project.Get(ctx, "test")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, st.SetInput("secret", SecretInput("secret")))
|
require.NoError(t, st.SetInput("secret", SecretInput("secret")))
|
||||||
require.NoError(t, workspace.Save(ctx, st))
|
require.NoError(t, project.Save(ctx, st))
|
||||||
o = readManifest(st)
|
o = readManifest(st)
|
||||||
require.Contains(t, o.Inputs, "secret")
|
require.Contains(t, o.Inputs, "secret")
|
||||||
secretValue := string(*o.Inputs["secret"].Secret)
|
secretValue := string(*o.Inputs["secret"].Secret)
|
||||||
@ -106,10 +106,10 @@ func TestEncryption(t *testing.T) {
|
|||||||
require.True(t, strings.HasPrefix(secretValue, "ENC["))
|
require.True(t, strings.HasPrefix(secretValue, "ENC["))
|
||||||
|
|
||||||
// Change another input, make sure our secret didn't change
|
// Change another input, make sure our secret didn't change
|
||||||
st, err = workspace.Get(ctx, "test")
|
st, err = project.Get(ctx, "test")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, st.SetInput("plain", TextInput("different")))
|
require.NoError(t, st.SetInput("plain", TextInput("different")))
|
||||||
require.NoError(t, workspace.Save(ctx, st))
|
require.NoError(t, project.Save(ctx, st))
|
||||||
o = readManifest(st)
|
o = readManifest(st)
|
||||||
require.Contains(t, o.Inputs, "plain")
|
require.Contains(t, o.Inputs, "plain")
|
||||||
require.Equal(t, "different", string(*o.Inputs["plain"].Text))
|
require.Equal(t, "different", string(*o.Inputs["plain"].Text))
|
@ -13,8 +13,8 @@ type State struct {
|
|||||||
// State path
|
// State path
|
||||||
Path string `yaml:"-"`
|
Path string `yaml:"-"`
|
||||||
|
|
||||||
// Workspace path
|
// Project path
|
||||||
Workspace string `yaml:"-"`
|
Project string `yaml:"-"`
|
||||||
|
|
||||||
// Plan
|
// Plan
|
||||||
Plan Plan `yaml:"plan,omitempty"`
|
Plan Plan `yaml:"plan,omitempty"`
|
||||||
@ -33,7 +33,7 @@ type State struct {
|
|||||||
|
|
||||||
// Cue module containing the environment plan
|
// Cue module containing the environment plan
|
||||||
func (s *State) CompilePlan(ctx context.Context) (*compiler.Value, error) {
|
func (s *State) CompilePlan(ctx context.Context) (*compiler.Value, error) {
|
||||||
w := s.Workspace
|
w := s.Project
|
||||||
// FIXME: backward compatibility
|
// FIXME: backward compatibility
|
||||||
if mod := s.Plan.Module; mod != "" {
|
if mod := s.Plan.Module; mod != "" {
|
||||||
w = path.Join(w, mod)
|
w = path.Join(w, mod)
|
||||||
@ -44,7 +44,7 @@ func (s *State) CompilePlan(ctx context.Context) (*compiler.Value, error) {
|
|||||||
// However:
|
// However:
|
||||||
// 1) As of right now, there's no way to update universe through the
|
// 1) As of right now, there's no way to update universe through the
|
||||||
// CLI, so we are lazily updating on `dagger up` using the embedded `universe`
|
// CLI, so we are lazily updating on `dagger up` using the embedded `universe`
|
||||||
// 2) For backward compatibility: if the workspace was `dagger
|
// 2) For backward compatibility: if the project was `dagger
|
||||||
// init`-ed before we added support for vendoring universe, it might not
|
// init`-ed before we added support for vendoring universe, it might not
|
||||||
// contain a `cue.mod`.
|
// contain a `cue.mod`.
|
||||||
if err := vendorUniverse(ctx, w); err != nil {
|
if err := vendorUniverse(ctx, w); err != nil {
|
||||||
@ -83,11 +83,11 @@ func (s *State) CompileInputs() (*compiler.Value, error) {
|
|||||||
|
|
||||||
// VendorUniverse vendors the latest (built-in) version of the universe into the
|
// VendorUniverse vendors the latest (built-in) version of the universe into the
|
||||||
// environment's `cue.mod`.
|
// environment's `cue.mod`.
|
||||||
// FIXME: This has nothing to do in `State` and should be tied to a `Workspace`.
|
// FIXME: This has nothing to do in `State` and should be tied to a `Project`.
|
||||||
// However, since environments could point to different modules before, we have
|
// However, since environments could point to different modules before, we have
|
||||||
// to handle vendoring on a per environment basis.
|
// to handle vendoring on a per environment basis.
|
||||||
func (s *State) VendorUniverse(ctx context.Context) error {
|
func (s *State) VendorUniverse(ctx context.Context) error {
|
||||||
w := s.Workspace
|
w := s.Project
|
||||||
// FIXME: backward compatibility
|
// FIXME: backward compatibility
|
||||||
if mod := s.Plan.Module; mod != "" {
|
if mod := s.Plan.Module; mod != "" {
|
||||||
w = path.Join(w, mod)
|
w = path.Join(w, mod)
|
||||||
|
Reference in New Issue
Block a user