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

Fix user name with spaces not working

Browse Source
This commit is contained in:
Martin Litvaj
2020-07-17 14:55:07 +02:00
parent f116e39d79
commit cfe75d3bc8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bitbucket/resource_user.go
View File

@@ -152,7 +152,7 @@ func resourceUserRead(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketServerProvider).BitbucketClient client := m.(*BitbucketServerProvider).BitbucketClient
req, err := client.Get(fmt.Sprintf("/rest/api/1.0/users/%s", req, err := client.Get(fmt.Sprintf("/rest/api/1.0/users/%s",
url.QueryEscape(name), url.PathEscape(name),
)) ))
if err != nil { if err != nil {
@@ -192,7 +192,7 @@ func resourceUserExists(d *schema.ResourceData, m interface{}) (bool, error) {
client := m.(*BitbucketServerProvider).BitbucketClient client := m.(*BitbucketServerProvider).BitbucketClient
req, err := client.Get(fmt.Sprintf("/rest/api/1.0/users/%s", req, err := client.Get(fmt.Sprintf("/rest/api/1.0/users/%s",
url.QueryEscape(name), url.PathEscape(name),
)) ))
if err != nil { if err != nil {

6
bitbucket/resource_user_test.go
View File

@@ -15,7 +15,7 @@ func TestAccBitbucketUser(t *testing.T) {
userRand := fmt.Sprintf("%v", rand.New(rand.NewSource(time.Now().UnixNano())).Int()) userRand := fmt.Sprintf("%v", rand.New(rand.NewSource(time.Now().UnixNano())).Int())
config := fmt.Sprintf(` config := fmt.Sprintf(`
resource "bitbucketserver_user" "test" { resource "bitbucketserver_user" "test" {
name = "admin%v" name = "admin %v"
display_name = "Admin %v" display_name = "Admin %v"
email_address = "admin%v@example.com" email_address = "admin%v@example.com"
} }
@@ -31,7 +31,7 @@ func TestAccBitbucketUser(t *testing.T) {
{ {
Config: config, Config: config,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("bitbucketserver_user.test", "name", "admin"+userRand), resource.TestCheckResourceAttr("bitbucketserver_user.test", "name", "admin "+userRand),
resource.TestCheckResourceAttr("bitbucketserver_user.test", "display_name", "Admin "+userRand), resource.TestCheckResourceAttr("bitbucketserver_user.test", "display_name", "Admin "+userRand),
resource.TestCheckResourceAttr("bitbucketserver_user.test", "email_address", "admin"+userRand+"@example.com"), resource.TestCheckResourceAttr("bitbucketserver_user.test", "email_address", "admin"+userRand+"@example.com"),
resource.TestCheckResourceAttrSet("bitbucketserver_user.test", "initial_password"), resource.TestCheckResourceAttrSet("bitbucketserver_user.test", "initial_password"),
@@ -40,7 +40,7 @@ func TestAccBitbucketUser(t *testing.T) {
{ {
Config: configModified, Config: configModified,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("bitbucketserver_user.test", "name", "admin"+userRand), resource.TestCheckResourceAttr("bitbucketserver_user.test", "name", "admin "+userRand),
resource.TestCheckResourceAttr("bitbucketserver_user.test", "display_name", "Admin Updated "+userRand), resource.TestCheckResourceAttr("bitbucketserver_user.test", "display_name", "Admin Updated "+userRand),
resource.TestCheckResourceAttr("bitbucketserver_user.test", "email_address", "admin"+userRand+"@example.com"), resource.TestCheckResourceAttr("bitbucketserver_user.test", "email_address", "admin"+userRand+"@example.com"),
resource.TestCheckResourceAttrSet("bitbucketserver_user.test", "initial_password"), resource.TestCheckResourceAttrSet("bitbucketserver_user.test", "initial_password"),