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

Refactoring a bit to keep the CLI fast #33997

Merged
merged 11 commits into from
Jun 23, 2016
Merged

Conversation

cachedout
Copy link
Contributor

My ongoing battle to keep the CLI at least somewhat lightweight.

@@ -1714,6 +1712,7 @@ class Caller(object):
'''
def __init__(self, c_path=os.path.join(syspaths.CONFIG_DIR, 'minion'),
mopts=None):
import salt.minion
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a comment here for the late load as well?

@rallytime
Copy link
Contributor

@cachedout Woo! This will be nice. I had two tiny suggestions about adding comments in some of the places you've moved imports to later in the code.

Also, it looks like the SSH tests that are failing are related to this. The other two (gem test and wheel test) are currently failing on develop.

@rallytime rallytime added the pending-changes The pull request needs additional changes before it can be merged label Jun 14, 2016
@rallytime
Copy link
Contributor

Awesome!

@rallytime rallytime merged commit 945b21b into saltstack:develop Jun 23, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 27, 2016
* upstream/develop: (24 commits)
  salt-cloud will use list_floating_ips for Openstack (saltstack#34280)
  Update Azure ARM driver to support 2.0rc5 (saltstack#34251)
  Pylint fix
  Refactoring a bit to keep the CLI fast (saltstack#33997)
  file.find module: fix handling of broken symlinks
  Fixed typo in filtering LDAP's potential_ous
  Port boto_rds to Boto3 version 1.3.1
  Minor lint fix.
  External auth can return dynamically generated ACL from auth call.
  Fixes saltstack#34135, Fixes saltstack#34137
  some cleanup and renaming
  better way to check for openSUSE Leap
  Fix for openSUSE Tumbleweed
  fixes for fopen mock and some os_release_map for SLES11SP3
  unit tests for SUSE os grains detection
  Normalization of osfullname grain for openSUSE
  one clause to set OS grain from CPE_NAME
  Test fixed: get OS grain from /etc/os-release if possible
  fix: osarch_mock
  osarch mock for unit test
  ...

# Conflicts:
#	salt/modules/boto_rds.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pending-changes The pull request needs additional changes before it can be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants