From 89baca48f5adb65ab923fc949d634cd195f1cda7 Mon Sep 17 00:00:00 2001 From: Brett Wright Date: Thu, 11 Jun 2020 13:10:37 +0200 Subject: [PATCH] Changed how to setid --- provider/resource_project.go | 12 ++++++++++-- provider/resource_robot_account.go | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/provider/resource_project.go b/provider/resource_project.go index c963eed..9cb4475 100644 --- a/provider/resource_project.go +++ b/provider/resource_project.go @@ -71,7 +71,7 @@ func resourceProjectCreate(d *schema.ResourceData, m interface{}) error { return err } - d.SetId(randomString(15)) + // d.SetId(randomString(15)) return resourceProjectRead(d, m) } @@ -98,7 +98,15 @@ func resourceProjectRead(d *schema.ResourceData, m interface{}) error { return fmt.Errorf("[ERROR] JsonData is empty") } - d.Set("project_id", jsonData[0].ProjectID) + for _, v := range jsonData { + if v.Name == d.Get("name").(string) { + d.SetId(strconv.Itoa(v.ProjectID)) + d.Set("project_id", strconv.Itoa(v.ProjectID)) + } + + } + + // d.Set("project_id", jsonData[0].ProjectID) return nil } diff --git a/provider/resource_robot_account.go b/provider/resource_robot_account.go index 4eb0702..e4416b3 100644 --- a/provider/resource_robot_account.go +++ b/provider/resource_robot_account.go @@ -99,7 +99,6 @@ func resourceRobotAccountCreate(d *schema.ResourceData, m interface{}) error { return fmt.Errorf("[ERROR] Unable to unmarshal: %s", err) } - d.SetId(randomString(15)) d.Set("token", jsonData.Token) return resourceRobotAccountRead(d, m) } @@ -128,6 +127,7 @@ func resourceRobotAccountRead(d *schema.ResourceData, m interface{}) error { for _, v := range jsonData { if v.Name == "robot$"+name { + d.SetId(strconv.Itoa(v.RobotID)) d.Set("robot_id", strconv.Itoa(v.RobotID)) } }