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

feat: Migrate Resource: mongodbatlas_project_ip_access_list to Terraform Plugin Framework #1411

Merged
merged 17 commits into from
Aug 28, 2023
Merged

feat: Migrate Resource: mongodbatlas_project_ip_access_list to Terraform Plugin Framework #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1605264
feat: Migrate Resource: mongodbatlas_project_ip_access_list to Terraf…
andreaangiolillo Aug 23, 2023
da3a5be
fix
andreaangiolillo Aug 23, 2023
de6d8b5
fix
andreaangiolillo Aug 24, 2023
ff53734
fix
andreaangiolillo Aug 24, 2023
3b712c5
fix
andreaangiolillo Aug 24, 2023
34497a7
fix
andreaangiolillo Aug 24, 2023
4dd3368
fix
andreaangiolillo Aug 24, 2023
43b9a9f
added additional migration tests
andreaangiolillo Aug 24, 2023
86a5770
added additional migration tests
andreaangiolillo Aug 24, 2023
ee0dd62
added additional migration tests
andreaangiolillo Aug 24, 2023
8a2136e
addressed PR comments
andreaangiolillo Aug 25, 2023
44f2d81
addressed PR comments
andreaangiolillo Aug 25, 2023
3eaed7b
addressed PR comment
andreaangiolillo Aug 25, 2023
b5b8329
Revert "addressed PR comment"
andreaangiolillo Aug 25, 2023
43982d8
Revert "Revert "addressed PR comment""
andreaangiolillo Aug 25, 2023
d11779d
addressed PR comment
andreaangiolillo Aug 25, 2023
c1644dc
addressed PR comment
andreaangiolillo Aug 25, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/acceptance-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- 'mongodbatlas/data_source_mongodbatlas_projects.go'
- 'mongodbatlas/resource_mongodbatlas_access_list_api_key*.go'
- 'mongodbatlas/resource_mongodbatlas_project_invitation*.go'
- 'mongodbatlas/resource_mongodbatlas_project_ip_access_list*.go'
- 'mongodbatlas/fw_resource_mongodbatlas_project_ip_access_list*.go'
- 'mongodbatlas/resource_mongodbatlas_project.go'
- 'mongodbatlas/resource_mongodbatlas_project_test.go'
serverless:
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ require (
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.18.1 // indirect
github.com/hashicorp/terraform-json v0.17.1 // indirect
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1
github.com/hashicorp/terraform-registry-address v0.2.1 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,8 @@ github.com/hashicorp/terraform-json v0.17.1 h1:eMfvh/uWggKmY7Pmb3T85u86E2EQg6EQH
github.com/hashicorp/terraform-json v0.17.1/go.mod h1:Huy6zt6euxaY9knPAFKjUITn8QxUFIe9VuSzb4zn/0o=
github.com/hashicorp/terraform-plugin-framework v1.3.4 h1:dOTLsALgmQu+PawAvhfGQ04H0MeIz3EZmBw7OFvj7qs=
github.com/hashicorp/terraform-plugin-framework v1.3.4/go.mod h1:2gGDpWiTI0irr9NSTLFAKlTi6KwGti3AoU19rFqU30o=
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 h1:gm5b1kHgFFhaKFhm4h2TgvMUlNzFAtUqlcOWnWPm+9E=
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1/go.mod h1:MsjL1sQ9L7wGwzJ5RjcI6FzEMdyoBnw+XK8ZnOvQOLY=
github.com/hashicorp/terraform-plugin-framework-validators v0.10.0 h1:4L0tmy/8esP6OcvocVymw52lY0HyQ5OxB7VNl7k4bS0=
github.com/hashicorp/terraform-plugin-framework-validators v0.10.0/go.mod h1:qdQJCdimB9JeX2YwOpItEu+IrfoJjWQ5PhLpAOMDQAE=
github.com/hashicorp/terraform-plugin-go v0.18.0 h1:IwTkOS9cOW1ehLd/rG0y+u/TGLK9y6fGoBjXVUquzpE=
Expand Down
6 changes: 5 additions & 1 deletion mongodbatlas/fw_data_source_mongodbatlas_project_ip_access_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,11 @@ func newTFProjectIPAccessListDSModel(ctx context.Context, accessList *matlas.Pro
entry = accessList.AwsSecurityGroup
}

id := fmt.Sprintf("%s-%s", accessList.GroupID, entry)
id := encodeStateID(map[string]string{
"entry": entry,
"project_id": accessList.GroupID,
})

databaseUserModel.ID = types.StringValue(id)
return databaseUserModel, nil
}
1 change: 1 addition & 0 deletions mongodbatlas/fw_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ func (p *MongodbtlasProvider) Resources(context.Context) []func() resource.Resou
NewProjectRS,
NewDatabaseUserRS,
NewAlertConfigurationRS,
NewProjectIPAccessListRS,
}
}

Expand Down
Loading