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

Merge pull request #38 from Lerentis/Lerentis/issue35
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
potential fix for #35
This commit is contained in:
Tobias Trabelsi 2023-07-04 10:40:44 +02:00 committed by GitHub
commit b3f93373d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gitea/resource_gitea_team.go
View File

@ -41,7 +41,7 @@ func resourceTeamRead(d *schema.ResourceData, meta interface{}) (err error) {
} }
} }
err = setTeamResourceData(team, d) err = setTeamResourceData(team, d, meta)
return return
} }
@ -112,7 +112,7 @@ func resourceTeamCreate(d *schema.ResourceData, meta interface{}) (err error) {
} }
} }
err = setTeamResourceData(team, d) err = setTeamResourceData(team, d, meta)
return return
} }
@ -201,7 +201,7 @@ func resourceTeamUpdate(d *schema.ResourceData, meta interface{}) (err error) {
team, _, _ = client.GetTeam(id) team, _, _ = client.GetTeam(id)
err = setTeamResourceData(team, d) err = setTeamResourceData(team, d, meta)
return return
} }
@ -226,7 +226,13 @@ func resourceTeamDelete(d *schema.ResourceData, meta interface{}) (err error) {
return 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.SetId(fmt.Sprintf("%d", team.ID))
d.Set(TeamCreateRepoFlag, team.CanCreateOrgRepo) d.Set(TeamCreateRepoFlag, team.CanCreateOrgRepo)
d.Set(TeamDescription, team.Description) 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(TeamPermissions, string(team.Permission))
d.Set(TeamIncludeAllReposFlag, team.IncludesAllRepositories) d.Set(TeamIncludeAllReposFlag, team.IncludesAllRepositories)
d.Set(TeamUnits, d.Get(TeamUnits).(string)) d.Set(TeamUnits, d.Get(TeamUnits).(string))
d.Set(TeamOrg, d.Get(TeamOrg).(string))
d.Set(TeamMembers, d.Get(TeamMembers)) d.Set(TeamMembers, d.Get(TeamMembers))
d.Set(TeamRepositories, d.Get(TeamRepositories)) d.Set(TeamRepositories, d.Get(TeamRepositories))
return return
@ -247,7 +252,7 @@ func resourceGiteaTeam() *schema.Resource {
Update: resourceTeamUpdate, Update: resourceTeamUpdate,
Delete: resourceTeamDelete, Delete: resourceTeamDelete,
Importer: &schema.ResourceImporter{ Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough, StateContext: schema.ImportStatePassthroughContext,
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": { "name": {

2
scripts/docker-compose.yaml
View File

@ -6,7 +6,7 @@ networks:
services: services:
server: server:
image: gitea/gitea:1.17.1 image: gitea/gitea:1.19.3
container_name: gitea container_name: gitea
environment: environment:
- USER_UID=1000 - USER_UID=1000