Add tls_config to common#31
Merged
brian-brazil merged 1 commit intoprometheus:masterfrom Feb 28, 2016
hudashot:tls_config
Merged
Add tls_config to common#31brian-brazil merged 1 commit intoprometheus:masterfrom hudashot:tls_config
brian-brazil merged 1 commit intoprometheus:masterfrom
hudashot:tls_config
Conversation
| return checkOverflow(c.XXX, "TLS config") | ||
| } | ||
|
|
||
| func (c *TLSConfig) GenerateConfig() (*tls.Config, error) { |
Contributor
There was a problem hiding this comment.
This is public so should have a comment describing what it does
Contributor
|
Can you copy over some quick unittests too please? |
Contributor
|
Could you squash your commits and I'll merge? (Github only sends notifications when you add a comment, notifications aren't sent when you push a commit) |
This is largely a copy of `tls_config` from `prometheus/config` and some code from `prometheus/util/httputil/client.go` that would allow re-using `tls_config` in blackbox_exporter (prometheus/blackbox_exporter#33)
Author
|
I've squashed the commits. |
Contributor
|
Thanks! |
gouthamve
pushed a commit
to gouthamve/common
that referenced
this pull request
Jul 22, 2018
b990f48 Merge pull request prometheus#42 from kinvolk/lorenzo/fix-git-diff 224a145 Check if SHA1 exists before calling `git diff` 1c3000d Add auto_apply config for wcloud 0ebf5c0 Fix wcloud -serivice 4fe078a Merge pull request prometheus#39 from weaveworks/fix-wrong-subtree-use 3f4934d Remove generate_latest_map 48beb60 Sync changes done directly in scope/tools 45dcdd5 Merge pull request prometheus#37 from weaveworks/fix-mflag-missing b895344 Use mflag package from weaveworks fork until we find a better solution e030008 Merge pull request prometheus#36 from weaveworks/wcloud-service-flags 9cbab40 Add wcloud Makefile ef55901 Review feedback, and build wcloud in circle. 3fe92f5 Add wcloud deploy --service flag 3527b56 Merge pull request prometheus#34 from weaveworks/repo-branch 92cd0b8 [wcloud] Add support for repo_branch option 9f760ab Allow wcloud users to override username 38037f8 Merge pull request prometheus#33 from weaveworks/wcloud-templates 7acfbd7 Propagate the local username e6876d1 Add template fields to wcloud config. f1bb537 Merge pull request prometheus#30 from weaveworks/mike/shell-lint/dont-error-if-empty e60f5df Merge pull request prometheus#31 from weaveworks/mike/fix-shell-lint-errors e8e2b69 integrations: Fix a shellcheck linter error a781575 shell-lint: Don't fail if no shell scripts found db5efc0 Merge pull request prometheus#28 from weaveworks/mike/add-image-tag 5312c40 Import image-tag script into build tools so it can be shared 7e850f8 Fix logs path dda9785 Update deploy api f2f4e5b Fix the wcloud client 3925eb6 Merge pull request prometheus#27 from weaveworks/wcloud-events 77355b9 Lint d9a1c6c Add wcloud events, update flags and error nicely when there is no config git-subtree-dir: tools git-subtree-split: b990f488bdc7909b62d9245bc4b4caf58f5ae7ea
gouthamve
pushed a commit
to gouthamve/common
that referenced
this pull request
Jul 22, 2018
…clearer Update HTTPRequest extract functions to make it clear which ID they are extracting
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This is largely a copy of
tls_configfromprometheus/configand somecode from
prometheus/util/httputil/client.gothat would allow re-usingtls_configin blackbox_exporter (prometheus/blackbox_exporter#33)cc @brian-brazil