This repository was archived by the owner on Apr 15, 2024. It is now read-only.
Merged
Conversation
* Rebased marketplace commands and bump to v0.3.23 * Fix package-lock.json to have new generator version * removed unused imports * removed unused imports
* Revved generator version and cli version. * Ccf 9171 memory vcpu mismatch (#155) * don't use default command line params for memory and vcpus * 0.12.9 * Bump lodash for vunerabilities CCF-9252 update generator for linux * CCF-9376 update generator version to 0.3.18 (#163) * CCF-9286: return instanceId in the message when promoting a snapshot … (#162) * CCF-9286: return instanceId in the message when promoting a snapshot to an environment that was being returned by the api response but not getting included in the cli response * updated message with review comments * fixing undefined error when promoting a snapshot to an environment, instanceId is under `response.message.instanceId` (#164) * working recursive upload of directory (#165) * working recursive upload of directory * 0.12.12 * Remove cortex-processors commands (#166) * Add agents list-snapshot-instances (#168) * Chunk directory upload (#169) * use sequential chunks of files to upload * 0.12.13 * Fix invalid query param on list snap instances (#170) * Updated list-services command to display the parameter names/types as well (#171) * CCF-9783 reverting changes to agent and catalog (#173) * Remove --timeout option from actions deploy (#175) * Ccf 9955 configure url (#176) * add protocol prefix if one is missing * 0.12.14 * Adds support for graph and profile APIs * Return error message from content upload properly * Bump generator-cortex to pick up with_type change * Support graph query in CLI * created template checklist as POC * updated pull_request_template * Update pull_request_template.md * Adds CLI support for Cortex Experiments * Adds progress bar to graph event publish for files * Bump lodash for vunerabilities CCF-9252 update generator for linux * CCF-9376 update generator version to 0.3.18 (#163) * CCF-9286: return instanceId in the message when promoting a snapshot … (#162) * CCF-9286: return instanceId in the message when promoting a snapshot to an environment that was being returned by the api response but not getting included in the cli response * updated message with review comments * fixing undefined error when promoting a snapshot to an environment, instanceId is under `response.message.instanceId` (#164) * working recursive upload of directory (#165) * working recursive upload of directory * 0.12.12 * Add agents list-snapshot-instances (#168) * Chunk directory upload (#169) * use sequential chunks of files to upload * 0.12.13 * Fix invalid query param on list snap instances (#170) * Updated list-services command to display the parameter names/types as well (#171) * CCF-9783 reverting changes to agent and catalog (#173) * Remove --timeout option from actions deploy (#175) * Ccf 9955 configure url (#176) * add protocol prefix if one is missing * 0.12.14 * Bump generator-cortex to pick up with_type change * Return error message from content upload properly * created template checklist as POC * updated pull_request_template * Update pull_request_template.md * Fixed bugs in list-services update (#174) * Revved generator version and cli version. * Ccf 9171 memory vcpu mismatch (#155) * don't use default command line params for memory and vcpus * 0.12.9 * Bump lodash for vunerabilities CCF-9252 update generator for linux * CCF-9376 update generator version to 0.3.18 (#163) * CCF-9286: return instanceId in the message when promoting a snapshot … (#162) * CCF-9286: return instanceId in the message when promoting a snapshot to an environment that was being returned by the api response but not getting included in the cli response * updated message with review comments * fixing undefined error when promoting a snapshot to an environment, instanceId is under `response.message.instanceId` (#164) * working recursive upload of directory (#165) * working recursive upload of directory * 0.12.12 * Remove cortex-processors commands (#166) * Add agents list-snapshot-instances (#168) * Chunk directory upload (#169) * use sequential chunks of files to upload * 0.12.13 * Fix invalid query param on list snap instances (#170) * Updated list-services command to display the parameter names/types as well (#171) * CCF-9783 reverting changes to agent and catalog (#173) * Fixed bugs in list-services update * Remove --timeout option from actions deploy (#175) * Ccf 9955 configure url (#176) * add protocol prefix if one is missing * 0.12.14 * Updated to handle parameters being null * Updated gitignore file to not include .DS_Store files * Return error message from content upload properly * Bump generator-cortex to pick up with_type change * Made code fixes per Davids suggestions * Update agents.js * Update catalog.js * Update .gitignore * Made changes from Davids review * Reverted gitignore * Update .gitignore * Update .gitignore * created template checklist as POC * updated pull_request_template * Update pull_request_template.md * Ccf 9171 memory vcpu mismatch (#155) * don't use default command line params for memory and vcpus * 0.12.9 * Bump lodash for vunerabilities CCF-9252 update generator for linux * CCF-9376 update generator version to 0.3.18 (#163) * CCF-9286: return instanceId in the message when promoting a snapshot … (#162) * CCF-9286: return instanceId in the message when promoting a snapshot to an environment that was being returned by the api response but not getting included in the cli response * updated message with review comments * Updated gitignore file to not include .DS_Store files * Made code fixes per Davids suggestions * Update .gitignore * Update .gitignore * Update .gitignore * first working pass, seems like all client methods are now proxied (#185) * first working pass, seems like all client methods are now proxied * added bypass proxy env variable * 0.12.15 * Adds support for publishing graph events from plain old JSON lines files * Update NPM deps post-merge with develop * Fixes event publish count in CLI progress bar. Adds graph publish retry support. * Ccf 9955 configure url (#176) * add protocol prefix if one is missing * 0.12.14 * CCF-9286: return instanceId in the message when promoting a snapshot … (#162) * CCF-9286: return instanceId in the message when promoting a snapshot to an environment that was being returned by the api response but not getting included in the cli response * updated message with review comments * fixing undefined error when promoting a snapshot to an environment, instanceId is under `response.message.instanceId` (#164) * working recursive upload of directory (#165) * working recursive upload of directory * 0.12.12 * Add agents list-snapshot-instances (#168) * Chunk directory upload (#169) * use sequential chunks of files to upload * 0.12.13 * Fix invalid query param on list snap instances (#170) * Update NPM deps post-merge with develop * Fixes event publish count in CLI progress bar. Adds graph publish retry support. * Added ability to batch entity events when publishing to the graph api based on REST request size limits. Also added cli command to list profile versions. * Added command to list profile versions. Also more limits when querying profiles. * Getting auto attributes to consider lists and dictionaries to dimensionals.
* Remove api endpoint * clean up
* CCF-12660 Add pod spec option to actions deploy command * CCF-12660 Add pod spec option to actions deploy command * CCF-12660 clean up verbage * CCF-12660 cmd to command * CCF-12660 update to 1.0.3 * CCF-12660 remove vcpu and memory option parsing
* Update dependencies and remove deprecation warnings Joi method change remove dead code remove dead test * Version bump mocha, uuid * Added missing split dep, remove unused url dep
…d, no longer pass the option from the client to the command and also displays a warning when the options are still passed in (#228)
* Add node version to package json to ensure we have a new enough node version, warn if use is using CORTEX_TOKEN * CCF-12859 Add message to warn users that CORTEX_TOKEN is set Require NODE 10.x or higher!! Bump package.json for vulns * Fix default behavior for cortex configure with new isDefault: true from commander * Fix missing options on cortex configure
* CCF-12822 npm doesnot enforce anything, add preinstall check * pack-lock
… for CI deployment
… for CI deployment
FAB-30 Added deploy snapshot command to export agent snapshot and generate manifest file
fixed undefined in export
[FAB-715] added port properties
[FAB-37] Campaign Import Export commands
empty export file issue when campaign export failed
# Conflicts: # bin/cortex-campaigns.js # src/commands/assets/templates/skill/daemon/skill.yaml.hbs # src/commands/deploy.js
clee-cs
approved these changes
Dec 15, 2020
Contributor
clee-cs
left a comment
There was a problem hiding this comment.
Looks like we're pulling in the same commits again from ~July.. the files/changes all look current so maybe just some weird commit/merge history?
Contributor
Author
Yep, tried branching master -> merging develop and branching develop -> merging master. Both show all commits for the years |
ghost
approved these changes
Dec 15, 2020
ghost
left a comment
There was a problem hiding this comment.
re: all the commits -- I thought @jgielstra-cs had an idea on how to fix this at one point? (maybe?)
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
9 participants
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.
Checklist:
Please check you fulfill ALL of the relevant checkboxes
npm testand it passesGoing to merge master into develop after this. Hoping that will fix the commit history on merge...