Support Cloudshark's new API. #8
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
|
LGTM :) |
| @@ -95,7 +101,7 @@ start) | |||
| for i in 1 2 3 | |||
| do | |||
| push_event $EVENT_ID UPLOAD "Uploading capture for ${PATHS[2]} to CloudShark ($i try)..." | |||
| JSON_STATUS=`curl --cacert /usr/lib/cdns/cacert.pem -H "Origin: https://appliance.cloudshark.org" -F "capture[upload]=@${DUMP_FILE}.0" https://www.cloudshark.org/captures.json` | |||
| JSON_STATUS=`curl --cacert /usr/lib/cdns/cacert.pem --upload-file ${DUMP_FILE}.0 https://www.cloudshark.org/api/v1/${CLOUDSHARK_API_TOKEN}/upload` | |||
There was a problem hiding this comment.
Don't we need "" around ${DUMP_FILE}.0?
There was a problem hiding this comment.
Took a look, and nowhere else in that file is $DUMP_FILE surrounded by double quotes. While I agree it would be safer to do that, this change matches existing usage. Quoting it should probably be a separate commit outside the scope of this pull request.
There was a problem hiding this comment.
It was in "capture[upload]=@${DUMP_FILE}.0"
|
@kgoodier can fix this quotes? |
Cloudshark now requires you to create an account and use an API token to upload files. See https://support.cloudshark.org/api/upload.html for more info. The /etc/config/cdns file must now be edited after installation in order to provide an API token.
|
Updated and added quotes to DUMP_FILE in the curl line. |
|
Thanks! |
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.
Cloudshark now requires you to create an account and use an API token
to upload files. See https://support.cloudshark.org/api/upload.html
for more info.
The /etc/config/cdns file must now be edited after installation in
order to provide an API token.
Resolves issue #7