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

2022 12 08

Author: fnaoto

.env.sample

@@ -2,6 +2,8 @@
 
 exoprt TF_VAR_team=""
 export TF_VAR_organization=""
+export TF_VAR_organization_only=""
+export TF_VAR_organization_in_enterprise=""
 export TF_VAR_organization_api_key=""
 
 # For enterprise

.terraformrc

@@ -0,0 +1,7 @@
+provider_installation {
+  dev_overrides {
+    "fnaoto/deploygate" = "~/.terraform.d/plugins/darwin_amd64/terraform-provider-deploygate"
+  }
+
+  direct {}
+}

Makefile

@@ -1,48 +1,25 @@
-TEST?=$$(go list ./... | grep -v 'vendor')
 NAME=deploygate
 BINARY=terraform-provider-${NAME}
-VERSION=0.1
 OS_ARCH?=darwin_amd64
-EXAMPLES=examples
+PROVIDER_DIR=~/.terraform.d/plugins/${OS_ARCH}
 
 default: install
 
 build:
-	go build -o ${BINARY}
-
-release:
-	GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64
-	GOOS=darwin GOARCH=arm64 go build -o ./bin/${BINARY}_${VERSION}_darwin_arm64
-	GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386
-	GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64
-	GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm
-	GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386
-	GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64
-	GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm
-	GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386
-	GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64
-	GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64
-	GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386
-	GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64
+	go build ${BINARY}
 
 install: build
-	mkdir -p ~/.terraform.d/plugins/${OS_ARCH}
-	mv ${BINARY} ~/.terraform.d/plugins/${OS_ARCH}
+	mkdir -p $(PROVIDER_DIR)
+	mv ${BINARY} $(PROVIDER_DIR)
+	cp .terraformrc ~
 
-test: 
-	go test $(TEST) || exit 1                                                   
-	echo $(TEST) | xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4                    
+test:
+	go test -v $(TESTARGS) -cover -timeout=120s -parallel=4 ./...
 
 testacc: install
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m   
-
-examples: install
-	terraform init $(EXAMPLES)
-	terraform plan $(EXAMPLES)
-	terraform apply $(EXAMPLES)
-	terraform destroy $(EXAMPLES)
+	TF_ACC=1 go test -v $(TESTARGS) -cover -timeout 120m ./...
 
 docs:
 	go generate ./...
 
-.PHONY: docs examples testacc test install build release
+.PHONY: docs examples testacc test install build

deploygate/provider.go

@@ -1,7 +1,10 @@
 package deploygate
 
 import (
+	"context"
+
 	go_deploygate "github.com/fnaoto/go_deploygate"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -29,12 +32,12 @@ func Provider() *schema.Provider {
 		},
 	}
 
-	p.ConfigureFunc = providerConfigure(p)
+	p.ConfigureContextFunc = providerConfigure(p)
 	return p
 }
 
