From cfe75d3bc8a419aa27ee97b62f3e4213b26e7809 Mon Sep 17 00:00:00 2001 From: Martin Litvaj Date: Fri, 17 Jul 2020 14:55:07 +0200 Subject: [PATCH] Fix user name with spaces not working --- bitbucket/resource_user.go | 4 ++-- bitbucket/resource_user_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitbucket/resource_user.go b/bitbucket/resource_user.go index ac09621..db1a95d 100644 --- a/bitbucket/resource_user.go +++ b/bitbucket/resource_user.go @@ -152,7 +152,7 @@ func resourceUserRead(d *schema.ResourceData, m interface{}) error { client := m.(*BitbucketServerProvider).BitbucketClient req, err := client.Get(fmt.Sprintf("/rest/api/1.0/users/%s", - url.QueryEscape(name), + url.PathEscape(name), )) if err != nil { @@ -192,7 +192,7 @@ func resourceUserExists(d *schema.ResourceData, m interface{}) (bool, error) { client := m.(*BitbucketServerProvider).BitbucketClient req, err := client.Get(fmt.Sprintf("/rest/api/1.0/users/%s", - url.QueryEscape(name), + url.PathEscape(name), )) if err != nil { diff --git a/bitbucket/resource_user_test.go b/bitbucket/resource_user_test.go index 04682ba..8232237 100644 --- a/bitbucket/resource_user_test.go +++ b/bitbucket/resource_user_test.go @@ -15,7 +15,7 @@ func TestAccBitbucketUser(t *testing.T) { userRand := fmt.Sprintf("%v", rand.New(rand.NewSource(time.Now().UnixNano())).Int()) config := fmt.Sprintf(` resource "bitbucketserver_user" "test" { - name = "admin%v" + name = "admin %v" display_name = "Admin %v" email_address = "admin%v@example.com" } @@ -31,7 +31,7 @@ func TestAccBitbucketUser(t *testing.T) { { Config: config, 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", "email_address", "admin"+userRand+"@example.com"), resource.TestCheckResourceAttrSet("bitbucketserver_user.test", "initial_password"), @@ -40,7 +40,7 @@ func TestAccBitbucketUser(t *testing.T) { { Config: configModified, 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", "email_address", "admin"+userRand+"@example.com"), resource.TestCheckResourceAttrSet("bitbucketserver_user.test", "initial_password"),