From 80c53ddec0d40052f53cbb6c33e9bdbe5f85cf9d Mon Sep 17 00:00:00 2001 From: KeisukeYamashita <19yamashita15@gmail.com> Date: Fri, 31 Jul 2020 13:00:22 +0900 Subject: [PATCH] fix(spinnaker): gate_endpoint getter --- spinnaker/provider.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spinnaker/provider.go b/spinnaker/provider.go index 5a6fcc2..1186e6a 100644 --- a/spinnaker/provider.go +++ b/spinnaker/provider.go @@ -10,15 +10,15 @@ func Provider() *schema.Provider { return &schema.Provider{ Schema: map[string]*schema.Schema{ "server": { - Type: schema.TypeString, - Description: "URL for Spinnaker Gate", - Deprecated: "use `gate_endpoint` instead", - Optional: true, + Type: schema.TypeString, + Description: "URL for Spinnaker Gate", + Deprecated: "use `gate_endpoint` instead", + Optional: true, ConflictsWith: []string{"gate_endpoint"}, }, "gate_endpoint": { Type: schema.TypeString, - Optional: true, + Optional: true, Description: "URL for Spinnaker Gate", DefaultFunc: schema.EnvDefaultFunc("GATE_ENDPOINT", nil), }, @@ -62,8 +62,8 @@ type gateConfig struct { func providerConfigureFunc(data *schema.ResourceData) (interface{}, error) { var gateEndpoint string - if v, deprecated := data.Get("server").(string); deprecated { - gateEndpoint = v + if v, deprecated := data.GetOk("server"); deprecated { + gateEndpoint = v.(string) } else { gateEndpoint = data.Get("gate_endpoint").(string) }