feat: Migrates some resources to new file structure #1700

lantoli · 2023-12-04T08:03:07Z

Description

Migrates some resources to new file structure:

cloud_backup_schedule CLOUDP-214973
cloud_backup_snapshot CLOUDP-215020
cloud_backup_snapshot_export_bucket CLOUDP-215016
cloud_backup_snapshot_export_job CLOUDP-215000
cloud_backup_snapshot_restore_job CLOUDP-214967
backup_compliance_policy CLOUDP-214991

Type of change:

Bug fix (non-breaking change which fixes an issue). Please, add the "bug" label to the PR.
New feature (non-breaking change which adds functionality). Please, add the "enhancement" label to the PR.
Breaking change (fix or feature that would cause existing functionality to not work as expected). Please, add the "breaking change" label to the PR.
This change requires a documentation update
Documentation fix/enhancement

Required Checklist:

I have signed the MongoDB CLA
I have read the contribution guidelines
I have checked that this change does not generate any credentials and that they are NOT accidentally logged anywhere.
I have added tests that prove my fix is effective or that my feature works per HashiCorp requirements
I have added any necessary documentation (if appropriate)
I have run make fmt and formatted my code
If changes include deprecations or removals, I defined an isolated PR with a relevant title as it will be used in the auto-generated changelog.

Further comments

andreaangiolillo

LGTM 💯

andreaangiolillo · 2023-12-04T09:11:36Z

internal/service/advancedcluster/data_source_advanced_clusters.go

@@ -14,7 +14,7 @@ import (
 	matlas "go.mongodb.org/atlas/mongodbatlas"
 )

-func DataSourceAdvancedClusters() *schema.Resource {
+func PluralDataSource() *schema.Resource {


(not blocking) Interesting name 🤔 What do you think about DataSources instead?

Suggested change

func PluralDataSource() *schema.Resource {

func DataSources() *schema.Resource {

I'm following what @AgustinBettati started, not a strong opinion to either

andreaangiolillo · 2023-12-04T09:12:31Z

internal/provider/provider_sdk2.go

@@ -186,12 +192,12 @@ func getDataSourcesMap() map[string]*schema.Resource {

 func getResourcesMap() map[string]*schema.Resource {
 	resourcesMap := map[string]*schema.Resource{
-		"mongodbatlas_advanced_cluster":                  advancedcluster.ResourceAdvancedCluster(),
+		"mongodbatlas_advanced_cluster":                  advancedcluster.Resource(),


Do you need to update the github actions with the new path?

oops, you're right!

AgustinBettati

LGTM

github-actions · 2023-12-04T10:35:59Z

Package	Line Rate	Health
github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion	31%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate	68%	➖
github.com/mongodb/terraform-provider-mongodbatlas/internal/provider	5%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedcluster	3%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/alertconfiguration	33%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/atlasuser	0%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/backupcompliancepolicy	1%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupschedule	1%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupsnapshot	5%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupsnapshotexportbucket	3%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupsnapshotexportjob	3%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupsnapshotrestorejob	2%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cluster	1%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/databaseuser	0%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/encryptionatrest	0%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/project	0%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/projectapikey	1%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/projectipaccesslist	0%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/service/searchdeployment	23%	❌
github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc	5%	❌
github.com/mongodb/terraform-provider-mongodbatlas/mongodbatlas	2%	❌
Summary	4% (434 / 10694)	❌

lantoli · 2023-12-04T10:38:12Z

.github/workflows/test-suite.yml

@@ -3,7 +3,7 @@ name: 'Test Suite'
 on:
  workflow_dispatch:
  schedule:
-    - cron: "0 2 * * *" # workflow runs every day at 02:00 AM
+    - cron: "0 0 * * *" # workflow runs every day at midnight UTC


to hav more time

lantoli · 2023-12-04T10:38:37Z

.github/workflows/test-suite.yml

@@ -18,7 +18,7 @@ jobs:
      max-parallel: 1
      fail-fast: false
      matrix:
-        terraform_version: ['', '1.1.6', '1.0.8'] # '' for latest version
+        terraform_version: ['', '1.0.8'] # '' for latest version


we already have the data for 1.1.6, removed to decrease time

lantoli added 7 commits December 4, 2023 07:45

move

707253a

change package

1307c7c

change provider

98a872e

fix issues

eacc031

rename periods

727b8cb

backupcompliancepolicy

73436eb

rename resources and data sources

e065e8e

lantoli requested a review from a team as a code owner December 4, 2023 08:03

github-actions bot added the enhancement label Dec 4, 2023

andreaangiolillo removed the enhancement label Dec 4, 2023

andreaangiolillo approved these changes Dec 4, 2023

View reviewed changes

AgustinBettati approved these changes Dec 4, 2023

View reviewed changes

lantoli added 3 commits December 4, 2023 11:23

give more time to cron starting at midnight

e42d559

remove already TF version 1.1.6

a8e70e1

fix GH action

a115907

github-actions bot added the enhancement label Dec 4, 2023

lantoli merged commit 28ecb10 into master Dec 4, 2023

lantoli deleted the CLOUDP-214973_cloud_backup branch December 4, 2023 10:36

lantoli commented Dec 4, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Migrates some resources to new file structure #1700

feat: Migrates some resources to new file structure #1700

lantoli commented Dec 4, 2023 •

edited

Loading

andreaangiolillo left a comment

andreaangiolillo Dec 4, 2023

lantoli Dec 4, 2023

andreaangiolillo Dec 4, 2023

lantoli Dec 4, 2023

AgustinBettati left a comment

github-actions bot commented Dec 4, 2023

lantoli Dec 4, 2023

lantoli Dec 4, 2023

	func PluralDataSource() *schema.Resource {
	func DataSources() *schema.Resource {

feat: Migrates some resources to new file structure #1700

feat: Migrates some resources to new file structure #1700

Conversation

lantoli commented Dec 4, 2023 • edited Loading

Description

Type of change:

Required Checklist:

Further comments

andreaangiolillo left a comment

Choose a reason for hiding this comment

andreaangiolillo Dec 4, 2023

Choose a reason for hiding this comment

lantoli Dec 4, 2023

Choose a reason for hiding this comment

andreaangiolillo Dec 4, 2023

Choose a reason for hiding this comment

lantoli Dec 4, 2023

Choose a reason for hiding this comment

AgustinBettati left a comment

Choose a reason for hiding this comment

github-actions bot commented Dec 4, 2023

lantoli Dec 4, 2023

Choose a reason for hiding this comment

lantoli Dec 4, 2023

Choose a reason for hiding this comment

lantoli commented Dec 4, 2023 •

edited

Loading