GitHub actions tests

.github/workflows/automated-test-acceptances.yml

@@ -0,0 +1,55 @@
+name: 'Automated Acceptances Tests'
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  acceptances-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.14
+      - name: Acceptance Tests
+        env:
+          SKIP_TEST_EXTERNAL_CREDENTIALS: ${{ secrets.SKIP_TEST_EXTERNAL_CREDENTIALS }}
+          SKIP_TEST_IMPORT: ${{ secrets.SKIP_TEST_IMPORT }}
+          MONGODB_ATLAS_PUBLIC_KEY: ${{ secrets.MONGODB_ATLAS_PUBLIC_KEY }}
+          MONGODB_ATLAS_PRIVATE_KEY: ${{ secrets.MONGODB_ATLAS_PRIVATE_KEY }}
+          MONGODB_ATLAS_PROJECT_ID: ${{ secrets.MONGODB_ATLAS_PROJECT_ID }}
+          MONGODB_ATLAS_ORG_ID: ${{ secrets.MONGODB_ATLAS_ORG_ID }}
+          MONGODB_ATLAS_DB_USERNAME: ${{ secrets.MONGODB_ATLAS_DB_USERNAME }}
+          MONGODB_ATLAS_TEAMS_IDS: ${{ secrets.MONGODB_ATLAS_TEAMS_IDS }}
+          AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
+          AWS_VPC_ID: ${{ secrets.AWS_VPC_ID }}
+          AWS_VPC_CIDR_BLOCK: ${{ secrets.AWS_VPC_CIDR_BLOCK }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_CUSTOMER_MASTER_KEY_ID: ${{ secrets.AWS_CUSTOMER_MASTER_KEY_ID }}
+          AZURE_DIRECTORY_ID: ${{ secrets.AZURE_DIRECTORY_ID }}
+          AZURE_SUBCRIPTION_ID: ${{ secrets.AZURE_SUBCRIPTION_ID }}
+          AZURE_VNET_NAME: ${{ secrets.AZURE_VNET_NAME }}
+          AZURE_RESOURCE_GROUP_NAME: ${{ secrets.AZURE_RESOURCE_GROUP_NAME }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_ID_UPDATED: ${{ secrets.AZURE_CLIENT_ID_UPDATED }}
+          AZURE_RESOURCE_GROUP_NAME_UPDATED: ${{ secrets.AZURE_RESOURCE_GROUP_NAME_UPDATED }}
+          AZURE_SECRET: ${{ secrets.AZURE_SECRET }}
+          AZURE_KEY_VAULT_NAME: ${{ secrets.AZURE_KEY_VAULT_NAME }}
+          AZURE_KEY_VAULT_NAME_UPDATED: ${{ secrets.AZURE_KEY_VAULT_NAME_UPDATED }}
+          AZURE_KEY_IDENTIFIER: ${{ secrets.AZURE_KEY_IDENTIFIER }}
+          AZURE_KEY_IDENTIFIER_UPDATED: ${{ secrets.AZURE_KEY_IDENTIFIER_UPDATED }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }}
+          GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
+          GCP_CLUSTER_REGION_NAME: ${{ secrets.GCP_CLUSTER_REGION_NAME }}
+          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 }}
+        run: make testacc

.github/workflows/automated-test.yml

@@ -0,0 +1,22 @@
+name: 'Automated Tests'
+
+on: push
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.14
+      - name: Code Lint
+        run: make tools && make lint
+      - name: Website
+        run: make tools && make website-lint
+      - name: Test
+        env:
+          MONGODB_ATLAS_TEAMS_IDS: ${{ secrets.MONGODB_ATLAS_TEAMS_IDS }}
+        run: make test

README.md

