From 71caf4430b8c1853dd5429ae11e0ec102f4b94c1 Mon Sep 17 00:00:00 2001
From: Tobias Trabelsi <Lerentis@users.noreply.github.com>
Date: Mon, 15 May 2023 15:17:32 +0200
Subject: [PATCH] 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