-
Notifications
You must be signed in to change notification settings - Fork 311
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Build command first refactor (#4189)
* Build command and logic refactor POC Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Fixed some conflict in go.mod and remove some commented piece of code Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Added file headers to run unit tests Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Removed remote builder and use directly OktetoBuilder in pkg/cmd/build for remote deploy/destroy. They don't need the wrapper V1 or v2 Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Fixed golangci and deepsource issues Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Fixed unit and e2e tests. Added context to remote destroy Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Removed debug logging and fix log line Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Add test for getOriginalCWD and fix destroy remote when the manifest is in another path Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Fix unix tests Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Fix windows unit tests for function getOriginalCWD Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Addressed code review comments: Removed commented code and added an init function for the OktetoBuilder Signed-off-by: Nacho Fuertes <nacho@okteto.com> * Fix warning in DeepSource Signed-off-by: Nacho Fuertes <nacho@okteto.com> --------- Signed-off-by: Nacho Fuertes <nacho@okteto.com>
- Loading branch information
Showing
15 changed files
with
650 additions
and
492 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,210 @@ | ||
| // Copyright 2024 The Okteto Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package basic | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/okteto/okteto/pkg/env" | ||
| "github.com/okteto/okteto/pkg/log/io" | ||
| "github.com/okteto/okteto/pkg/types" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/mock" | ||
| ) | ||
|
|
||
| type fakeBuildRunner struct { | ||
| mock.Mock | ||
| } | ||
|
|
||
| func (f *fakeBuildRunner) Run(ctx context.Context, buildOptions *types.BuildOptions, ioCtrl *io.Controller) error { | ||
| args := f.Called(ctx, buildOptions, ioCtrl) | ||
| return args.Error(0) | ||
| } | ||
|
|
||
| func TestBuildWithErrorFromDockerfile(t *testing.T) { | ||
| ctx := context.Background() | ||
|
|
||
| buildRunner := &fakeBuildRunner{} | ||
| bc := &Builder{ | ||
| BuildRunner: buildRunner, | ||
| IoCtrl: io.NewIOController(), | ||
| } | ||
| dir, err := createDockerfile(t) | ||
| assert.NoError(t, err) | ||
|
|
||
| tag := "okteto.dev/test" | ||
| options := &types.BuildOptions{ | ||
| CommandArgs: []string{dir}, | ||
| Tag: tag, | ||
| } | ||
|
|
||
| expectedOptions := &types.BuildOptions{ | ||
| Path: dir, | ||
| File: filepath.Join(dir, "Dockerfile"), | ||
| Tag: tag, | ||
| CommandArgs: []string{dir}, | ||
| } | ||
| buildRunner.On("Run", mock.Anything, expectedOptions, mock.Anything).Return(assert.AnError) | ||
|
|
||
| err = bc.Build(ctx, options) | ||
|
|
||
| // error from the build | ||
| assert.Error(t, err) | ||
| buildRunner.AssertExpectations(t) | ||
| } | ||
|
|
||
| func TestBuildWithNoErrorFromDockerfile(t *testing.T) { | ||
| ctx := context.Background() | ||
|
|
||
| buildRunner := &fakeBuildRunner{} | ||
| bc := &Builder{ | ||
| BuildRunner: buildRunner, | ||
| IoCtrl: io.NewIOController(), | ||
| } | ||
| dir, err := createDockerfile(t) | ||
| assert.NoError(t, err) | ||
|
|
||
| tag := "okteto.dev/test" | ||
| options := &types.BuildOptions{ | ||
| CommandArgs: []string{dir}, | ||
| Tag: tag, | ||
| } | ||
|
|
||
| expectedOptions := &types.BuildOptions{ | ||
| Path: dir, | ||
| File: filepath.Join(dir, "Dockerfile"), | ||
| Tag: tag, | ||
| CommandArgs: []string{dir}, | ||
| } | ||
| buildRunner.On("Run", mock.Anything, expectedOptions, mock.Anything).Return(nil) | ||
|
|
||
| err = bc.Build(ctx, options) | ||
| // no error from the build | ||
| assert.NoError(t, err) | ||
|
|
||
| buildRunner.AssertExpectations(t) | ||
| } | ||
|
|
||
| func TestBuildWithNoErrorFromDockerfileAndNoTag(t *testing.T) { | ||
| ctx := context.Background() | ||
|
|
||
| buildRunner := &fakeBuildRunner{} | ||
| bc := &Builder{ | ||
| BuildRunner: buildRunner, | ||
| IoCtrl: io.NewIOController(), | ||
| } | ||
| dir, err := createDockerfile(t) | ||
| assert.NoError(t, err) | ||
|
|
||
| options := &types.BuildOptions{ | ||
| CommandArgs: []string{dir}, | ||
| } | ||
|
|
||
| expectedOptions := &types.BuildOptions{ | ||
| Path: dir, | ||
| File: filepath.Join(dir, "Dockerfile"), | ||
| CommandArgs: []string{dir}, | ||
| } | ||
| buildRunner.On("Run", mock.Anything, expectedOptions, mock.Anything).Return(nil) | ||
|
|
||
| err = bc.Build(ctx, options) | ||
| // no error from the build | ||
| assert.NoError(t, err) | ||
|
|
||
| buildRunner.AssertExpectations(t) | ||
| } | ||
|
|
||
| func TestBuildWithErrorWithPathToFile(t *testing.T) { | ||
| ctx := context.Background() | ||
|
|
||
| buildRunner := &fakeBuildRunner{} | ||
| bc := &Builder{ | ||
| BuildRunner: buildRunner, | ||
| IoCtrl: io.NewIOController(), | ||
| } | ||
| dir, err := createDockerfile(t) | ||
| assert.NoError(t, err) | ||
|
|
||
| options := &types.BuildOptions{ | ||
| Path: filepath.Join(dir, "Dockerfile"), | ||
| } | ||
|
|
||
| err = bc.Build(ctx, options) | ||
| // expected error from the build | ||
| assert.Error(t, err) | ||
|
|
||
| buildRunner.AssertNotCalled(t, "Run", mock.Anything, mock.Anything, mock.Anything) | ||
| } | ||
|
|
||
| func TestBuildWithErrorWithFileToDir(t *testing.T) { | ||
| ctx := context.Background() | ||
|
|
||
| buildRunner := &fakeBuildRunner{} | ||
| bc := &Builder{ | ||
| BuildRunner: buildRunner, | ||
| IoCtrl: io.NewIOController(), | ||
| } | ||
| dir, err := createDockerfile(t) | ||
| assert.NoError(t, err) | ||
|
|
||
| options := &types.BuildOptions{ | ||
| CommandArgs: []string{dir}, | ||
| Path: dir, | ||
| File: dir, | ||
| } | ||
|
|
||
| err = bc.Build(ctx, options) | ||
| // expected error from the build | ||
| assert.Error(t, err) | ||
|
|
||
| buildRunner.AssertNotCalled(t, "Run", mock.Anything, mock.Anything, mock.Anything) | ||
| } | ||
|
|
||
| func TestBuildWithErrorFromImageExpansion(t *testing.T) { | ||
| ctx := context.Background() | ||
|
|
||
| buildRunner := &fakeBuildRunner{} | ||
| bc := &Builder{ | ||
| BuildRunner: buildRunner, | ||
| IoCtrl: io.NewIOController(), | ||
| } | ||
| dir, err := createDockerfile(t) | ||
| assert.NoError(t, err) | ||
|
|
||
| t.Setenv("TEST_VAR", "unit-test") | ||
| // The missing closing brace breaks the var expansion | ||
| tag := "okteto.dev/test:${TEST_VAR" | ||
| options := &types.BuildOptions{ | ||
| CommandArgs: []string{dir}, | ||
| Tag: tag, | ||
| } | ||
| err = bc.Build(ctx, options) | ||
| // error from the build | ||
| assert.ErrorAs(t, err, &env.VarExpansionErr{}) | ||
|
|
||
| buildRunner.AssertNotCalled(t, "Run", mock.Anything, mock.Anything, mock.Anything) | ||
| } | ||
|
|
||
| func createDockerfile(t *testing.T) (string, error) { | ||
| dir := t.TempDir() | ||
| dockerfilePath := filepath.Join(dir, "Dockerfile") | ||
| err := os.WriteFile(dockerfilePath, []byte("Hello"), 0600) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| return dir, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.