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

provider/docker: Fix regression, 'cert_path' stop working #10801

Merged
merged 1 commit into from
Dec 17, 2016
Merged

provider/docker: Fix regression, 'cert_path' stop working #10801

merged 1 commit into from
Dec 17, 2016

Conversation

mkuzmin
Copy link
Contributor

@mkuzmin mkuzmin commented Dec 16, 2016

Fix #10754. My patch in #10151 broke original TLS authentication approach.

By some reason DefaultFunc and ConflictsWith in schema do not work together.
This code worked correctly

"ca_material": &schema.Schema{
  Type:          schema.TypeString,
  Optional:      true,
  Default: "",
  ConflictsWith: []string{"cert_path"},
},

but this fails

"ca_material": &schema.Schema{
  Type:          schema.TypeString,
  Optional:      true,
  DefaultFunc:   schema.EnvDefaultFunc("DOCKER_CA_MATERIAL", ""),
  ConflictsWith: []string{"cert_path"},
},

Now I've just hardcoded the validations.

I could write an integration test, but it's quite hard to setup such environment - we'll need launching multiple hosts. If you have any examples or just ideas, please share.

@stack72
Copy link
Contributor

stack72 commented Dec 17, 2016

Hi @mkuzmin

This LGTM! Thanks for the fast follow up here

Paul

@stack72 stack72 merged commit 7a59971 into hashicorp:master Dec 17, 2016
@mkuzmin mkuzmin deleted the docker-certpath branch December 17, 2016 16:41
@ghost
Copy link

ghost commented Apr 18, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@ghost ghost locked and limited conversation to collaborators Apr 18, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

docker provider with tls support
2 participants