Merge pull request #77 from Nkmol/fix-know-host-hostame-and-pub-key-syntax

docs(know_host) update `hostname` and `public_key.key` to the correct…

Author: DrFaust92

bitbucket/resource_pipeline_ssh_known_host_test.go

@@ -16,13 +16,12 @@ func TestAccBitbucketPipelineSshKnownHost_basic(t *testing.T) {
 
 	rName := acctest.RandomWithPrefix("tf-test")
 	owner := os.Getenv("BITBUCKET_TEAM")
-	userEmail := os.Getenv("BITBUCKET_USERNAME")
-	publicKey, _, err := RandSSHKeyPairSize(2048, userEmail)
+	publicKey, err := RandPlainSSHKeyPairSize(2048)
 	if err != nil {
 		t.Fatalf("error generating random SSH key: %s", err)
 	}
 
-	publicKey2, _, err := RandSSHKeyPairSize(2048, userEmail)
+	publicKey2, err := RandPlainSSHKeyPairSize(2048)
 	if err != nil {
 		t.Fatalf("error generating random SSH key: %s", err)
 	}
@@ -33,12 +32,12 @@ func TestAccBitbucketPipelineSshKnownHost_basic(t *testing.T) {
 		CheckDestroy: testAccCheckBitbucketPipelineSshKnownHostDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccBitbucketPipelineSshKnownHostConfig(owner, rName, publicKey, "example.com"),
+				Config: testAccBitbucketPipelineSshKnownHostConfig(owner, rName, publicKey, "[example.com]"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckBitbucketPipelineSshKnownHostExists(resourceName),
 					resource.TestCheckResourceAttrPair(resourceName, "workspace", "bitbucket_repository.test", "owner"),
 					resource.TestCheckResourceAttrPair(resourceName, "repository", "bitbucket_repository.test", "name"),
-					resource.TestCheckResourceAttr(resourceName, "hostname", "example.com"),
+					resource.TestCheckResourceAttr(resourceName, "hostname", "[example.com]"),
 					resource.TestCheckResourceAttr(resourceName, "public_key.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "public_key.0.key_type", "ssh-rsa"),
 					resource.TestCheckResourceAttrSet(resourceName, "public_key.0.md5_fingerprint"),
@@ -51,11 +50,11 @@ func TestAccBitbucketPipelineSshKnownHost_basic(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccBitbucketPipelineSshKnownHostConfig(owner, rName, publicKey2, "example2.com"),
+				Config: testAccBitbucketPipelineSshKnownHostConfig(owner, rName, publicKey2, "[example2.com]:22"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrPair(resourceName, "workspace", "bitbucket_repository.test", "owner"),
 					resource.TestCheckResourceAttrPair(resourceName, "repository", "bitbucket_repository.test", "name"),
-					resource.TestCheckResourceAttr(resourceName, "hostname", "example2.com"),
+					resource.TestCheckResourceAttr(resourceName, "hostname", "[example2.com]:22"),
 					resource.TestCheckResourceAttr(resourceName, "public_key.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "public_key.0.key_type", "ssh-rsa"),
 					resource.TestCheckResourceAttrSet(resourceName, "public_key.0.md5_fingerprint"),
@@ -121,7 +120,7 @@ resource "bitbucket_pipeline_ssh_known_host" "test" {
 
   public_key {
     key_type = "ssh-rsa" 
-    key      = base64encode(%[3]q)
+    key      = %[3]q
   }
 }
 `, workspace, rName, pubKey, host)

bitbucket/utils.go

@@ -31,6 +31,15 @@ func RandSSHKeyPairSize(keySize int, comment string) (string, string, error) {
 	return fmt.Sprintf("%s %s", keyMaterial, comment), privateKeyPEM, nil
 }
 
+func RandPlainSSHKeyPairSize(keySize int) (string, error) {
+	privateKey, _, err := RandSSHKeyPairSize(keySize, "")
+	if err != nil {
+		return "", err
+	}
+
+	return strings.Split(privateKey, " ")[1], nil
+}
+
 func genPrivateKey(keySize int) (*rsa.PrivateKey, string, error) {
 	privateKey, err := rsa.GenerateKey(crand.Reader, keySize)
 	if err != nil {

docs/resources/pipeline_ssh_known_host.md

@@ -18,11 +18,11 @@ This allows you to manage your Pipeline Ssh Known Hosts for a repository.
 resource "bitbucket_pipeline_ssh_known_host" "test" {
   workspace  = "example"
   repository = bitbucket_repository.test.name
-  hostname   = "example.com"
+  hostname   = "[example.com]:22"
 
   public_key {
     key_type = "ssh-ed25519" 
-    key      = base64encode("ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqP3Cr632C2dNhhgKVcon4ldUSAeKiku2yP9O9/bDtY")
+    key      = "AAAAC3NzaC1lZDI1NTE5AAAAIKqP3Cr632C2dNhhgKVcon4ldUSAeKiku2yP9O9/bDtY"
   }
 }
 ```
@@ -39,7 +39,7 @@ The following arguments are supported:
 ### Public Key
 
 * `key_type` - The type of the public key. Valid values are `ssh-ed25519`, `ecdsa-sha2-nistp256`, `ssh-rsa`, and `ssh-dss`.
-* `key` - The base64 encoded public key.
+* `key` - The plain public key.
 
 ## Attributes Reference