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.

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

imgadm module should deal with invalid images better #51383

Merged
merged 1 commit into from Feb 5, 2019

Conversation

@sjorge
Copy link
Contributor

commented Jan 29, 2019

What does this PR do?

images should always have a manifest and name tag, but it looks like it is possible to encouter some in the wild that do not have those fields. This PR ensure we do not simple hard fail on those and throw and Exception.

What issues does this PR fix or reference?

#51351
#51503 (works for me with this applied)

Previous Behavior

Exception was thrown

New Behavior

We return None ... well technically
{uuid-here: None}

Tests written?

No

Commits signed with GPG?

No

@sjorge

This comment has been minimized.

Copy link
Contributor Author

commented Feb 5, 2019

Might be useful to get this into 2019.3.1 or maybe even .0

@Ch3LL
Ch3LL approved these changes Feb 5, 2019
@Ch3LL Ch3LL merged commit f998c5b into saltstack:develop Feb 5, 2019
6 of 10 checks passed
6 of 10 checks passed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
@sjorge sjorge deleted the sjorge:51351 branch Feb 8, 2019
garethgreenaway added a commit that referenced this pull request Feb 16, 2019
Backport #51383 into 2019.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.