Update the CA certificate with a os environment (#442)

* Update the CA certificate with a os environment 1. Why is this change necessary? The certs are going to expire, so if this is a parameter from the env, is going to be more resilient. 2. How does it address the issue? These changes bring the CA certificate from an environment variable (CA_CERT) 3. What side effects does this change have? None, pure joy. :-) * Update Github Actions variables 1. Why is this change necessary? Github Actions needs a basic configuration on the repo to work 2. How does it address the issue? Add the necessary info into the repo 3. What side effects does this change have? None
mongodb · Apr 23, 2021 · defbd0f · defbd0f
1 parent 2ff8bcf
commit defbd0f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 81 deletions.
diff --git a/.github/workflows/automated-test-acceptances.yml b/.github/workflows/automated-test-acceptances.yml
@@ -71,4 +71,5 @@ jobs:
           GCP_REGION_NAME: ${{ secrets.GCP_REGION_NAME }}
           GOOGLE_CLOUD_KEYFILE_JSON: ${{ secrets.GOOGLE_CLOUD_KEYFILE_JSON }}
           GCP_KEY_VERSION_RESOURCE_ID: ${{ secrets.GCP_KEY_VERSION_RESOURCE_ID }}
+          CA_CERT: ${{ secrets.CA_CERT }}
         run: make testacc
