lerentis/terraform-provider-gitea
1
0
Fork 0
Code Issues 4 Pull Requests Projects 1 Releases Wiki Activity

#12 stick with IDs for consistency
Some checks reported errors
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone/pr Build was killed
Details

Browse Source
This commit is contained in:
Tobias Trabelsi 2022-08-13 22:37:46 +02:00
parent 8b25a1519e
commit aa7856ea7b
Signed by: lerentis
GPG Key ID: FF0C2839718CAF2E
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gitea/resource_gitea_organisation.go
View File

@ -2,6 +2,7 @@ package gitea
import ( import (
"fmt" "fmt"
"strconv"
"code.gitea.io/sdk/gitea" "code.gitea.io/sdk/gitea"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@ -18,7 +19,7 @@ const (
) )
// might come in handy if we want to stick to numeric IDs // might come in handy if we want to stick to numeric IDs
/*func searchOrgByClientId(c *gitea.Client, id int64) (res *gitea.Organization, err error) { func searchOrgByClientId(c *gitea.Client, id int64) (res *gitea.Organization, err error) {
page := 1 page := 1
@ -45,33 +46,19 @@ const (
page += 1 page += 1
} }
}*/ }
func resourceOrgRead(d *schema.ResourceData, meta interface{}) (err error) { func resourceOrgRead(d *schema.ResourceData, meta interface{}) (err error) {
client := meta.(*gitea.Client) client := meta.(*gitea.Client)
var org *gitea.Organization var org *gitea.Organization
var resp *gitea.Response
var tmpOrgName string
if d.Get(orgName).(string) == "" { id, err := strconv.ParseInt(d.Id(), 10, 64)
// terraform import as only access to the ID, therfore we set the ID to the name
tmpOrgName = d.Id()
} else {
tmpOrgName = d.Get(orgName).(string)
}
org, resp, err = client.GetOrg(tmpOrgName) org, err = searchOrgByClientId(client, id)
if err != nil { if err != nil {
if resp != nil { return err
if resp.StatusCode == 404 {
d.SetId("")
return
}
} else {
return fmt.Errorf("Error response from client: %s\nOrg Name %s", err, tmpOrgName)
}
} }
err = setOrgResourceData(org, d) err = setOrgResourceData(org, d)
@ -154,7 +141,7 @@ func resourceOrgDelete(d *schema.ResourceData, meta interface{}) (err error) {
} }
func setOrgResourceData(org *gitea.Organization, d *schema.ResourceData) (err error) { func setOrgResourceData(org *gitea.Organization, d *schema.ResourceData) (err error) {
d.SetId(org.UserName) d.SetId(fmt.Sprintf("%d", org.ID))
d.Set("name", org.UserName) d.Set("name", org.UserName)
d.Set("full_name", org.FullName) d.Set("full_name", org.FullName)
d.Set("avatar_url", org.AvatarURL) d.Set("avatar_url", org.AvatarURL)