github-mirrors/terraform-provider-bitbucketserver
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-provider-bitbucketserver.git synced 2026-03-27 20:01:07 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

* Added a flag to specify whether to import groups that already exist in bitbucket along with functionality to import those groups into the terraform state

Browse Source 
* Changed the error checking when importing an existing group for bitbucket so that the duplicate group error is not thrown
* Added two acceptance tests
* Updated the ReadMe.md with accurate instructions since the previous ones were not working for us
* Updated the Makefile to set the maximum number of files allowed to be open to 1024 since 256 was too few.  We called `ulimit -n 1024` to do this for the testacc and testacc-bitbucket targets.
* Changed the start-docker-compose.sh to use the bitbucket server environment variable so that it doesn't always refer to localhost
* Skipped some testcases that are consistently failing in master branch
* Added a version.env file to be used to control the versioning from CICD builds
* Set version to 1.4.0
* In the start-docker-compose.sh if the BITBUCKET_SERVER environment variable is not set then use http://localhost:7990

In the start-docker-compose.sh if the BITBUCKET_SERVER environment variable is not set then use http://localhost:7990
This commit is contained in:
Justin To
2020-07-06 13:35:11 -04:00
committed by Cameron Crockatt
parent f116e39d79
commit b3ee8fd46c
9 changed files with 131 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bitbucket/resource_group.go
View File

@@ -2,14 +2,17 @@ package bitbucket
import (
"fmt"
"github.com/hashicorp/terraform/helper/schema"
"net/url"
"strings"
"github.com/hashicorp/terraform/helper/schema"
)
func resourceGroup() *schema.Resource {
return &schema.Resource{
Create: resourceGroupCreate,
Read: resourceGroupRead,
Update: resourceGroupUpdate,
Delete: resourceGroupDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
@@ -21,6 +24,11 @@ func resourceGroup() *schema.Resource {
Required: true,
ForceNew: true,
},
"import_if_exists": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},
},
}
}
@@ -29,12 +37,22 @@ func resourceGroupCreate(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketServerProvider).BitbucketClient
groupName := d.Get("name").(string)
importIfExists := d.Get("import_if_exists").(bool)
var newResource = true
_, err := client.Post(fmt.Sprintf("/rest/api/1.0/admin/groups?name=%s", url.QueryEscape(groupName)), nil)
if err != nil {
return err
if importIfExists && strings.Contains(err.Error(), "API Error: 409") {
newResource = false
} else {
return err
}
}
if newResource {
d.MarkNewResource()
}
d.SetId(groupName)
return resourceGroupRead(d, m)
}
@@ -61,6 +79,12 @@ func resourceGroupRead(d *schema.ResourceData, m interface{}) error {
return fmt.Errorf("unable to find a matching group %s", groupName)
}
func resourceGroupUpdate(d *schema.ResourceData, m interface{}) error {
// The only attribute in the schema that does not have "ForceNew: true" is "import_if_exists",
// so we are not actually updating any groups in Bitbucket, we just need to read and return.
return resourceGroupRead(d, m)
}
func resourceGroupDelete(d *schema.ResourceData, m interface{}) error {
groupName := d.Get("name").(string)
client := m.(*BitbucketServerProvider).BitbucketClient