Merge pull request #27 from fnaoto/2022-11-23

2022 11 23

Author: fnaoto

.env.sample

@@ -1,21 +1,14 @@
-# Tokens
+# For organization
 
-export TF_VAR_user_api_key=""
+exoprt TF_VAR_team=""
+export TF_VAR_organization=""
 export TF_VAR_organization_api_key=""
-export TF_VAR_enterprise_api_key=""
 
-# For app_member
+# For enterprise
 
-export TF_VAR_app_id=""
-export TF_VAR_owner=""
-export TF_VAR_platform=""
-export TF_VAR_add_user_name=""
+export TF_VAR_enterprise=""
+export TF_VAR_enterprise_api_key=""
 
-# For organization_member
+# For member
 
-export TF_VAR_organization=""
 export TF_VAR_add_member_name=""
-
-# For organization_member
-
-export TF_VAR_enterprise=""

README.md

@@ -3,5 +3,6 @@
 [![release](https://github.com/fnaoto/terraform-provider-deploygate/actions/workflows/release.yml/badge.svg)](https://github.com/fnaoto/terraform-provider-deploygate/actions/workflows/release.yml)
 
 - Documentation: [docs](docs)
+- Examples: [examples](examples)
 - Website: [registry.terraform.io](https://registry.terraform.io/providers/fnaoto/deploygate/latest)
 

deploygate/data_source_app_member.go

@@ -0,0 +1,75 @@
+package deploygate
+
+import (
+	"fmt"
+	"log"
+
+	go_deploygate "github.com/fnaoto/go_deploygate"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func dataSourceOrganizationTeamMember() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceOrganizationTeamMemberRead,
+
+		Schema: map[string]*schema.Schema{
+			"organization": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"team": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"users": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"type": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"url": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"icon_url": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func dataSourceOrganizationTeamMemberRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*Config).client
+
+	organization := d.Get("organization").(string)
+	team := d.Get("team").(string)
+
+	log.Printf("[DEBUG] dataSourceOrganizationTeamMemberRead: %s", organization)
+
+	cfg := &go_deploygate.ListOrganizationTeamMembersRequest{
+		Organization: organization,
+		Team:         team,
+	}
+
+	resp, err := client.ListOrganizationTeamMembers(cfg)
+
+	if err != nil {
+		return err
+	}
+
+	d.SetId(fmt.Sprintf("%s/%s", organization, team))
+	d.Set("users", resp.Users)
+
+	return nil
+}

deploygate/data_source_app_member_test.go

@@ -0,0 +1,69 @@
+package deploygate
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+)
+
+func Test_DataSourceOrganizationTeamMember_basic(t *testing.T) {
+	testWithVCR(t, resource.TestCase{
+		PreCheck: func() { Test_DGPreCheck(t) },
+		Steps: []resource.TestStep{
+			{
+				Config: testDataSourceOrganizationTeamMemberConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testDataSourceOrganizationTeamMember("data.deploygate_organization_team_member.current"),
+				),
+			},
+		},
+	})
+}
+
+func testDataSourceOrganizationTeamMember(n string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Can't find resource: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("Resource ID not set")
+		}
+
+		if rs.Primary.Attributes["organization"] == "" {
+			return fmt.Errorf("organization expected to not be nil")
+		}
+
+		if rs.Primary.Attributes["team"] == "" {
+			return fmt.Errorf("team expected to not be nil")
+		}
+
+		return nil
+	}
+}
+
+const testDataSourceOrganizationTeamMemberConfig = `
+provider "deploygate" {
+	api_key = var.organization_api_key
+}
+
+variable "organization_api_key" {
+  type = string
+}
+
+data "deploygate_organization_team_member" "current" {
+	organization = var.organization
+	team 				 = var.team
+}
+
+variable "organization" {
+  type = string
+}
+
+variable "team" {
+  type = string
+}
+`

deploygate/data_source_organization_team_member.go

@@ -0,0 +1,21 @@
+---
+version: 1
+interactions:
+- request:
+    body: ""
+    form: {}
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/x-www-form-urlencoded
+      User-Agent:
+      - GoDeployGate (+github.com/fnaoto/go_deploygate; go1.17.11)
+    url: https://deploygate.com/api/enterprises/test-enterprise-fnaoto/users
+    method: GET
+  response:
+    body: '{"error":false,"users":[{"type":"User","name":"naoto-fukuda-test","icon_url":"https://secure.gravatar.com/avatar/b8522f0e74e1673596e2c15dca95c04a?s=218\u0026d=mm","url":"https://deploygate.com/users/naoto-fukuda-test","full_name":null,"email":"dummy.email","role":"Admin","created_at":"2022-11-17T20:49:14.000+09:00","last_access_at":"2022-12-01T13:43:51.000+09:00"},{"type":"User","name":"naoto-fukuda","icon_url":"https://secure.gravatar.com/avatar/77329ff2f492bb519f6f11a7bd27d568?s=218\u0026d=mm","url":"https://deploygate.com/users/naoto-fukuda","full_name":null,"email":"dummy.email","role":"General","created_at":"2022-12-01T11:54:29.000+09:00","last_access_at":"2022-12-01T11:57:28.000+09:00"}]}'
+    headers: {}
+    status: 200 OK
+    code: 200
+    duration: ""

deploygate/data_source_organization_team_member_test.go

@@ -0,0 +1,21 @@
+---
+version: 1
+interactions:
+- request:
+    body: ""
+    form: {}
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/x-www-form-urlencoded
+      User-Agent:
+      - GoDeployGate (+github.com/fnaoto/go_deploygate; go1.17.11)
+    url: https://deploygate.com/api/enterprises/test-enterprise-fnaoto/users
+    method: GET
+  response:
+    body: '{"error":false,"users":[{"type":"User","name":"naoto-fukuda-test","icon_url":"https://secure.gravatar.com/avatar/b8522f0e74e1673596e2c15dca95c04a?s=218\u0026d=mm","url":"https://deploygate.com/users/naoto-fukuda-test","full_name":null,"email":"dummy.email","role":"Admin","created_at":"2022-11-17T20:49:14.000+09:00","last_access_at":"2022-12-01T13:43:51.000+09:00"},{"type":"User","name":"naoto-fukuda","icon_url":"https://secure.gravatar.com/avatar/77329ff2f492bb519f6f11a7bd27d568?s=218\u0026d=mm","url":"https://deploygate.com/users/naoto-fukuda","full_name":null,"email":"dummy.email","role":"General","created_at":"2022-12-01T11:54:29.000+09:00","last_access_at":"2022-12-01T11:57:28.000+09:00"}]}'
+    headers: {}
+    status: 200 OK
+    code: 200
+    duration: ""