Merge pull request #40 from ultimania/feature/non-mirror-migration

Fixed conditions of repository migration

Makefile

@@ -5,7 +5,7 @@ KERNEL?=$$(uname -s | tr '[:upper:]' '[:lower:]')
 
 GOFMT ?= gofmt -s
 
-VERSION = 0.13.0
+VERSION = 0.14.0
 
 test: fmt-check
 	go test -i $(TEST) || exit 1

README.md

@@ -17,7 +17,7 @@ terraform {
   required_providers {
     gitea = {
       source = "Lerentis/gitea"
-      version = "0.13.0"
+      version = "0.14.0"
     }
   }
 }

docs/index.md

@@ -17,7 +17,7 @@ terraform {
   required_providers {
     gitea = {
       source = "Lerentis/gitea"
-      version = "0.13.0"
+      version = "0.14.0"
     }
   }
 }

docs/resources/repository.md

@@ -41,6 +41,16 @@ resource "gitea_repository" "mirror" {
   migration_service            = "gitea"
   migration_service_auth_token = var.gitea_mirror_token
 }
+
+resource "gitea_repository" "clone" {
+  username                     = "lerentis"
+  name                         = "terraform-provider-gitea-clone"
+  description                  = "Clone of Terraform Provider"
+  mirror                       = false
+  migration_clone_address      = "https://git.uploadfilter24.eu/lerentis/terraform-provider-gitea.git"
+  migration_service            = "gitea"
+  migration_service_auth_token = var.gitea_clone_token
+}
 ```
 
 <!-- schema generated by tfplugindocs -->

examples/provider.tf

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

examples/provider/provider.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     gitea = {
       source = "Lerentis/gitea"
-      version = "0.13.0"
+      version = "0.14.0"
     }
   }
 }

examples/resources/gitea_repository/resource.tf

@@ -16,3 +16,13 @@ resource "gitea_repository" "mirror" {
   migration_service            = "gitea"
   migration_service_auth_token = var.gitea_mirror_token
 }
+
+resource "gitea_repository" "clone" {
+  username                     = "lerentis"
+  name                         = "terraform-provider-gitea-clone"
+  description                  = "Clone of Terraform Provider"
+  mirror                       = false
+  migration_clone_address      = "https://git.uploadfilter24.eu/lerentis/terraform-provider-gitea.git"
+  migration_service            = "gitea"
+  migration_service_auth_token = var.gitea_clone_token
+}

gitea/resource_gitea_repository.go

@@ -131,14 +131,14 @@ func resourceRepoCreate(d *schema.ResourceData, meta interface{}) (err error) {
 		orgRepo = true
 	}
 
-	if (d.Get(repoMirror)).(bool) {
+	var cloneAddr string
+	if d.Get(migrationCloneAddresse).(string) != "" {
+		cloneAddr = d.Get(migrationCloneAddresse).(string)
+	} else {
+		cloneAddr = d.Get(migrationCloneAddress).(string)
+	}
 
-		var cloneAddr string
+	if cloneAddr != "" {
-		if d.Get(migrationCloneAddresse).(string) != "" {
-			cloneAddr = d.Get(migrationCloneAddresse).(string)
-		} else {
-			cloneAddr = d.Get(migrationCloneAddress).(string)
-		}
 
 		opts := gitea.MigrateRepoOption{
 			RepoName:       d.Get(repoName).(string),

gitea/resource_gitea_team.go

@@ -41,7 +41,7 @@ func resourceTeamRead(d *schema.ResourceData, meta interface{}) (err error) {
 		}
 	}
 
-	err = setTeamResourceData(team, d, meta)
+	err = setTeamResourceData(team, d)
 
 	return
 }
@@ -112,7 +112,7 @@ func resourceTeamCreate(d *schema.ResourceData, meta interface{}) (err error) {
 		}
 	}
 
-	err = setTeamResourceData(team, d, meta)
+	err = setTeamResourceData(team, d)
 
 	return
 }
@@ -201,7 +201,7 @@ func resourceTeamUpdate(d *schema.ResourceData, meta interface{}) (err error) {
 
 	team, _, _ = client.GetTeam(id)
 
-	err = setTeamResourceData(team, d, meta)
+	err = setTeamResourceData(team, d)
 
 	return
 }
@@ -226,13 +226,7 @@ func resourceTeamDelete(d *schema.ResourceData, meta interface{}) (err error) {
 	return
 }
 
-func setTeamResourceData(team *gitea.Team, d *schema.ResourceData, meta interface{}) (err error) {
+func setTeamResourceData(team *gitea.Team, d *schema.ResourceData) (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)
@@ -240,6 +234,7 @@ func setTeamResourceData(team *gitea.Team, d *schema.ResourceData, meta interfac
 	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(TeamMembers, d.Get(TeamMembers))
 	d.Set(TeamRepositories, d.Get(TeamRepositories))
 	return
@@ -252,7 +247,7 @@ func resourceGiteaTeam() *schema.Resource {
 		Update: resourceTeamUpdate,
 		Delete: resourceTeamDelete,
 		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
+			State: schema.ImportStatePassthrough,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {

scripts/docker-compose.yaml

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