Skip to content

Commit 9fcf005

Browse files
committed
Pass provider to providerConfigure function
1 parent a0874a4 commit 9fcf005

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

gitlab/provider.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
func Provider() terraform.ResourceProvider {
1313

1414
// The actual provider
15-
return &schema.Provider{
15+
provider := &schema.Provider{
1616
Schema: map[string]*schema.Schema{
1717
"token": {
1818
Type: schema.TypeString,
@@ -93,9 +93,13 @@ func Provider() terraform.ResourceProvider {
9393
"gitlab_project_mirror": resourceGitlabProjectMirror(),
9494
"gitlab_project_level_mr_approvals": resourceGitlabProjectLevelMRApprovals(),
9595
},
96+
}
9697

97-
ConfigureFunc: providerConfigure,
98+
provider.ConfigureFunc = func(d *schema.ResourceData) (interface{}, error) {
99+
return providerConfigure(provider, d)
98100
}
101+
102+
return provider
99103
}
100104

101105
var descriptions map[string]string
@@ -116,15 +120,15 @@ func init() {
116120
}
117121
}
118122

119-
func providerConfigure(d *schema.ResourceData) (interface{}, error) {
123+
func providerConfigure(p *schema.Provider, d *schema.ResourceData) (interface{}, error) {
120124
config := Config{
121125
Token: d.Get("token").(string),
122126
BaseURL: d.Get("base_url").(string),
123127
CACertFile: d.Get("cacert_file").(string),
124128
Insecure: d.Get("insecure").(bool),
125129
ClientCert: d.Get("client_cert").(string),
126130
ClientKey: d.Get("client_key").(string),
127-
TerraformVersion: "TODO", // TODO: How to get Terraform version?
131+
TerraformVersion: p.TerraformVersion,
128132
}
129133

130134
return config.Client()

0 commit comments

Comments
 (0)