Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow multistage Dockerfiles by removing AS <stage name> in validation #112

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: allow multistage Dockerfiles by removing AS <stage name> in validation #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion connect/eaas/core/validation/validators/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def validate_docker_compose_yml(context): # noqa: CCR001
),
)
continue
image = from_cmd[4:].strip()
image = re.sub(r'\s+AS\s+.*', '', from_cmd[4:], flags=re.IGNORECASE).strip()
if image != runner_image:
messages.append(
ValidationItem(
Expand Down
31 changes: 31 additions & 0 deletions tests/connect/eaas/core/validation/validators/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,37 @@ def test_validate_docker_compose_yml_invalid_image_dockerfile(mocker):
assert item.file == 'fake_dir/Dockerfile'


def test_validate_docker_compose_yml_multistage_image_dockerfile(mocker):
mocker.patch(
'connect.eaas.core.validation.validators.base.os.path.isfile',
return_value=True,
)
mocked_open = mocker.MagicMock()
mocked_open.read.return_value = (
'FROM cloudblueconnect/connect-extension-runner:0.3 as a-stage-name\n'
)
mocker.patch(
'connect.eaas.core.validation.validators.base.open',
side_effect=[None, mocked_open],
)
mocker.patch(
'connect.eaas.core.validation.validators.base.yaml.safe_load',
return_value={
'services': {
'dev': {
'build': {'dockerfile': 'Dockerfile'},
},
},
},
)

result = validate_docker_compose_yml({'project_dir': 'fake_dir', 'runner_version': '0.3'})

assert isinstance(result, ValidationResult)
assert result.must_exit is False
assert len(result.items) == 0


def test_validate_docker_compose_yml_invalid_image_no_dockerfile(mocker):
mocker.patch(
'connect.eaas.core.validation.validators.base.os.path.isfile',
Expand Down
Loading