-func providerConfigure(p *schema.Provider) schema.ConfigureFunc {
-	return func(d *schema.ResourceData) (interface{}, error) {
+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),
@@ -43,7 +46,7 @@ func providerConfigure(p *schema.Provider) schema.ConfigureFunc {
 
 		err := config.initClient()
 		if err != nil {
-			return nil, err
+			return nil, diag.FromErr(err)
 		}
 
 		return config.client, nil

deploygate/provider_test.go

@@ -11,6 +11,7 @@ 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"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -51,7 +52,7 @@ func Test_DGPreCheck(t *testing.T) {
 
 func initProvider(t *testing.T) map[string]*schema.Provider {
 	testDGProvider = Provider()
-	testDGProvider.ConfigureFunc = providerConfigureVCR(testDGProvider, t)
+	testDGProvider.ConfigureContextFunc = providerConfigureVCR(testDGProvider, t)
 
 	testDGProviders = map[string]*schema.Provider{
 		ProviderNameDG: testDGProvider,
@@ -60,8 +61,8 @@ func initProvider(t *testing.T) map[string]*schema.Provider {
 	return testDGProviders
 }
 
-func providerConfigureVCR(p *schema.Provider, t *testing.T) schema.ConfigureFunc {
-	return func(d *schema.ResourceData) (interface{}, error) {
+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),
@@ -70,14 +71,14 @@ func providerConfigureVCR(p *schema.Provider, t *testing.T) schema.ConfigureFunc
 
 		err := config.initClient()
 		if err != nil {
-			return nil, err
+			return nil, diag.FromErr(err)
 		}
 
 		fixture := filepath.Join(FixtureBasePath, t.Name(), strconv.Itoa(len(testDGConfigs)))
 
 		rec, err := recorder.New(fixture)
 		if err != nil {
-			return nil, err
+			return nil, diag.FromErr(err)
 		}
 
 		rec.AddSaveFilter(func(i *cassette.Interaction) error {

docs/index.md

@@ -1,17 +1,20 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "deploygate Provider"
-subcategory: ""
 description: |-
-  
+  The DeployGate provider is used to manage enteprise/organization/team members.
 ---
 
-# deploygate Provider
+# DeployGate Provider
 
+The deploygate is distribution platform for in-development mobile app (iOS and Android),
+delivering apps for enteprise/organization/team members.
 
+Try the [deploygate](https://deploygate.com/).
 
 ## Example Usage
 
+Terraform 0.13 and later:
+
 ```terraform
 terraform {
   required_providers {
@@ -21,6 +24,8 @@ terraform {
   }
 }
 
+# Provider for organization api key
+
 provider "deploygate" {
   alias   = "organization"
   api_key = var.organization_api_key
@@ -30,6 +35,8 @@ variable "organization_api_key" {
   type = string
 }
 
+# Provider for enterprise api key
+
 provider "deploygate" {
   alias   = "enterprise"
   api_key = var.enterprise_api_key
@@ -38,9 +45,43 @@ provider "deploygate" {
 variable "enterprise_api_key" {
   type = string
 }
+
+# Provider via environment variable which DG_API_KEY
+#
+## export DG_API_KEY="< api_key >"
+
+provider "deploygate" {}
+```
+
+## Authentication
+
+The deploygate providing credentials for authentication.
+
+- [Organization API Key](https://docs.deploygate.com/docs/organization)
+- [Enterprise API Key](https://docs.deploygate.com/docs/enterprise)
+
+### Set credentials with provider
+
+API Key can be adding an `api_key`, in-line in the deploygate provider block.
+
+```terraform
+provider "deploygate" {
+  api_key = "< api_key >"
+}
+```
+
+### Set credentials with environment variable
+
+You can provide api_key via `DG_API_KEY` which environment variable.
+
+```shell
+$ export DG_API_KEY="< api_key >"
+```
+
+```terraform
+provider "deploygate" {}
 ```
 
-<!-- schema generated by tfplugindocs -->
 ## Schema
 
 ### Optional

docs/resources/organization_member.md

@@ -13,6 +13,17 @@ Manages a organization member resource.
 ## Example Usage
 
 ```terraform
+# Variables
+
+provider "deploygate" {
+  alias   = "enterprise"
+  api_key = var.enterprise_api_key
+}
+
+variable "enterprise_api_key" {
+  type = string
+}
+
 provider "deploygate" {
   alias   = "organization"
   api_key = var.organization_api_key
@@ -22,17 +33,47 @@ variable "organization_api_key" {
   type = string
 }
 
-variable "organization" {
+variable "organization_in_enterprise" {
+  type = string
+}
+
+variable "organization_only" {
   type = string
 }
 
 variable "add_member_name" {
   type = string
 }
 
-resource "deploygate_organization_member" "current" {
+# For enterprise organization.
+
+resource "deploygate_enterprise_member" "enterprise" {
+  provider   = deploygate.enterprise
+  enterprise = var.enterprise
+
+  users {
+    name = var.add_member_name
+  }
+}
+
+resource "deploygate_organization_member" "enterprise" {
+  provider     = deploygate.enterprise
+  organization = var.organization_in_enterprise
+
+  members {
+    name = var.add_member_name
+  }
+
+  depends_on = [
+    deploygate_enterprise_member.enterprise
+  ]
+}
+
+# For Organization only
+
+resource "deploygate_organization_member" "organization" {
   provider     = deploygate.organization
-  organization = var.organization
+  organization = var.organization_only
 
   members {
     name = var.add_member_name

docs/resources/organization_team_member.md

@@ -34,6 +34,15 @@ variable "add_member_name" {
   type = string
 }
 
+resource "deploygate_organization_member" "current" {
+  provider     = deploygate.organization
+  organization = var.organization
+
+  members {
+    name = var.add_member_name
+  }
+}
+
 resource "deploygate_organization_team_member" "current" {
   provider     = deploygate.organization
   organization = var.organization
@@ -42,6 +51,10 @@ resource "deploygate_organization_team_member" "current" {
   users {
     name = var.add_member_name
   }
+
+  depends_on = [
+    deploygate_organization_member.current
+  ]
 }
 ```
 

examples/.gitignore

@@ -2,4 +2,6 @@ terraform.tfvars
 .terraform/
 *.log
 *.tfstate
-*.backup
+*.backup
+
+.terraform.lock.hcl

examples/data-sources/deploygate_enterprise_member/data-source.tf

@@ -1,4 +1,3 @@
-
 provider "deploygate" {
   alias   = "enterprise"
   api_key = var.enterprise_api_key