mirror of
https://github.com/ysoftdevs/terraform-provider-bitbucketserver.git
synced 2026-03-28 12:11:49 +01:00
* 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
* 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:
committed by
Cameron Crockatt
parent
f116e39d79
commit
b3ee8fd46c
@@ -1,7 +1,13 @@
|
||||
package bitbucket
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/hashicorp/terraform/helper/resource"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -25,3 +31,74 @@ func TestAccBitbucketResourceGroup_basic(t *testing.T) {
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestAccBitbucketResourceGroup_DisallowImport(t *testing.T) {
|
||||
resourceName := "duplicate_group"
|
||||
groupName := "duplicate-group"
|
||||
config := fmt.Sprintf(`
|
||||
resource "bitbucketserver_group" "%s" {
|
||||
name = "%s"
|
||||
}
|
||||
`, resourceName, groupName)
|
||||
|
||||
createGroup(groupName)
|
||||
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() { testAccPreCheck(t) },
|
||||
Providers: testAccProviders,
|
||||
Steps: []resource.TestStep{
|
||||
{
|
||||
Config: config,
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
resource.TestCheckResourceAttr(fmt.Sprintf("bitbucketserver_group.%s", resourceName), "name", groupName),
|
||||
),
|
||||
ExpectError: regexp.MustCompile("API Error: 409"),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestAccBitbucketResourceGroup_AllowImport(t *testing.T) {
|
||||
resourceName := "duplicate_group"
|
||||
groupName := "duplicate-group"
|
||||
config := fmt.Sprintf(`
|
||||
resource "bitbucketserver_group" "%s" {
|
||||
name = "%s"
|
||||
import_if_exists = true
|
||||
}
|
||||
`, resourceName, groupName)
|
||||
|
||||
createGroup(groupName)
|
||||
|
||||
resource.Test(t, resource.TestCase{
|
||||
PreCheck: func() { testAccPreCheck(t) },
|
||||
Providers: testAccProviders,
|
||||
Steps: []resource.TestStep{
|
||||
{
|
||||
Config: config,
|
||||
Check: resource.ComposeTestCheckFunc(
|
||||
resource.TestCheckResourceAttr(fmt.Sprintf("bitbucketserver_group.%s", resourceName), "name", groupName),
|
||||
),
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func createGroup(groupName string) {
|
||||
client := newBitbucketClient()
|
||||
client.Post(fmt.Sprintf("/rest/api/1.0/admin/groups?name=%s", url.QueryEscape(groupName)), nil)
|
||||
}
|
||||
|
||||
func newBitbucketClient() *BitbucketClient {
|
||||
serverSanitized := os.Getenv("BITBUCKET_SERVER")
|
||||
if strings.HasSuffix(serverSanitized, "/") {
|
||||
serverSanitized = serverSanitized[0 : len(serverSanitized)-1]
|
||||
}
|
||||
|
||||
return &BitbucketClient{
|
||||
Server: serverSanitized,
|
||||
Username: os.Getenv("BITBUCKET_USERNAME"),
|
||||
Password: os.Getenv("BITBUCKET_PASSWORD"),
|
||||
HTTPClient: &http.Client{},
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user