fix: throw errors instead of ignoring (#85)

When not using an admin account, certain errors are ignored and you end up with the provider wanting to create an organization/user which already exists. It doesn't know it exists because the "not found" error is ignored. Now it is thrown so you see the problem.

Fixes #60

Co-authored-by: Mandy Schoep <[email protected]>
Reviewed-on: https://gitea.com/gitea/terraform-provider-gitea/pulls/85
Co-authored-by: OhMyMndy <[email protected]>
Co-committed-by: OhMyMndy <[email protected]>

Author: 2 people

gitea/resource_gitea_organisation.go

@@ -21,7 +21,6 @@ const (
 
 // might come in handy if we want to stick to numeric IDs
 func searchOrgByClientId(c *gitea.Client, id int64) (res *gitea.Organization, err error) {
-
 	page := 1
 
 	for {
@@ -83,15 +82,19 @@ func resourceOrgRead(d *schema.ResourceData, meta interface{}) (err error) {
 	id, err := strconv.ParseInt(d.Id(), 10, 64)
 
 	org, err = searchOrgByClientId(client, id)
-
 	if err != nil {
 		d.SetId("")
-		return nil
+		return err
 	}
 
-	repos, _ := getAllOrgRepos(client, org.UserName)
+	repos, err := getAllOrgRepos(client, org.UserName)
+	if err != nil {
+		return err
+	}
 	err = setOrgResourceData(org, d, &repos)
-
+	if err != nil {
+		return err
+	}
 	return
 }
 
@@ -110,12 +113,14 @@ func resourceOrgCreate(d *schema.ResourceData, meta interface{}) (err error) {
 
 	org, _, err := client.CreateOrg(opts)
 	if err != nil {
-		return
+		return err
 	}
 
 	repos, _ := getAllOrgRepos(client, org.UserName)
 	err = setOrgResourceData(org, d, &repos)
-
+	if err != nil {
+		return err
+	}
 	return
 }
 
@@ -126,7 +131,6 @@ func resourceOrgUpdate(d *schema.ResourceData, meta interface{}) (err error) {
 	var resp *gitea.Response
 
 	org, resp, err = client.GetOrg(d.Get(orgName).(string))
-
 	if err != nil {
 		if resp.StatusCode == 404 {
 			resourceOrgCreate(d, meta)
@@ -149,7 +153,9 @@ func resourceOrgUpdate(d *schema.ResourceData, meta interface{}) (err error) {
 
 	repos, _ := getAllOrgRepos(client, org.UserName)
 	err = setOrgResourceData(org, d, &repos)
-
+	if err != nil {
+		return err
+	}
 	return
 }
 
@@ -159,7 +165,6 @@ func resourceOrgDelete(d *schema.ResourceData, meta interface{}) (err error) {
 	var resp *gitea.Response
 
 	resp, err = client.DeleteOrg(d.Get(orgName).(string))
-
 	if err != nil {
 		if resp.StatusCode == 404 {
 			return

gitea/resource_gitea_user.go

@@ -39,7 +39,6 @@ func resourceUserRead(d *schema.ResourceData, meta interface{}) (err error) {
 	var user *gitea.User
 
 	user, resp, err = client.GetUserByID(id)
-
 	if err != nil {
 		if resp.StatusCode == 404 {
 			d.SetId("")
@@ -93,7 +92,6 @@ func resourceUserUpdate(d *schema.ResourceData, meta interface{}) (err error) {
 	var user *gitea.User
 
 	user, resp, err = client.GetUserByID(id)
-
 	if err != nil {
 		if resp.StatusCode == 404 {
 			resourceUserCreate(d, meta)
@@ -138,7 +136,6 @@ func resourceUserUpdate(d *schema.ResourceData, meta interface{}) (err error) {
 			Visibility:              &visibility,
 		}
 		_, err = client.AdminEditUser(d.Get(userName).(string), opts)
-
 		if err != nil {
 			return err
 		}
@@ -163,7 +160,6 @@ func resourceUserUpdate(d *schema.ResourceData, meta interface{}) (err error) {
 			Visibility:              &visibility,
 		}
 		_, err = client.AdminEditUser(d.Get(userName).(string), opts)
-
 		if err != nil {
 			return err
 		}
@@ -182,7 +178,6 @@ func resourceUserDelete(d *schema.ResourceData, meta interface{}) (err error) {
 	var resp *gitea.Response
 
 	resp, err = client.AdminDeleteUser(d.Get(userName).(string))
-
 	if err != nil {
 		if resp.StatusCode == 404 {
 			return