#5 fixed state handling for public keys

Reviewed-on: #4

Makefile

@@ -3,7 +3,7 @@ GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 
 GOFMT ?= gofmt -s
 
-VERSION = 0.6.0
+VERSION = 0.6.1
 
 test: fmt-check
 	go test -i $(TEST) || exit 1

docs/resources/team.md

@@ -17,11 +17,22 @@ resource "gitea_org" "test_org" {
   name = "test-org"
 }
 
+resource "gitea_user" "test" {
+  username             = "test"
+  login_name           = "test"
+  password             = "Geheim1!"
+  email                = "test@user.dev"
+  must_change_password = false
+  admin                = true
+}
+
+
 resource "gitea_team" "test_team" {
-  name = "Devs"
+  name         = "Devs"
   organisation = gitea_org.test_org.name
-  description = "Devs of Test Org"
-  permission = "write"
+  description  = "Devs of Test Org"
+  permission   = "write"
+  members      = [gitea_user.test.username]
 }
 ```
 
@@ -38,6 +49,7 @@ resource "gitea_team" "test_team" {
 - `can_create_repos` (Boolean) Flag if the Teams members should be able to create Rpositories in the Organisation
 - `description` (String) Description of the Team
 - `include_all_repositories` (Boolean) Flag if the Teams members should have access to all Repositories in the Organisation
+- `members` (List of String) List of Users that should be part of this team
 - `permission` (String) Permissions associated with this Team
 Can be `none`, `read`, `write`, `admin` or `owner`
 - `units` (String) List of types of Repositories that should be allowed to be created from Team members.

examples/main.tf

@@ -49,8 +49,9 @@ resource "gitea_public_key" "test_user_key" {
 
 
 resource "gitea_team" "test_team" {
-  name = "Devs"
+  name         = "Devs"
   organisation = gitea_org.test_org.name
-  description = "Devs of Test Org"
-  permission = "write"
-}
+  description  = "Devs of Test Org"
+  permission   = "write"
+  members      = [gitea_user.test.username]
+}

examples/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     gitea = {
       source = "terraform.local/lerentis/gitea"
-      version = "0.6.0"
+      version = "0.6.1"
     }
   }
 }

examples/resources/gitea_team/resource.tf

@@ -2,9 +2,20 @@ resource "gitea_org" "test_org" {
   name = "test-org"
 }
 
+resource "gitea_user" "test" {
+  username             = "test"
+  login_name           = "test"
+  password             = "Geheim1!"
+  email                = "test@user.dev"
+  must_change_password = false
+  admin                = true
+}
+
+
 resource "gitea_team" "test_team" {
-  name = "Devs"
+  name         = "Devs"
   organisation = gitea_org.test_org.name
-  description = "Devs of Test Org"
-  permission = "write"
-}
+  description  = "Devs of Test Org"
+  permission   = "write"
+  members      = [gitea_user.test.username]
+}

gitea/resource_gitea_public_key.go

@@ -91,9 +91,9 @@ func resourcePublicKeyDelete(d *schema.ResourceData, meta interface{}) (err erro
 func setPublicKeyResourceData(pubKey *gitea.PublicKey, d *schema.ResourceData) (err error) {
 	d.SetId(fmt.Sprintf("%d", pubKey.ID))
 	d.Set(PublicKeyUser, d.Get(PublicKeyUser).(string))
-	d.Set(PublicKey, pubKey.Key)
+	d.Set(PublicKey, d.Get(PublicKey).(string))
 	d.Set(PublicKeyTitle, pubKey.Title)
-	d.Set(PublicKeyReadOnlyFlag, pubKey.ReadOnly)
+	d.Set(PublicKeyReadOnlyFlag, d.Get(PublicKeyReadOnlyFlag).(bool))
 	d.Set(PublicKeyCreated, pubKey.Created)
 	d.Set(PublicKeyFingerprint, pubKey.Fingerprint)
 	d.Set(PublicKeyType, pubKey.KeyType)

gitea/resource_gitea_team.go

@@ -17,6 +17,7 @@ const (
 	TeamCreateRepoFlag      string = "can_create_repos"
 	TeamIncludeAllReposFlag string = "include_all_repositories"
 	TeamUnits               string = "units"
+	TeamMembers             string = "members"
 )
 
 func resourceTeamRead(d *schema.ResourceData, meta interface{}) (err error) {
@@ -89,6 +90,17 @@ func resourceTeamCreate(d *schema.ResourceData, meta interface{}) (err error) {
 		return
 	}
 
+	users := d.Get(TeamMembers).([]interface{})
+
+	for _, user := range users {
+		if user != "" {
+			_, err = client.AddTeamMember(team.ID, user.(string))
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	err = setTeamResourceData(team, d)
 
 	return
@@ -158,6 +170,17 @@ func resourceTeamUpdate(d *schema.ResourceData, meta interface{}) (err error) {
 		return err
 	}
 
+	users := d.Get(TeamMembers).([]interface{})
+
+	for _, user := range users {
+		if user != "" {
+			_, err = client.AddTeamMember(team.ID, user.(string))
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	team, _, _ = client.GetTeam(id)
 
 	err = setTeamResourceData(team, d)
@@ -194,6 +217,7 @@ func setTeamResourceData(team *gitea.Team, d *schema.ResourceData) (err error) {
 	d.Set(TeamIncludeAllReposFlag, team.IncludesAllRepositories)
 	d.Set(TeamUnits, d.Get(TeamUnits).(string))
 	d.Set(TeamOrg, d.Get(TeamOrg).(string))
+	d.Set(TeamMembers, d.Get(TeamMembers))
 	return
 }
 
@@ -256,6 +280,16 @@ func resourceGiteaTeam() *schema.Resource {
 				Description: "List of types of Repositories that should be allowed to be created from Team members.\n" +
 					"Can be `repo.code`, `repo.issues`, `repo.ext_issues`, `repo.wiki`, `repo.pulls`, `repo.releases`, `repo.projects` and/or `repo.ext_wiki`",
 			},
+			"members": {
+				Type: schema.TypeList,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Optional:    true,
+				Required:    false,
+				Computed:    true,
+				Description: "List of Users that should be part of this team",
+			},
 		},
 		Description: "`gitea_team` manages Team that are part of an organisation.",
 	}