feat: unify policy handling & plucking #1223
Merged
Conversation
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
lili2311
force-pushed
the
feat/unify-policy-loading
branch
from
89b58e6
to
197f1ec
Compare
anthogez
reviewed
Jun 18, 2020
There was a problem hiding this comment.
We are having an issue on this test
- test/acceptance/cli-monitor/cli-monitor.acceptance.test.ts
monitor foo:latest --dockerdoesnt send policy from cwd empty policy is sent:
Error: empty policy is sent
at Test.test (test/acceptance/cli-monitor/cli-monitor.acceptance.test.ts:1535:5)
7 tasks
lili2311
force-pushed
the
feat/unify-policy-loading
branch
4 times, most recently
from
9fa342b
to
72154d2
Compare
lili2311
commented
Jun 18, 2020
| @@ -466,7 +454,7 @@ async function assembleLocalPayloads( | |||
| targetFileRelativePath: `${targetFileRelativePath}`, // Forcing string | |||
| projectNameOverride: options.projectName, | |||
| originalProjectName, | |||
| policy: policy && policy.toString(), | |||
| policy: policy ? policy.toString() : undefined, | |||
There was a problem hiding this comment.
make it the same as other instances
lili2311
commented
Jun 18, 2020
| @@ -1531,8 +1531,7 @@ test('`monitor foo:latest --docker` doesnt send policy from cwd', async (t) => { | |||
| 'calls docker plugin with expected arguments', | |||
| ); | |||
|
|
|||
| const emptyPolicy = await snykPolicy.create(); | |||
| t.deepEqual(req.body.policy, emptyPolicy.toString(), 'empty policy is sent'); | |||
| t.deepEqual(req.body.policy, undefined, 'no policy is sent'); | |||
There was a problem hiding this comment.
make monitor & test behave the same way (preferring test)
When plucking policies this only works if we created a depenency tree with resolve-deps by traversing node_modules
lili2311
force-pushed
the
feat/unify-policy-loading
branch
from
72154d2
to
9228e50
Compare
|
Expected release notes (by @lili2311) features: fixes: others (will not be included in Semantic-Release notes):
|
gitphill
approved these changes
Jun 19, 2020
|
🎉 This PR is included in version 1.346.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Any background context you want to provide?
There is a policy handling but with
--all-project,gradle sub-projectsand--filewhere we look for policy in the root of where the command is run and not next to the manifest, which can be exposed in a test and fixed in a PR after this initial refactor so that the change is made in one place not 4.