Skip to content

Commit

Permalink
fix: validate dev only when you have selected which one you want to d…
Browse files Browse the repository at this point in the history
…evelop in (#2330)

Signed-off-by: Javier López Barba <javier@okteto.com>
  • Loading branch information
jLopezbarb committed Mar 8, 2022
1 parent d0455d4 commit 3b775e8
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
4 changes: 4 additions & 0 deletions cmd/utils/dev.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ func GetDevFromManifest(manifest *model.Manifest, devName string) (*model.Dev, e
return nil, err
}

if err := manifest.Dev[devKey].Validate(); err != nil {
return nil, err
}

return manifest.Dev[devKey], nil
}

Expand Down
8 changes: 7 additions & 1 deletion cmd/utils/displayer/tty.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,13 @@ func renderLines(queue []string, charsPerLine int) [][]byte {

func renderLogWithColors(tpl *template.Template, line string, charsPerLine int) [][]byte {
result := [][]byte{}
result = append(result, render(tpl, fmt.Sprintf("%s...", line[:charsPerLine-5])))
if charsPerLine > 4 && len(line)+2 > charsPerLine {
result = append(result, render(tpl, fmt.Sprintf("%s...", line[:charsPerLine-5])))
} else if line == "" {
result = append(result, []byte(""))
} else {
result = append(result, render(tpl, line))
}
return result
}

Expand Down
7 changes: 2 additions & 5 deletions pkg/model/dev.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,6 @@ func Get(devPath string) (*Manifest, error) {
return nil, err
}

if err := dev.validate(); err != nil {
return nil, err
}

dev.computeParentSyncFolder()
}

Expand Down Expand Up @@ -649,7 +645,8 @@ func (dev *Dev) expandEnvFiles() error {
return nil
}

func (dev *Dev) validate() error {
// Validate validates if a dev environment is correctly formed
func (dev *Dev) Validate() error {
if dev.Name == "" {
return fmt.Errorf("Name cannot be empty")
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/dev_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ func TestDev_validateName(t *testing.T) {
if err := dev.SetDefaults(); err != nil {
t.Fatalf("error applying defaults: %v", err)
}
if err := dev.validate(); (err != nil) != tt.wantErr {
if err := dev.Validate(); (err != nil) != tt.wantErr {
t.Errorf("Dev.validate() error = %v, wantErr %v", err, tt.wantErr)
}
})
Expand Down Expand Up @@ -989,7 +989,7 @@ func Test_validate(t *testing.T) {

dev := manifest.Dev["deployment"]

err = dev.validate()
err = dev.Validate()
if tt.expectErr && err == nil {
t.Error("didn't get the expected error")
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/model/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,6 @@ func getManifest(devPath string) (*Manifest, error) {
return nil, err
}

if err := dev.validate(); err != nil {
return nil, err
}

dev.computeParentSyncFolder()
}

Expand Down

0 comments on commit 3b775e8

Please sign in to comment.