Merge pull request #40 from ultimania/feature/non-mirror-migration
Fixed conditions of repository migration
This commit is contained in:
commit
b2403e2569
2
Makefile
2
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
|
||||
|
@ -17,7 +17,7 @@ terraform {
|
||||
required_providers {
|
||||
gitea = {
|
||||
source = "Lerentis/gitea"
|
||||
version = "0.13.0"
|
||||
version = "0.14.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -17,7 +17,7 @@ terraform {
|
||||
required_providers {
|
||||
gitea = {
|
||||
source = "Lerentis/gitea"
|
||||
version = "0.13.0"
|
||||
version = "0.14.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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 -->
|
||||
|
@ -2,7 +2,7 @@ terraform {
|
||||
required_providers {
|
||||
gitea = {
|
||||
source = "terraform.local/lerentis/gitea"
|
||||
version = "0.13.0"
|
||||
version = "0.14.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,7 +2,7 @@ terraform {
|
||||
required_providers {
|
||||
gitea = {
|
||||
source = "Lerentis/gitea"
|
||||
version = "0.13.0"
|
||||
version = "0.14.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -131,8 +131,6 @@ 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)
|
||||
@ -140,6 +138,8 @@ func resourceRepoCreate(d *schema.ResourceData, meta interface{}) (err error) {
|
||||
cloneAddr = d.Get(migrationCloneAddress).(string)
|
||||
}
|
||||
|
||||
if cloneAddr != "" {
|
||||
|
||||
opts := gitea.MigrateRepoOption{
|
||||
RepoName: d.Get(repoName).(string),
|
||||
RepoOwner: d.Get(repoOwner).(string),
|
||||
|
Loading…
Reference in New Issue
Block a user