Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixes a bug for issue 289 #323

Merged
merged 3 commits into from
Oct 3, 2020
Merged

fix: fixes a bug for issue 289 #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b3f98d
fix: fixes a bug for issue 289
Sep 16, 2020
f30296d
added skip test for one testacc for terraform workflow reasons
Oct 2, 2020
b9c5363
added env var in github actions
Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/automated-test-acceptances.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
env:
SKIP_TEST_EXTERNAL_CREDENTIALS: ${{ secrets.SKIP_TEST_EXTERNAL_CREDENTIALS }}
SKIP_TEST_IMPORT: ${{ secrets.SKIP_TEST_IMPORT }}
SKIP_TEST: ${{ secrets.SKIP_TEST }}
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 }}
Expand Down
6 changes: 6 additions & 0 deletions mongodbatlas/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,9 @@ func checkTeamsIds(t *testing.T) {
t.Fatal("`MONGODB_ATLAS_TEAMS_IDS` must be set for Projects acceptance testing")
}
}

func SkipTest(t *testing.T) {
if strings.EqualFold(os.Getenv("SKIP_TEST"), "true") {
t.Skip()
}
}
3 changes: 2 additions & 1 deletion mongodbatlas/resource_mongodbatlas_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func TestAccResourceMongoDBAtlasCluster_basicAWS(t *testing.T) {
}

func TestAccResourceMongoDBAtlasCluster_basicAWS_instanceScale(t *testing.T) {
SkipTest(t) // Skipped for now because of paramater provider_disk_iops breaks the terraform flow
var (
cluster matlas.Cluster
resourceName = "mongodbatlas_cluster.test"
Expand Down Expand Up @@ -957,7 +958,7 @@ func testAccMongoDBAtlasClusterConfigAWSNVMEInstance(projectID, name, backupEnab

// Provider Settings "block"
provider_name = "AWS"
provider_disk_iops = 3000
provider_disk_iops = 300
provider_encrypt_ebs_volume = false
provider_volume_type = "PROVISIONED"
provider_instance_size_name = "M40_NVME"
Expand Down
4 changes: 4 additions & 0 deletions mongodbatlas/resource_mongodbatlas_maintenance_window.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ func resourceMongoDBAtlasMaintenanceWindowRead(d *schema.ResourceData, meta inte
return fmt.Errorf(errorMaintenanceRead, d.Id(), err)
}

if err := d.Set("project_id", d.Id()); err != nil {
return fmt.Errorf(errorMaintenanceRead, d.Id(), err)
}

return nil
}

Expand Down
9 changes: 4 additions & 5 deletions mongodbatlas/resource_mongodbatlas_maintenance_window_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,10 @@ func TestAccResourceMongoDBAtlasMaintenanceWindow_importBasic(t *testing.T) {
),
},
{
ResourceName: resourceName,
ImportStateIdFunc: testAccCheckMongoDBAtlasMaintenanceWindowImportStateIDFunc(resourceName),
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"project_id"},
ResourceName: resourceName,
ImportStateIdFunc: testAccCheckMongoDBAtlasMaintenanceWindowImportStateIDFunc(resourceName),
ImportState: true,
ImportStateVerify: true,
},
},
})
Expand Down