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

MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic #38829

Merged
merged 6 commits into from Feb 2, 2017

Conversation

cro
Copy link
Contributor

@cro cro commented Jan 19, 2017

What does this PR do?

Fixes numerous situations where __proxy__ and other dunder variables should have been available. In addition, adds the proxy_alive functionality contributed by @mirceaulinic. Documentation coming in next PR.

What issues does this PR fix or reference?

#38753 #38557 #38265 #32918

Supersedes PR: #38265 #37864

@alexbleotu @mirceaulinic I will go back and look at 2016.3 to see which of these should be backported to fix the similar issues there.

Tests written?

Not yet, but soon!

@mirceaulinic
Copy link
Contributor

mirceaulinic commented Jan 20, 2017

This looks very good @cro! I will try this branch next week.

Thank you so much!

@cachedout
Copy link
Contributor

@cro This has some lint errors.

@mirceaulinic Shall I wait for you to test this?

@mirceaulinic
Copy link
Contributor

As this will go only in the develop branch, I think we can wait a few days. So @cachedout please allow me some time to run several tests. Thanks!

@cro
Copy link
Contributor Author

cro commented Jan 22, 2017 via email

@cachedout
Copy link
Contributor

@mirceaulinic Will do. Please let me know after you have had a chance to conduct your testing.

@mirceaulinic
Copy link
Contributor

Almost there https://jenkins.saltstack.com/job/PR/job/salt-pr-lint-n/7960/violations/file/salt/proxy/rest_sample.py/ :)

I did not forget about this one, I'll test it tomorrow!

@cachedout
Copy link
Contributor

@mirceaulinic Thanks for the update!

@cro cro mentioned this pull request Jan 26, 2017
@mirceaulinic
Copy link
Contributor

Hello, I have tested this branch and I didn't notice anything suspicious!

I was wondering if there would be any benefit of having the __proxy__ object available also in the runners, e.g.: https://github.com/saltstack/salt/blob/develop/salt/runners/salt.py#L65-L67 would not work without. On the other hand I believe this wouldn't be a good practice!

Thanks @cro!

@rallytime
Copy link
Contributor

@cro Looks like this one needs to be rebased now.

@rallytime
Copy link
Contributor

Go Go Jenkins!

@rallytime rallytime merged commit 8e6c155 into saltstack:develop Feb 2, 2017
gitebra pushed a commit to gitebra/salt that referenced this pull request Feb 2, 2017
* upstream/develop: (37 commits)
  MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (saltstack#38829)
  Missing colon
  Fixing a weird edge case when using salt syndics and targetting via pillar.  Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use.
  correct checking of policy_class to compare with lower() version of the specified string (saltstack#39084)
  Backport saltstack#38779 to 2016.11 (saltstack#39089)
  update adml text search to use 'starts-with' as some policies text has trailing spaces (saltstack#39090)
  correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object (saltstack#39088)
  use the pillar kwarg explicitely
  add ability to override pillar data during state.sls_id run.
  [Bugfix] Fix state x509.crl_managed
  Check if data['return'] is dict type
  add debug logging for batch vars
  Don't fail test if data is empty
  Account for trimmed value in 'salt -d' output
  Run test_valid_docs in batches
  Update primary bonding option in rh_ip.py (saltstack#39069)
  Update primary bonding option in debian_ip.py (saltstack#39068)
  Add a bunch of missing doc module references
  Move fileclient tests to tests/integration/fileserver/fileclient_test.py (saltstack#39081)
  _in_range_inclusive class method incorrectly called isinstance
  ...
mirceaulinic added a commit to napalm-automation/napalm-salt that referenced this pull request Feb 13, 2017
As a backport fro the proxy keepalive feature from the
Nitrogen release, introduced in saltstack/salt#38829
Till Nitrogen will be public available, this module can be
scheduled and it will keep the connection always alive.
mirceaulinic added a commit to cloudflare/salt that referenced this pull request Mar 31, 2017
Although added by @cro in saltstack#38829 - see
https://github.com/saltstack/salt/pull/38829/files#diff-b5732eecf0273ccf6a96e1c720198dc6
for very obscure reasons, these changes somehow disappeared.
Readding them, hopefully they'll resist longer this time.
@cro cro deleted the px_dunder_fixes branch May 25, 2017 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants