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

[teamcity] Add ssl_validation flag to check #2091

Merged
merged 1 commit into from Jan 4, 2016

Conversation

jslatts
Copy link
Contributor

@jslatts jslatts commented Nov 18, 2015

It would be helpful to have the ability to disable SSL validation in the teamcity check, same idea as issue #1782.

I went ahead and added a flag in with the same name as the nginx check. I did not try and write an integration test. Is a test needed for this?

@remh
Copy link
Contributor

remh commented Nov 18, 2015

Thanks @jslatts
A test is not needed in that case as it would basically be testing the requests library.

We'll review more in details for our 5.7.0 release.
Thanks again!

@remh remh added this to the 5.7.0 milestone Nov 18, 2015
@@ -21,7 +21,7 @@ def __init__(self, name, init_config, agentConfig, instances=None):
# Keep track of last build IDs per instance
self.last_build_ids = {}

def _initialize_if_required(self, instance_name, server, build_conf):
def _initialize_if_required(self, instance_name, server, build_conf, ssl_validation):
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like you forgot to pass the ssl_validation flag when calling _initialize_if_required

Copy link
Contributor

Choose a reason for hiding this comment

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

@jslatts The window for the 5.7 release will be closing soon. Do you have a moment to look at @remh 's feedback?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@irabinovitch sorry, missed the original notification. I added it in. Do you want me to rebase the PR against current master? I collapsed the fix into the original commit.

@@ -22,6 +22,9 @@ instances:
# rather than just that a successful build happened
# is_deployment: true

# Optional, this turns of ssl ceritificate validation. Defaults to True.
Copy link
Member

Choose a reason for hiding this comment

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

Small typos here: turns of ssl ceritificate validation -> turns off ssl certificate validation

@olivielpeau
Copy link
Member

Hi @jslatts!

I've added two comments, could you address them? Also, could you only keep your commits in this PR? The other 3 commits seem to be unrelated.

Apart from that your changes look good to me. Thanks!

@olivielpeau olivielpeau self-assigned this Jan 4, 2016
- Same as flag added for nginx in issue DataDog#1782
@jslatts
Copy link
Contributor Author

jslatts commented Jan 4, 2016

Fixed the typo and added the _is_affirmative call. Also rebased against current master. No idea how the other commits ended up in there. It looks clean now. Let me know if there is anything else.

@olivielpeau
Copy link
Member

Thanks again @jslatts !

Merging.

olivielpeau added a commit that referenced this pull request Jan 4, 2016
[teamcity] Add ssl_validation flag to check
@olivielpeau olivielpeau merged commit 61b8f7a into DataDog:master Jan 4, 2016
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