Merge pull request #33 from fnaoto/2022-12-08

Add initConfig.

Author: fnaoto

Makefile

@@ -11,13 +11,14 @@ build:
 install: build
 	mkdir -p $(PROVIDER_DIR)
 	mv ${BINARY} $(PROVIDER_DIR)
-	cp .terraformrc ~
 
 test:
 	go test -v $(TESTARGS) -cover -timeout=120s -parallel=4 ./...
 
 testacc: install
+	cp .terraformrc ~
 	TF_ACC=1 go test -v $(TESTARGS) -cover -timeout 120m ./...
+	rm ~/.terraformrc
 
 docs:
 	go generate ./...

deploygate/provider.go

@@ -38,17 +38,22 @@ func Provider() *schema.Provider {
 
 func providerConfigure(p *schema.Provider) schema.ConfigureContextFunc {
 	return func(_ context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
-		config := &Config{
-			clientConfig: go_deploygate.ClientConfig{
-				ApiKey: d.Get("api_key").(string),
-			},
-		}
+		config, err := initConfig(d)
+		return config, diag.FromErr(err)
+	}
+}
 
-		err := config.initClient()
-		if err != nil {
-			return nil, diag.FromErr(err)
-		}
+func initConfig(d *schema.ResourceData) (*Config, error) {
+	config := &Config{
+		clientConfig: go_deploygate.ClientConfig{
+			ApiKey: d.Get("api_key").(string),
+		},
+	}
 
-		return config, nil
+	err := config.initClient()
+	if err != nil {
+		return nil, err
 	}
+
+	return config, nil
 }

deploygate/provider_test.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/dnaeon/go-vcr/cassette"
 	"github.com/dnaeon/go-vcr/recorder"
-	go_deploygate "github.com/fnaoto/go_deploygate"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -63,13 +62,8 @@ func initProvider(t *testing.T) map[string]*schema.Provider {
 
 func providerConfigureVCR(p *schema.Provider, t *testing.T) schema.ConfigureContextFunc {
 	return func(_ context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
-		config := &Config{
-			clientConfig: go_deploygate.ClientConfig{
-				ApiKey: d.Get("api_key").(string),
-			},
-		}
+		config, err := initConfig(d)
 
-		err := config.initClient()
 		if err != nil {
 			return nil, diag.FromErr(err)
 		}