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

bugfix: Missig provider credentials setting #2

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions internal/clients/vsphere.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ const (
errUnmarshalCredentials = "cannot unmarshal vsphere credentials as JSON"
)

var reqFields = []string{"user", "password", "vsphere_server"}
var optFields = []string{"allow_unverified_ssl", "vim_keep_alive", "api_timeout"}

// TerraformSetupBuilder builds Terraform a terraform.SetupFn function which
// returns Terraform provider setup configuration
func TerraformSetupBuilder(version, providerSource, providerVersion string) terraform.SetupFn {
Expand Down Expand Up @@ -62,11 +65,18 @@ func TerraformSetupBuilder(version, providerSource, providerVersion string) terr
return ps, errors.Wrap(err, errUnmarshalCredentials)
}

// Set credentials in Terraform provider configuration.
/*ps.Configuration = map[string]any{
"username": creds["username"],
"password": creds["password"],
}*/
ps.Configuration = map[string]any{}
// Required fields
for _, req := range reqFields {
ps.Configuration[req] = creds[req]
}
// Optional fields
for _, opt := range optFields {
if v, ok := creds[opt]; ok {
ps.Configuration[opt] = v
}
}

return ps, nil
}
}