Skip to content

Commit

Permalink
fix: restore ability for snyk fix to make network requests [FIX-138] (#…
Browse files Browse the repository at this point in the history
…4742)

* fix: restore ability for snyk fix to make network requests

This required an update to the python-fix packages to reset the
environment variables provided to the subshell executing the python
package managers.

* chore: update CODEOWNERS of snyk-fix package

* chore: add acceptance test for snyk fix

* chore: check for pipenv or skip test

* fix: update pipenv install command
  • Loading branch information
aron authored Jul 17, 2023
1 parent de19bca commit ef4b1d7
Show file tree
Hide file tree
Showing 8 changed files with 769 additions and 74 deletions.
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ commands:
name: Installing sdks and tools
command: |
brew install go gradle python elixir composer gradle@6 maven sbt
python3 -m pip install pipenv --user
install_sdks_linux:
steps:
Expand Down Expand Up @@ -108,6 +109,7 @@ commands:
jq
pip install awscli --upgrade --user
pip install pipenv --user
echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list
echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list
Expand Down Expand Up @@ -249,6 +251,7 @@ jobs:
name: Installing Node.js + other test dependencies
command: |
apk add --update nodejs npm bash maven git go gradle python3 py3-pip elixir composer
pip3 install pipenv
- run:
name: Configuring artifact
command: << parameters.test_snyk_command >> config set "api=${SNYK_API_KEY}"
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
* @snyk/hammerhead @snyk/snyk-open-source

# monorepo packages
packages/snyk-fix/ @snyk/tech-services
packages/snyk-fix/ @snyk/fix
packages/snyk-protect/ @snyk/hammerhead
packages/cli-alert/ @snyk/hammerhead
packages/iac-cli-alert/ @snyk/cloud-dev-ex
Expand Down
142 changes: 76 additions & 66 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/snyk-fix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"license": "Apache-2.0",
"dependencies": {
"@snyk/dep-graph": "^1.21.0",
"@snyk/fix-pipenv-pipfile": "0.6.0",
"@snyk/fix-poetry": "0.8.3",
"@snyk/fix-pipenv-pipfile": "^0.7.1",
"@snyk/fix-poetry": "^0.9.1",
"chalk": "4.1.1",
"debug": "^4.3.1",
"lodash.groupby": "4.6.0",
Expand Down
12 changes: 12 additions & 0 deletions test/fixtures/snyk-fix-pipenv/Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[[source]]
url = "https://pypi.org/simple/"
verify_ssl = true
name = "pypi"

[packages]
pylint = "==2.6.0"
toml = "==0.10.1"

[dev-packages]

[requires]
106 changes: 106 additions & 0 deletions test/fixtures/snyk-fix-pipenv/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ef4b1d7

Please sign in to comment.