@@ -91,6 +91,22 @@ export MONGODB_ATLAS_PUBLIC_KEY=<YOUR_PUBLIC_KEY>
 export MONGODB_ATLAS_PRIVATE_KEY=<YOUR_PRIVATE_KEY>
 ```
 
+- For `Authentication database user` resource configuration:
+```sh
+$ export MONGODB_ATLAS_DB_USERNAME=<YOUR_DATABASE_NAME>
+```
+
+- For `Project(s)` resource configuration:
+```sh
+$ export MONGODB_ATLAS_TEAMS_IDS=<YOUR_TEAMS_IDS>
+```
+~> **Notice:** It should be at least one team id up to 3 teams ids depending of acceptance testing using separator comma like this `teamId1,teamdId2,teamId3`.
+
+- For skip acceptances testing that requires additional credentials such as AWS, AZURE and GCP:
+```sh
+export SKIP_TEST_EXTERNAL_CREDENTIALS=TRUE
+```
+
 ##### AWS env variables
 
 - For `Network Peering` resource configuration:

mongodbatlas/data_source_mongodbatlas_cloud_provider_snapshot_restore_job.go

@@ -76,7 +76,7 @@ func dataSourceMongoDBAtlasCloudProviderSnapshotRestoreJob() *schema.Resource {
 				Computed: true,
 			},
 			"oplog_ts": {
-				Type:     schema.TypeString,
+				Type:     schema.TypeInt,
 				Computed: true,
 			},
 			"point_in_time_utc_seconds": {

mongodbatlas/data_source_mongodbatlas_cloud_provider_snapshot_restore_job_test.go

@@ -46,7 +46,7 @@ func testAccMongoDBAtlasDataSourceCloudProviderSnapshotRestoreJobConfig(projectI
 
 			// Provider Settings "block"
 			provider_name               = "AWS"
-			provider_region_name        = "EU_WEST_2"
+			provider_region_name        = "US_EAST_1"
 			provider_instance_size_name = "M10"
 			provider_backup_enabled     = true //enable cloud provider snapshots
 			provider_disk_iops          = 100
@@ -63,7 +63,7 @@ func testAccMongoDBAtlasDataSourceCloudProviderSnapshotRestoreJobConfig(projectI
 		resource "mongodbatlas_cloud_provider_snapshot_restore_job" "test" {
 			project_id    = mongodbatlas_cloud_provider_snapshot.test.project_id
 			cluster_name  = mongodbatlas_cloud_provider_snapshot.test.cluster_name
-			snapshot_id   = mongodbatlas_cloud_provider_snapshot.test.id
+			snapshot_id   = mongodbatlas_cloud_provider_snapshot.test.snapshot_id
 			delivery_type = {
 				download = true
 			}
@@ -73,7 +73,7 @@ func testAccMongoDBAtlasDataSourceCloudProviderSnapshotRestoreJobConfig(projectI
 		data "mongodbatlas_cloud_provider_snapshot_restore_job" "test" {
 			project_id   = mongodbatlas_cloud_provider_snapshot_restore_job.test.project_id
 			cluster_name = mongodbatlas_cloud_provider_snapshot_restore_job.test.cluster_name
-			job_id       = mongodbatlas_cloud_provider_snapshot_restore_job.test.id
+			job_id       = mongodbatlas_cloud_provider_snapshot_restore_job.test.snapshot_restore_job_id
 		}
 	`, projectID, clusterName, description, retentionInDays)
 }

mongodbatlas/data_source_mongodbatlas_cloud_provider_snapshot_restore_jobs_test.go

