Fix AppCollaboratorConfig and add Role to add user.

Author: fnaoto

Makefile

@@ -33,7 +33,7 @@ test:
 	go test -i $(TEST) || exit 1                                                   
 	echo $(TEST) | xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4                    
 
-testacc:
+testacc: install
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m   
 
 examples: install

deploygate/data_source_app_collaborator_test.go

@@ -52,8 +52,20 @@ func testDataSourceAppCollaborator(n string) resource.TestCheckFunc {
 
 const testDataSourceAppCollaboratorConfig = `
 data "deploygate_app_collaborator" "current" {
-	owner    = "dummy"
-	platform = "dummy"
-	app_id   = "dummy"
+	owner    = var.owner
+	platform = var.platform
+	app_id   = var.app_id
+}
+
+variable "platform" {
+  type = string
+}
+
+variable "app_id" {
+  type = string
+}
+
+variable "owner" {
+  type = string
 }
 `

deploygate/resource_app_collaborator.go

@@ -82,12 +82,8 @@ type AppCollaboratorConfig struct {
 }
 
 func resourceAppCollaboratorRead(d *schema.ResourceData, meta interface{}) error {
-	acc := &AppCollaboratorConfig{
-		owner:    d.Get("owner").(string),
-		platform: d.Get("platform").(string),
-		appID:    d.Get("app_id").(string),
-		users:    d.Get("users").(string),
-	}
+
+	acc := setAppCollaboratorConfig(d)
 
 	log.Printf("[DEBUG] resourceAppCollaboratorRead: %s", acc)
 
@@ -105,12 +101,7 @@ func resourceAppCollaboratorRead(d *schema.ResourceData, meta interface{}) error
 }
 
 func resourceAppCollaboratorCreate(d *schema.ResourceData, meta interface{}) error {
-	acc := &AppCollaboratorConfig{
-		owner:    d.Get("owner").(string),
-		platform: d.Get("platform").(string),
-		appID:    d.Get("app_id").(string),
-		users:    d.Get("users").(string),
-	}
+	acc := setAppCollaboratorConfig(d)
 
 	log.Printf("[DEBUG] resourceAppCollaboratorCreate: %s", acc)
 
@@ -127,12 +118,7 @@ func resourceAppCollaboratorCreate(d *schema.ResourceData, meta interface{}) err
 }
 
 func resourceAppCollaboratorUpdate(d *schema.ResourceData, meta interface{}) error {
-	acc := &AppCollaboratorConfig{
-		owner:    d.Get("owner").(string),
-		platform: d.Get("platform").(string),
-		appID:    d.Get("app_id").(string),
-		users:    d.Get("users").(string),
-	}
+	acc := setAppCollaboratorConfig(d)
 
 	log.Printf("[DEBUG] resourceAppCollaboratorUpdate: %s", acc)
 
@@ -146,12 +132,7 @@ func resourceAppCollaboratorUpdate(d *schema.ResourceData, meta interface{}) err
 }
 
 func resourceAppCollaboratorDelete(d *schema.ResourceData, meta interface{}) error {
-	acc := &AppCollaboratorConfig{
-		owner:    d.Get("owner").(string),
-		platform: d.Get("platform").(string),
-		appID:    d.Get("app_id").(string),
-		users:    d.Get("users").(string),
-	}
+	acc := setAppCollaboratorConfig(d)
 
 	log.Printf("[DEBUG] resourceAppCollaboratorDelete: %s", acc)
 
@@ -185,6 +166,7 @@ func (clt *Client) addAppCollaborator(cfg *AppCollaboratorConfig) (*go_deploygat
 		Platform: cfg.platform,
 		AppId:    cfg.appID,
 		Users:    cfg.users,
+		Role:     1,
 	}
 
 	collaborator, err := clt.client.AddAppCollaborator(g)
@@ -211,3 +193,23 @@ func (clt *Client) deleteAppCollaborator(cfg *AppCollaboratorConfig) (*go_deploy
 
 	return collaborator, nil
 }
+
+func setAppCollaboratorConfig(d *schema.ResourceData) *AppCollaboratorConfig {
+	var usersList string
+
+	if v, ok := d.GetOk("users"); ok {
+		for _, element := range v.(*schema.Set).List() {
+			elem := element.(map[string]interface{})
+			usersList += elem["name"].(string) + ","
+		}
+	}
+
+	acc := &AppCollaboratorConfig{
+		owner:    d.Get("owner").(string),
+		platform: d.Get("platform").(string),
+		appID:    d.Get("app_id").(string),
+		users:    usersList,
+	}
+
+	return acc
+}

deploygate/resource_app_collaborator_test.go

@@ -56,11 +56,27 @@ func resourceTestAppCollaborator(n string) resource.TestCheckFunc {
 
 const resourceTestAppCollaboratorConfig = `
 resource "deploygate_app_collaborator" "current" {
-	owner    = "dummy"
-	platform = "dummy"
-	app_id   = "dummy"
+	owner    = var.owner
+	platform = var.platform
+	app_id   = var.app_id
 	users {
-		name = "dummy"
+		name = var.add_user_name
 	}
 }
+
+variable "platform" {
+  type = string
+}
+
+variable "app_id" {
+  type = string
+}
+
+variable "owner" {
+  type = string
+}
+
+variable "add_user_name" {
+  type = string
+}
 `