From 71caf4430b8c1853dd5429ae11e0ec102f4b94c1 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Mon, 15 May 2023 15:17:32 +0200 Subject: [PATCH 1/2] potential fix for #35 --- gitea/resource_gitea_team.go | 4 ++-- scripts/docker-compose.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitea/resource_gitea_team.go b/gitea/resource_gitea_team.go index dbcb434..c2f82e0 100644 --- a/gitea/resource_gitea_team.go +++ b/gitea/resource_gitea_team.go @@ -234,7 +234,7 @@ func setTeamResourceData(team *gitea.Team, d *schema.ResourceData) (err error) { d.Set(TeamPermissions, string(team.Permission)) d.Set(TeamIncludeAllReposFlag, team.IncludesAllRepositories) d.Set(TeamUnits, d.Get(TeamUnits).(string)) - d.Set(TeamOrg, d.Get(TeamOrg).(string)) + d.Set(TeamOrg, team.Organization.UserName) d.Set(TeamMembers, d.Get(TeamMembers)) d.Set(TeamRepositories, d.Get(TeamRepositories)) return @@ -247,7 +247,7 @@ func resourceGiteaTeam() *schema.Resource { Update: resourceTeamUpdate, Delete: resourceTeamDelete, Importer: &schema.ResourceImporter{ - State: schema.ImportStatePassthrough, + StateContext: schema.ImportStatePassthroughContext, }, Schema: map[string]*schema.Schema{ "name": { diff --git a/scripts/docker-compose.yaml b/scripts/docker-compose.yaml index 453bc52..f80b687 100644 --- a/scripts/docker-compose.yaml +++ b/scripts/docker-compose.yaml @@ -6,7 +6,7 @@ networks: services: server: - image: gitea/gitea:1.17.1 + image: gitea/gitea:1.19.3 container_name: gitea environment: - USER_UID=1000 From 83a0cbf14c111119c38a9ce8268d4a9990144db9 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Wed, 17 May 2023 10:27:17 +0200 Subject: [PATCH 2/2] fallback on resource data on buggy gitea versions --- gitea/resource_gitea_team.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gitea/resource_gitea_team.go b/gitea/resource_gitea_team.go index c2f82e0..e65798f 100644 --- a/gitea/resource_gitea_team.go +++ b/gitea/resource_gitea_team.go @@ -41,7 +41,7 @@ func resourceTeamRead(d *schema.ResourceData, meta interface{}) (err error) { } } - err = setTeamResourceData(team, d) + err = setTeamResourceData(team, d, meta) return } @@ -112,7 +112,7 @@ func resourceTeamCreate(d *schema.ResourceData, meta interface{}) (err error) { } } - err = setTeamResourceData(team, d) + err = setTeamResourceData(team, d, meta) return } @@ -201,7 +201,7 @@ func resourceTeamUpdate(d *schema.ResourceData, meta interface{}) (err error) { team, _, _ = client.GetTeam(id) - err = setTeamResourceData(team, d) + err = setTeamResourceData(team, d, meta) return } @@ -226,7 +226,13 @@ func resourceTeamDelete(d *schema.ResourceData, meta interface{}) (err error) { return } -func setTeamResourceData(team *gitea.Team, d *schema.ResourceData) (err error) { +func setTeamResourceData(team *gitea.Team, d *schema.ResourceData, meta interface{}) (err error) { + client := meta.(*gitea.Client) + if err := client.CheckServerVersionConstraint(">= 1.19.4"); err != nil { + d.Set(TeamOrg, d.Get(TeamOrg).(string)) + } else { + d.Set(TeamOrg, team.Organization.UserName) + } d.SetId(fmt.Sprintf("%d", team.ID)) d.Set(TeamCreateRepoFlag, team.CanCreateOrgRepo) d.Set(TeamDescription, team.Description) @@ -234,7 +240,6 @@ func setTeamResourceData(team *gitea.Team, d *schema.ResourceData) (err error) { d.Set(TeamPermissions, string(team.Permission)) d.Set(TeamIncludeAllReposFlag, team.IncludesAllRepositories) d.Set(TeamUnits, d.Get(TeamUnits).(string)) - d.Set(TeamOrg, team.Organization.UserName) d.Set(TeamMembers, d.Get(TeamMembers)) d.Set(TeamRepositories, d.Get(TeamRepositories)) return