base64encode(file -> filebase64

hashicorp · Apr 18, 2019 · 66ea83a · 66ea83a
1 parent 5a50dc5
commit 66ea83a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/azurerm/data_source_batch_certificate_test.go b/azurerm/data_source_batch_certificate_test.go
@@ -52,7 +52,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "test" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.pfx"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
 	format               = "Pfx"
 	password             = "terraform"
 	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"

diff --git a/azurerm/data_source_batch_pool_test.go b/azurerm/data_source_batch_pool_test.go
@@ -88,7 +88,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "test" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.pfx"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
 	format               = "Pfx"
 	password             = "terraform"
 	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"

diff --git a/azurerm/resource_arm_api_management_certificate_test.go b/azurerm/resource_arm_api_management_certificate_test.go
@@ -146,7 +146,7 @@ resource "azurerm_api_management_certificate" "test" {
   name                = "example-cert"
   api_management_name = "${azurerm_api_management.test.name}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  data                = "${base64encode(file("testdata/keyvaultcert.pfx"))}"
+  data                = "${filebase64("testdata/keyvaultcert.pfx")}"
   password            = ""
 }
 `, rInt, location, rInt)

diff --git a/azurerm/resource_arm_batch_certificate_test.go b/azurerm/resource_arm_batch_certificate_test.go
@@ -129,7 +129,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "test" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.pfx"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
 	format               = "Pfx"
 	password             = "terraform"
 	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
@@ -155,7 +155,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "test" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.pfx"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
 	format               = "Pfx"
 	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"
 	thumbprint_algorithm = "SHA1"
@@ -179,7 +179,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "test" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.cer"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.cer")}"
 	format               = "Cer"
 	thumbprint           = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"
 	thumbprint_algorithm = "SHA1"
@@ -203,7 +203,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "test" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.cer"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.cer")}"
 	format               = "Cer"
 	password             = "should not have a password for Cer"
 	thumbprint           = "312D31A79FA0CEF49C00F769AFC2B73E9F4EDF34"

diff --git a/azurerm/resource_arm_batch_pool_test.go b/azurerm/resource_arm_batch_pool_test.go
@@ -871,15 +871,15 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "testcer" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.cer"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.cer")}"
 	format               = "Cer"
 	thumbprint           = "312d31a79fa0cef49c00f769afc2b73e9f4edf34" # deliberately using lowercase here as verification
 	thumbprint_algorithm = "SHA1"
 }
 resource "azurerm_batch_certificate" "testpfx" {
 	resource_group_name  = "${azurerm_resource_group.test.name}"
 	account_name         = "${azurerm_batch_account.test.name}"
-	certificate          = "${base64encode(file("testdata/batch_certificate.pfx"))}"
+	certificate          = "${filebase64("testdata/batch_certificate.pfx")}"
 	format               = "Pfx"
 	password             = "terraform"
 	thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"

diff --git a/website/docs/r/api_management_certificate.html.markdown b/website/docs/r/api_management_certificate.html.markdown
@@ -35,7 +35,7 @@ resource "azurerm_api_management_certificate" "test" {
   name                = "example-cert"
   api_management_name = "${azurerm_api_management.test.name}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  data                = "${base64encode(file("example.pfx"))}"
+  data                = "${filebase64("example.pfx")}"
 }
 ```
 

diff --git a/website/docs/r/batch_certificate.html.markdown b/website/docs/r/batch_certificate.html.markdown
@@ -42,7 +42,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "test" {
   resource_group_name  = "${azurerm_resource_group.test.name}"
   account_name         = "${azurerm_batch_account.test.name}"
-  certificate          = "${base64encode(file("certificate.pfx"))}"
+  certificate          = "${filebase64("certificate.pfx")}"
   format               = "Pfx"
   password             = "terraform"
   thumbprint           = "42C107874FD0E4A9583292A2F1098E8FE4B2EDDA"

diff --git a/website/docs/r/batch_pool.html.markdown b/website/docs/r/batch_pool.html.markdown
@@ -42,7 +42,7 @@ resource "azurerm_batch_account" "test" {
 resource "azurerm_batch_certificate" "testcer" {
   resource_group_name  = "${azurerm_resource_group.test.name}"
   account_name         = "${azurerm_batch_account.test.name}"
-  certificate          = "${base64encode(file("certificate.cer"))}"
+  certificate          = "${filebase64("certificate.cer")}"
   format               = "Cer"
   thumbprint           = "312d31a79fa0cef49c00f769afc2b73e9f4edf34"
   thumbprint_algorithm = "SHA1"