fixed minor bug in resourceForkDelete
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Some checks reported errors
continuous-integration/drone/push Build encountered an error
This commit is contained in:
parent
6d0bd5906a
commit
6d5439a00a
@ -71,3 +71,27 @@ resource "gitea_git_hook" "org_repo_pre_receive" {
|
||||
repo = gitea_repository.org_repo.name
|
||||
content = file("${path.module}/pre-receive.sh")
|
||||
}
|
||||
|
||||
resource "gitea_org" "org1" {
|
||||
name = "org1"
|
||||
}
|
||||
|
||||
resource "gitea_org" "org2" {
|
||||
name = "org2"
|
||||
}
|
||||
|
||||
resource "gitea_repository" "repo1_in_org1" {
|
||||
username = gitea_org.org1.name
|
||||
name = "repo1-in-org1"
|
||||
}
|
||||
|
||||
resource "gitea_fork" "user_fork_of_repo1_in_org1" {
|
||||
owner = gitea_org.org1.name
|
||||
repo = gitea_repository.repo1_in_org1.name
|
||||
}
|
||||
|
||||
resource "gitea_fork" "org2_fork_of_repo1_in_org1" {
|
||||
owner = gitea_org.org1.name
|
||||
repo = gitea_repository.repo1_in_org1.name
|
||||
organization = gitea_org.org2.name
|
||||
}
|
@ -2,7 +2,7 @@ terraform {
|
||||
required_providers {
|
||||
gitea = {
|
||||
source = "terraform.local/lerentis/gitea"
|
||||
version = "0.8.0"
|
||||
version = "0.9.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -62,7 +62,24 @@ func resourceForkRead(d *schema.ResourceData, meta interface{}) (err error) {
|
||||
func resourceForkDelete(d *schema.ResourceData, meta interface{}) (err error) {
|
||||
client := meta.(*gitea.Client)
|
||||
|
||||
client.DeleteRepo(d.Get(forkOrganization).(string), d.Get(forkRepo).(string))
|
||||
id, err := strconv.ParseInt(d.Id(), 10, 64)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
repo, _, err := client.GetRepoByID(id)
|
||||
var resp *gitea.Response
|
||||
|
||||
resp, err = client.DeleteRepo(repo.Owner.UserName, repo.Name)
|
||||
|
||||
if err != nil {
|
||||
if resp.StatusCode == 404 {
|
||||
return
|
||||
} else {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user