diff --git a/mongodbatlas/data_source_mongodbatlas_x509_authentication_database_user_test.go b/mongodbatlas/data_source_mongodbatlas_x509_authentication_database_user_test.go
@@ -41,32 +41,7 @@ func TestAccDataSourceMongoX509AuthDBUser_basic(t *testing.T) {
 func TestAccDataSourceMongoX509AuthDBUser_WithCustomerX509(t *testing.T) {
 	resourceName := "data.mongodbatlas_x509_authentication_database_user.test"
 	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
-	cas := `
------BEGIN CERTIFICATE-----
-MIIEBzCCAu+gAwIBAgIUbwfQS97LZAIc/tPPVRYEWKkDETkwDQYJKoZIhvcNAQEL
-BQAwgZIxCzAJBgNVBAYTAkFVMQwwCgYDVQQIDANOU1cxDzANBgNVBAcMBlN5ZG5l
-eTEQMA4GA1UECgwHTW9uZ29EQjENMAsGA1UECwwEcm9vdDEbMBkGA1UEAwwScG9w
-LW9zLmxvY2FsZG9tYWluMSYwJAYJKoZIhvcNAQkBFhdlZGdhci5sb3BlekBtb25n
-b2RiLmNvbTAeFw0yMTAyMjIxODE4NTFaFw0yMTAzMjQxODE4NTFaMIGSMQswCQYD
-VQQGEwJBVTEMMAoGA1UECAwDTlNXMQ8wDQYDVQQHDAZTeWRuZXkxEDAOBgNVBAoM
-B01vbmdvREIxDTALBgNVBAsMBHJvb3QxGzAZBgNVBAMMEnBvcC1vcy5sb2NhbGRv
-bWFpbjEmMCQGCSqGSIb3DQEJARYXZWRnYXIubG9wZXpAbW9uZ29kYi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClBpr0bTP5AElcNmSLC5ioMYJZ
-3LyBCTtcz2YDvrFoaN4UKUvD5pXTkkhSdHRgIpVbvibHQl118haj+gcN9s1GP0lb
-6Lz5XPOs6QdjO4fGz9M8WOPFWuAiXmDqqGhobVcSdEFtddtCPE0PAsKmzVBuDd/1
-RYGskzLC94f0SL9YYmF6kqXKXTH+D7JHpUWqCms3RCKIc2AYdlU0LD1dqyjabbWN
-I2PS4j6xQca9ZfpqlHvUxwAzLuaMAZYHDUQ++uVJi/iHY7Dd2/PA41sUT/ymwmJH
-4Zc4Nd73WFtYUBQxHa3sNfhiNFZ4BW6LkBGcPV6+r5AZIe3ZiEP1MuKim91XAgMB
-AAGjUzBRMB0GA1UdDgQWBBRTwbI8Tx+JDkNUn7k+JHZ/HHQAnTAfBgNVHSMEGDAW
-gBRTwbI8Tx+JDkNUn7k+JHZ/HHQAnTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQAwObUHhCqt9UZAuqvke+HMU9FRiNehEKm+1JygZ2SQSPAnlR2S
-+ttihCxjyU5wVgEs8lo/VoPxtc8TfA/rKYn3xhTdqSo9nSOZVS+F8OA2A5ClnTc8
-U1l6t5KeQTKOsGFdyc5xzRM2P0nAY6WWB2PpFyPlwCJtPIq2l0my3W2za8m7DCLO
-XXJ5LYUZ8kFJKFEnS7F++A7102+tOs/GSeXwg3u9aYhhjwgsHneWzW5YLOtDqIPg
-ulnNdinFfGNo57BqKbRlwqdU0HIHLAZPXnftQbKMamxNw2IN169yPJPRNfdPvL/S
-5niRVVHHXMoEYp8L9KZ3aJQODnxY05IbTEjP
------END CERTIFICATE-----
-`
+	cas := os.Getenv("CA_CERT")
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },

diff --git a/mongodbatlas/resource_mongodbatlas_x509_authentication_database_user_test.go b/mongodbatlas/resource_mongodbatlas_x509_authentication_database_user_test.go
@@ -49,34 +49,9 @@ func TestAccResourceMongoDBAtlasX509AuthDBUser_basic(t *testing.T) {
 func TestAccResourceMongoDBAtlasX509AuthDBUser_WithCustomerX509(t *testing.T) {
 	var (
 		resourceName = "mongodbatlas_x509_authentication_database_user.test"
-		cas          = `
------BEGIN CERTIFICATE-----
-MIIEBzCCAu+gAwIBAgIUbwfQS97LZAIc/tPPVRYEWKkDETkwDQYJKoZIhvcNAQEL
-BQAwgZIxCzAJBgNVBAYTAkFVMQwwCgYDVQQIDANOU1cxDzANBgNVBAcMBlN5ZG5l
-eTEQMA4GA1UECgwHTW9uZ29EQjENMAsGA1UECwwEcm9vdDEbMBkGA1UEAwwScG9w
-LW9zLmxvY2FsZG9tYWluMSYwJAYJKoZIhvcNAQkBFhdlZGdhci5sb3BlekBtb25n
-b2RiLmNvbTAeFw0yMTAyMjIxODE4NTFaFw0yMTAzMjQxODE4NTFaMIGSMQswCQYD
-VQQGEwJBVTEMMAoGA1UECAwDTlNXMQ8wDQYDVQQHDAZTeWRuZXkxEDAOBgNVBAoM
-B01vbmdvREIxDTALBgNVBAsMBHJvb3QxGzAZBgNVBAMMEnBvcC1vcy5sb2NhbGRv
-bWFpbjEmMCQGCSqGSIb3DQEJARYXZWRnYXIubG9wZXpAbW9uZ29kYi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClBpr0bTP5AElcNmSLC5ioMYJZ
-3LyBCTtcz2YDvrFoaN4UKUvD5pXTkkhSdHRgIpVbvibHQl118haj+gcN9s1GP0lb
-6Lz5XPOs6QdjO4fGz9M8WOPFWuAiXmDqqGhobVcSdEFtddtCPE0PAsKmzVBuDd/1
-RYGskzLC94f0SL9YYmF6kqXKXTH+D7JHpUWqCms3RCKIc2AYdlU0LD1dqyjabbWN
-I2PS4j6xQca9ZfpqlHvUxwAzLuaMAZYHDUQ++uVJi/iHY7Dd2/PA41sUT/ymwmJH
-4Zc4Nd73WFtYUBQxHa3sNfhiNFZ4BW6LkBGcPV6+r5AZIe3ZiEP1MuKim91XAgMB
-AAGjUzBRMB0GA1UdDgQWBBRTwbI8Tx+JDkNUn7k+JHZ/HHQAnTAfBgNVHSMEGDAW
-gBRTwbI8Tx+JDkNUn7k+JHZ/HHQAnTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQAwObUHhCqt9UZAuqvke+HMU9FRiNehEKm+1JygZ2SQSPAnlR2S
-+ttihCxjyU5wVgEs8lo/VoPxtc8TfA/rKYn3xhTdqSo9nSOZVS+F8OA2A5ClnTc8
-U1l6t5KeQTKOsGFdyc5xzRM2P0nAY6WWB2PpFyPlwCJtPIq2l0my3W2za8m7DCLO
-XXJ5LYUZ8kFJKFEnS7F++A7102+tOs/GSeXwg3u9aYhhjwgsHneWzW5YLOtDqIPg
-ulnNdinFfGNo57BqKbRlwqdU0HIHLAZPXnftQbKMamxNw2IN169yPJPRNfdPvL/S
-5niRVVHHXMoEYp8L9KZ3aJQODnxY05IbTEjP
------END CERTIFICATE-----
-`
-		orgID       = os.Getenv("MONGODB_ATLAS_ORG_ID")
-		projectName = acctest.RandomWithPrefix("test-acc")
+		cas          = os.Getenv("CA_CERT")
+		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
+		projectName  = acctest.RandomWithPrefix("test-acc")
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -160,33 +135,9 @@ func TestAccResourceMongoDBAtlasX509AuthDBUser_WithDatabaseUser(t *testing.T) {
 func TestAccResourceMongoDBAtlasX509AuthDBUser_importWithCustomerX509(t *testing.T) {
 	var (
 		resourceName = "mongodbatlas_x509_authentication_database_user.test"
-		cas          = `
------BEGIN CERTIFICATE-----
-MIIEBzCCAu+gAwIBAgIUbwfQS97LZAIc/tPPVRYEWKkDETkwDQYJKoZIhvcNAQEL
-BQAwgZIxCzAJBgNVBAYTAkFVMQwwCgYDVQQIDANOU1cxDzANBgNVBAcMBlN5ZG5l
-eTEQMA4GA1UECgwHTW9uZ29EQjENMAsGA1UECwwEcm9vdDEbMBkGA1UEAwwScG9w
-LW9zLmxvY2FsZG9tYWluMSYwJAYJKoZIhvcNAQkBFhdlZGdhci5sb3BlekBtb25n
-b2RiLmNvbTAeFw0yMTAyMjIxODE4NTFaFw0yMTAzMjQxODE4NTFaMIGSMQswCQYD
-VQQGEwJBVTEMMAoGA1UECAwDTlNXMQ8wDQYDVQQHDAZTeWRuZXkxEDAOBgNVBAoM
-B01vbmdvREIxDTALBgNVBAsMBHJvb3QxGzAZBgNVBAMMEnBvcC1vcy5sb2NhbGRv
-bWFpbjEmMCQGCSqGSIb3DQEJARYXZWRnYXIubG9wZXpAbW9uZ29kYi5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClBpr0bTP5AElcNmSLC5ioMYJZ
-3LyBCTtcz2YDvrFoaN4UKUvD5pXTkkhSdHRgIpVbvibHQl118haj+gcN9s1GP0lb
-6Lz5XPOs6QdjO4fGz9M8WOPFWuAiXmDqqGhobVcSdEFtddtCPE0PAsKmzVBuDd/1
-RYGskzLC94f0SL9YYmF6kqXKXTH+D7JHpUWqCms3RCKIc2AYdlU0LD1dqyjabbWN
-I2PS4j6xQca9ZfpqlHvUxwAzLuaMAZYHDUQ++uVJi/iHY7Dd2/PA41sUT/ymwmJH
-4Zc4Nd73WFtYUBQxHa3sNfhiNFZ4BW6LkBGcPV6+r5AZIe3ZiEP1MuKim91XAgMB
-AAGjUzBRMB0GA1UdDgQWBBRTwbI8Tx+JDkNUn7k+JHZ/HHQAnTAfBgNVHSMEGDAW
-gBRTwbI8Tx+JDkNUn7k+JHZ/HHQAnTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQAwObUHhCqt9UZAuqvke+HMU9FRiNehEKm+1JygZ2SQSPAnlR2S
-+ttihCxjyU5wVgEs8lo/VoPxtc8TfA/rKYn3xhTdqSo9nSOZVS+F8OA2A5ClnTc8
-U1l6t5KeQTKOsGFdyc5xzRM2P0nAY6WWB2PpFyPlwCJtPIq2l0my3W2za8m7DCLO
-XXJ5LYUZ8kFJKFEnS7F++A7102+tOs/GSeXwg3u9aYhhjwgsHneWzW5YLOtDqIPg
-ulnNdinFfGNo57BqKbRlwqdU0HIHLAZPXnftQbKMamxNw2IN169yPJPRNfdPvL/S
-5niRVVHHXMoEYp8L9KZ3aJQODnxY05IbTEjP
------END CERTIFICATE-----`
-		orgID       = os.Getenv("MONGODB_ATLAS_ORG_ID")
-		projectName = acctest.RandomWithPrefix("test-acc")
+		cas          = os.Getenv("CA_CERT")
+		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
+		projectName  = acctest.RandomWithPrefix("test-acc")
 	)
 
 	resource.ParallelTest(t, resource.TestCase{