kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Update dagger new cmd to specify architecture when creating an environment

Browse Source 
Signed-off-by: Tom Chauveau <tom.chauveau@epitech.eu>
This commit is contained in:
Tom Chauveau 2021-10-22 21:54:18 +02:00
parent caa03a37cc
commit e9de597654
No known key found for this signature in database
GPG Key ID: 3C9847D981AAC1BF
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/dagger/cmd/new.go
View File

@ -34,7 +34,7 @@ var newCmd = &cobra.Command{
st, err := project.Create(ctx, name, state.Plan{ st, err := project.Create(ctx, name, state.Plan{
Package: viper.GetString("package"), Package: viper.GetString("package"),
}) }, viper.GetString("architecture"))
if err != nil { if err != nil {
lg.Fatal().Err(err).Msg("failed to create environment") lg.Fatal().Err(err).Msg("failed to create environment")
@ -46,6 +46,7 @@ var newCmd = &cobra.Command{
func init() { func init() {
newCmd.Flags().StringP("package", "p", "", "references the name of the Cue package within the module to use as a plan. Default: defer to cue loader") newCmd.Flags().StringP("package", "p", "", "references the name of the Cue package within the module to use as a plan. Default: defer to cue loader")
newCmd.Flags().StringP("architecture", "a", "", "architecture of the running pipeline. Default: host architecture")
if err := viper.BindPFlags(newCmd.Flags()); err != nil { if err := viper.BindPFlags(newCmd.Flags()); err != nil {
panic(err) panic(err)
} }

8
state/project.go
View File

@ -240,7 +240,7 @@ func (w *Project) Save(ctx context.Context, st *State) error {
return nil return nil
} }
func (w *Project) Create(ctx context.Context, name string, plan Plan) (*State, error) { func (w *Project) Create(ctx context.Context, name string, plan Plan, arch string) (*State, error) {
if _, err := w.Get(ctx, name); err == nil { if _, err := w.Get(ctx, name); err == nil {
return nil, ErrExist return nil, ErrExist
} }
@ -262,6 +262,10 @@ func (w *Project) Create(ctx context.Context, name string, plan Plan) (*State, e
manifestPath := path.Join(envPath, manifestFile) manifestPath := path.Join(envPath, manifestFile)
if arch == "" {
arch = platforms.Format(platforms.DefaultSpec())
}
st := &State{ st := &State{
Path: envPath, Path: envPath,
Project: w.Path, Project: w.Path,
@ -269,7 +273,7 @@ func (w *Project) Create(ctx context.Context, name string, plan Plan) (*State, e
Package: pkg, Package: pkg,
}, },
Name: name, Name: name,
Architecture: platforms.DefaultString(), Architecture: arch,
} }
data, err := yaml.Marshal(st) data, err := yaml.Marshal(st)

6
state/project_test.go
View File

@ -32,9 +32,10 @@ func TestProject(t *testing.T) {
// Create // Create
st, err := project.Create(ctx, "test", Plan{ st, err := project.Create(ctx, "test", Plan{
Module: ".", Module: ".",
}) }, "linux/amd64")
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "test", st.Name) require.Equal(t, "test", st.Name)
require.Equal(t, "linux/amd64", st.Architecture)
// Open // Open
project, err = Open(ctx, root) project, err = Open(ctx, root)
@ -51,6 +52,7 @@ func TestProject(t *testing.T) {
env, err := project.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)
require.Equal(t, "linux/amd64", env.Architecture)
// Save // Save
require.NoError(t, env.SetInput("foo", TextInput("bar"))) require.NoError(t, env.SetInput("foo", TextInput("bar")))
@ -82,7 +84,7 @@ func TestEncryption(t *testing.T) {
_, err = project.Create(ctx, "test", Plan{ _, err = project.Create(ctx, "test", Plan{
Module: ".", Module: ".",
}) }, "linux/amd64")
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