@@ -90,7 +90,7 @@ func testAccMongoDBAtlasCloudProviderSnapshotRestoreJobsConfig(projectID, cluste
 		resource "mongodbatlas_cloud_provider_snapshot_restore_job" "test" {
 			project_id    = mongodbatlas_cloud_provider_snapshot.test.project_id
 			cluster_name  = mongodbatlas_cloud_provider_snapshot.test.cluster_name
-			snapshot_id   = mongodbatlas_cloud_provider_snapshot.test.id
+			snapshot_id   = mongodbatlas_cloud_provider_snapshot.test.snapshot_id
 			delivery_type = {
 				download = true
 			}
@@ -129,7 +129,7 @@ func testAccMongoDBAtlasCloudProviderSnapshotRestoreJobsConfigWithPagination(pro
 		resource "mongodbatlas_cloud_provider_snapshot_restore_job" "test" {
 			project_id    = mongodbatlas_cloud_provider_snapshot.test.project_id
 			cluster_name  = mongodbatlas_cloud_provider_snapshot.test.cluster_name
-			snapshot_id   = mongodbatlas_cloud_provider_snapshot.test.id
+			snapshot_id   = mongodbatlas_cloud_provider_snapshot.test.snapshot_id
 			delivery_type = {
 				download = true
 			}

mongodbatlas/data_source_mongodbatlas_cloud_provider_snapshot_test.go

@@ -61,7 +61,7 @@ func testAccMongoDBAtlasDataSourceCloudProviderSnapshotConfig(projectID, cluster
 		}
 
 		data "mongodbatlas_cloud_provider_snapshot" "test" {
-			snapshot_id  = mongodbatlas_cloud_provider_snapshot.test.id
+			snapshot_id  = mongodbatlas_cloud_provider_snapshot.test.snapshot_id
 			project_id   = mongodbatlas_cloud_provider_snapshot.test.project_id
 			cluster_name = mongodbatlas_cloud_provider_snapshot.test.cluster_name
 		}

mongodbatlas/data_source_mongodbatlas_custom_db_role_test.go

@@ -16,7 +16,7 @@ func TestAccDataSourceMongoDBAtlasCustomDBRole_basic(t *testing.T) {
 	roleName := fmt.Sprintf("test-acc-custom_role-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t); checkPeeringEnvAWS(t) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckMongoDBAtlasNetworkPeeringDestroy,
 		Steps: []resource.TestStep{

mongodbatlas/data_source_mongodbatlas_custom_db_roles_test.go

@@ -16,7 +16,7 @@ func TestAccDataSourceMongoDBAtlasCustomDBRoles_basic(t *testing.T) {
 	roleName := fmt.Sprintf("test-acc-custom_role-%s", acctest.RandString(5))
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t); checkPeeringEnvAWS(t) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckMongoDBAtlasNetworkPeeringDestroy,
 		Steps: []resource.TestStep{

mongodbatlas/data_source_mongodbatlas_global_cluster_config_test.go

@@ -50,7 +50,7 @@ func testAccDSMongoDBAtlasGlobalClusterConfig(projectID, name string) string {
 			zone_name  = "Zone 1"
 			num_shards = 2
 			regions_config {
-			region_name     = "EU_CENTRAL_1"
+			region_name     = "US_EAST_1"
 			electable_nodes = 3
 			priority        = 7
 			read_only_nodes = 0

mongodbatlas/data_source_mongodbatlas_maintenance_window_test.go

@@ -33,26 +33,6 @@ func TestAccDataSourceMongoDBAtlasMaintenanceWindow_basic(t *testing.T) {
 	})
 }
 
-func TestAccDataSourceMongoDBAtlasMaintenanceWindow_basicWithStartASAP(t *testing.T) {
-	var maintenance matlas.MaintenanceWindow
-
-	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccMongoDBAtlasDataSourceMaintenanceWindowConfigWithStartASAP(projectID, true),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckMongoDBAtlasMaintenanceWindowExists("mongodbatlas_maintenance_window.test", &maintenance),
-					resource.TestCheckResourceAttrSet("data.mongodbatlas_maintenance_window.test", "start_asap"),
-				),
-			},
-		},
-	})
-}
-
 func testAccMongoDBAtlasDataSourceMaintenanceWindowConfig(projectID string, dayOfWeek, hourOfDay int) string {
 	return fmt.Sprintf(`
 		resource "mongodbatlas_maintenance_window" "test" {
@@ -66,16 +46,3 @@ func testAccMongoDBAtlasDataSourceMaintenanceWindowConfig(projectID string, dayO
 		}
 	`, projectID, dayOfWeek, hourOfDay)
 }
-
-func testAccMongoDBAtlasDataSourceMaintenanceWindowConfigWithStartASAP(projectID string, startAsap bool) string {
-	return fmt.Sprintf(`
-		resource "mongodbatlas_maintenance_window" "test" {
-			project_id  = "%s"
-			start_asap  = %t
-		}
-
-		data "mongodbatlas_maintenance_window" "test" {
-			project_id  = "${mongodbatlas_maintenance_window.test.id}"
-		}
-	`, projectID, startAsap)
-}

mongodbatlas/data_source_mongodbatlas_network_container_test.go

@@ -16,9 +16,10 @@ func TestAccDataSourceMongoDBAtlasNetworkContainer_basic(t *testing.T) {
 	randInt := acctest.RandIntRange(0, 255)
 
 	resourceName := "mongodbatlas_network_container.test_ds"
-	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
 	cidrBlock := fmt.Sprintf("10.8.%d.0/24", randInt)
 	dataSourceName := "data.mongodbatlas_network_container.test_ds"
+	orgID := os.Getenv("MONGODB_ATLAS_ORG_ID")
+	projectName := acctest.RandomWithPrefix("test-acc")
 
 	providerName := "AWS"
 
@@ -28,7 +29,7 @@ func TestAccDataSourceMongoDBAtlasNetworkContainer_basic(t *testing.T) {
 		CheckDestroy: testAccCheckMongoDBAtlasNetworkContainerDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccMongoDBAtlasNetworkContainerDSConfig(projectID, cidrBlock),
+				Config: testAccMongoDBAtlasNetworkContainerDSConfig(projectName, orgID, cidrBlock),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMongoDBAtlasNetworkContainerExists(resourceName, &container),
 					testAccCheckMongoDBAtlasNetworkContainerAttributes(&container, providerName),
@@ -44,10 +45,15 @@ func TestAccDataSourceMongoDBAtlasNetworkContainer_basic(t *testing.T) {
 	})
 }
 
-func testAccMongoDBAtlasNetworkContainerDSConfig(projectID, cidrBlock string) string {
+func testAccMongoDBAtlasNetworkContainerDSConfig(projectName, orgID, cidrBlock string) string {
 	return fmt.Sprintf(`
+		resource "mongodbatlas_project" "test" {
+			name   = "%s"
+			org_id = "%s"
+		}
+
 		resource "mongodbatlas_network_container" "test_ds" {
-			project_id   		 = "%s"
+			project_id   		 = "${mongodbatlas_project.test.id}"
 			atlas_cidr_block = "%s"
 			provider_name		 = "AWS"
 			region_name			 = "US_EAST_1"
@@ -57,5 +63,5 @@ func testAccMongoDBAtlasNetworkContainerDSConfig(projectID, cidrBlock string) st
 			project_id   		= mongodbatlas_network_container.test_ds.project_id
 			container_id		= mongodbatlas_network_container.test_ds.container_id
 		}
-	`, projectID, cidrBlock)
+	`, projectName, orgID, cidrBlock)
 }

mongodbatlas/data_source_mongodbatlas_network_containers_test.go

@@ -16,9 +16,10 @@ func TestAccDataSourceMongoDBAtlasNetworkContainers_basic(t *testing.T) {
 	randInt := acctest.RandIntRange(0, 255)
 
 	resourceName := "mongodbatlas_network_container.test"
-	projectID := os.Getenv("MONGODB_ATLAS_PROJECT_ID")
 	cidrBlock := fmt.Sprintf("10.8.%d.0/24", randInt)
 	dataSourceName := "data.mongodbatlas_network_containers.test"
+	orgID := os.Getenv("MONGODB_ATLAS_ORG_ID")
+	projectName := acctest.RandomWithPrefix("test-acc")
 
 	providerName := "AWS"
 
@@ -28,18 +29,13 @@ func TestAccDataSourceMongoDBAtlasNetworkContainers_basic(t *testing.T) {
 		CheckDestroy: testAccCheckMongoDBAtlasNetworkContainerDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccMongoDBAtlasNetworkContainersDSConfig(projectID, cidrBlock),
+				Config: testAccMongoDBAtlasNetworkContainersDSConfig(projectName, orgID, cidrBlock),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMongoDBAtlasNetworkContainerExists(resourceName, &container),
 					testAccCheckMongoDBAtlasNetworkContainerAttributes(&container, providerName),
 					resource.TestCheckResourceAttrSet(resourceName, "project_id"),
 					resource.TestCheckResourceAttr(resourceName, "provider_name", providerName),
 					resource.TestCheckResourceAttrSet(resourceName, "provisioned"),
-				),
-			},
-			{
-				Config: testAccMongoDBAtlasNetworkContainersDataSourceConfigWithDS(projectID, cidrBlock),
-				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(dataSourceName, "results.#"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "results.0.id"),
 					resource.TestCheckResourceAttrSet(dataSourceName, "results.0.atlas_cidr_block"),
@@ -51,24 +47,23 @@ func TestAccDataSourceMongoDBAtlasNetworkContainers_basic(t *testing.T) {
 	})
 }
 
-func testAccMongoDBAtlasNetworkContainersDSConfig(projectID, cidrBlock string) string {
+func testAccMongoDBAtlasNetworkContainersDSConfig(projectName, orgID, cidrBlock string) string {
 	return fmt.Sprintf(`
+		resource "mongodbatlas_project" "test" {
+			name   = "%s"
+			org_id = "%s"
+		}
+
 		resource "mongodbatlas_network_container" "test" {
-			project_id   		 = "%s"
+			project_id   		 = "${mongodbatlas_project.test.id}"
 			atlas_cidr_block = "%s"
 			provider_name		 = "AWS"
 			region_name			 = "US_EAST_1"
 		}
-	`, projectID, cidrBlock)
-}
-
-func testAccMongoDBAtlasNetworkContainersDataSourceConfigWithDS(projectID, cidrBlock string) string {
-	return fmt.Sprintf(`
-		%s
 
 		data "mongodbatlas_network_containers" "test" {
-			project_id = "%s"
+			project_id = "${mongodbatlas_network_container.test.project_id}"
 			provider_name = "AWS"
 		}
-	`, testAccMongoDBAtlasNetworkContainersDSConfig(projectID, cidrBlock), projectID)
+	`, projectName, orgID, cidrBlock)
 }

mongodbatlas/data_source_mongodbatlas_network_peering_test.go

@@ -10,6 +10,7 @@ import (
 )
 
 func TestAccDataSourceMongoDBAtlasNetworkPeering_basic(t *testing.T) {
+	SkipTestExtCred(t)
 	var peer matlas.Peer
 
 	resourceName := "mongodbatlas_network_peering.basic"

mongodbatlas/data_source_mongodbatlas_network_peerings_test.go

@@ -10,6 +10,7 @@ import (
 )
 
 func TestAccDataSourceMongoDBAtlasNetworkPeerings_basic(t *testing.T) {
+	SkipTestExtCred(t)
 	var peer matlas.Peer
 
 	resourceName := "mongodbatlas_network_peering.test"

mongodbatlas/data_source_mongodbatlas_private_endpoint_interface_link_test.go

@@ -9,6 +9,7 @@ import (
 )
 
 func TestAccDataSourceMongoDBAtlasPrivateEndpointLink_basic(t *testing.T) {
+	SkipTestExtCred(t)
 	resourceName := "data.mongodbatlas_private_endpoint_interface_link.test"
 
 	awsAccessKey := os.Getenv("AWS_ACCESS_KEY_ID")