feat: Adds atlas Organization New Parameters Support #1835

maastha · 2024-01-12T22:24:28Z

Description

Adds support for new setting params to organization resource
Adds validation to create handler to ensure role_names for new API key contains ORG_OWNER permissions.
Updates documentation & example
Updates acceptance tests

Link to any related issue(s): https://jira.mongodb.org/browse/CLOUDP-219771

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

main.tf:

resource "mongodbatlas_organization" "test" {
	org_owner_id = "......"
	name = "manual-org-renamed"
	description = "temp desc"
	role_names = ["ORG_OWNER", "ORG_BILLING_ADMIN"]
        multi_factor_auth_required = false
        api_access_list_required = false
        restrict_employee_access = true
	  }

tfstate:

  "resources": [
    {
      "mode": "managed",
      "type": "mongodbatlas_organization",
      "name": "test",
      "provider": "provider[\"registry.terraform.io/mongodb/mongodbatlas\"]",
      "instances": [
        {
          "schema_version": 0,
          "attributes": {
            "api_access_list_required": false,
            "description": "temp desc",
            "federation_settings_id": null,
            "id": "b3JnX2lk:NjVhMWIyZjAwNTJjMzc3ZTY5MDk4Yzlj",
            "multi_factor_auth_required": false,
            "name": "manual-org-renamed",
            "org_id": ".........",
            "org_owner_id": "........",
            "private_key": "..............",
            "public_key": ".........",
            "restrict_employee_access": true,
            "role_names": [
              "ORG_BILLING_ADMIN",
              "ORG_OWNER"
            ]
          },
          "sensitive_attributes": [],
          "private": "bnVsbA=="
        }
      ]
    }
  ]

…(govet)

…un tests" This reverts commit 404512e.

…b/terraform-provider-mongodbatlas into CLOUDP-219771-update-sdk

internal/service/organization/data_source_organization_test.go

internal/service/organization/resource_organization.go

marcosuma · 2024-01-17T07:42:42Z

internal/service/organization/resource_organization.go

+	if err != nil {
+		if _, _, err := conn.OrganizationsApi.DeleteOrganization(ctx, orgID).Execute(); err != nil {
+			d.SetId("")
+			return diag.FromErr(fmt.Errorf("an error occurred when updating Organization settings. Unable to delete organization, there may be dangling resources: %s", err))


is it possible here to return both errors?

marcosuma · 2024-01-17T07:45:38Z

internal/service/organization/resource_organization.go

+
+func isAPIKeyOrgOwner(roles []string) bool {
+	for _, role := range roles {
+		if role == "ORG_OWNER" {


should we have ORG_OWNER as const?

marcosuma · 2024-01-17T07:46:43Z

internal/service/organization/resource_organization.go

 		},
 	}
 }

 func resourceMongoDBAtlasOrganizationCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
+	if !isAPIKeyOrgOwner(conversion.ExpandStringList(d.Get("role_names").(*schema.Set).List())) {
+		return diag.FromErr(fmt.Errorf("`role_names` for new API Key must have the ORG_OWNER role to use this resource"))


nit: you could return the err from the method

…rams

Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com>

…rm-provider-mongodbatlas into CLOUDP-219771-new-org-params

lantoli · 2024-01-17T15:28:25Z

internal/service/organization/resource_organization_test.go

+}
+
+func TestAccConfigRSOrganization_BasicAccess(t *testing.T) {
+	acc.SkipTestForCI(t)


is it hard to run it in CI / GH?

sorry this was missed, this requires setting a up a paying organization in cloud-dev that new organizations can be linked to, I couldn't get it to work with my personal organization in cloud-dev (even though I have billing enabled) so requires looking into setting up payments correctly

AgustinBettati

LGTM

…batlas into CLOUDP-219771-new-org-params

lantoli and others added 29 commits January 12, 2024 16:09

apply update-atlas-sdk

27df3ca

revert changes to oldAdmin

c2e5a40

remove atlasSDK alias

258cff2

use SlicePtrToSlice and NonEmptySliceToPtrSlice

25ea035

TEMPORARY - remove DataProcessRegion to make it compile and run tests

b3e01d9

fix linter: fieldalignment: struct with 32 pointer bytes could be 24 …

8c48565

…(govet)

fix project tests

23793e5

apply update-atlas-sdk

c28ae5e

revert changes to oldAdmin

32d630a

remove atlasSDK alias

2527ba6

use SlicePtrToSlice and NonEmptySliceToPtrSlice

2587fb3

TEMPORARY - remove DataProcessRegion to make it compile and run tests

404512e

fix linter: fieldalignment: struct with 32 pointer bytes could be 24 …

f93464f

…(govet)

fix project tests

5651c2b

Revert "TEMPORARY - remove DataProcessRegion to make it compile and r…

d0d2d67

…un tests" This reverts commit 404512e.

upgrade to atlas sdk

37c0ace

upgrade plural DS to atlas sdk

d9ca6cc

migrate plural DS to new atlas SDK

db96b10

migrate plural DS to new atlas SDK

479afb8

migrate plural DS to new atlas SDK

c98bab9

update sdk to latest

f914609

update sdk to latest

0859331

update sdk to latest

7a1caae

user old SDK for online archive as DataProcessRegion was removed

58abc5f

fix merge

0ab62a3

Merge branch 'CLOUDP-222424_sdk_update_pointers' of github.com:mongod…

9ca501b

…b/terraform-provider-mongodbatlas into CLOUDP-219771-update-sdk

fix merge

1d8dec4

add new API support

b7818a9

add new APIs and params

5dd60df

maastha changed the title ~~feat: new org params~~ feat: Adds atlas Organization New Parameters Support Jan 12, 2024

maastha added 4 commits January 16, 2024 12:47

Merge branch 'master' into CLOUDP-219771-update-sdk

2028d05

minor

f5933ec

fix: undo sh file commit

866fff5

fix: undo sh file commit

49a1d9c

maastha marked this pull request as ready for review January 16, 2024 13:17

maastha requested a review from a team as a code owner January 16, 2024 13:17

add documentation and examples

c3cfbd9

maastha requested a review from Zuhairahmed January 16, 2024 14:51

lantoli reviewed Jan 16, 2024

View reviewed changes

internal/service/organization/data_source_organization_test.go Show resolved Hide resolved

marcosuma reviewed Jan 17, 2024

View reviewed changes

internal/service/organization/resource_organization.go Outdated Show resolved Hide resolved

marcosuma reviewed Jan 17, 2024

View reviewed changes

maastha and others added 7 commits January 17, 2024 09:59

address PR comments

7c1ef2c

Merge branch 'CLOUDP-219771-update-sdk' into CLOUDP-219771-new-org-pa…

046ce94

…rams

address PR comments

a6cc69e

minor

5a08be6

Apply suggestions from code review

9ce0107

Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com>

Merge branch 'CLOUDP-219771-update-sdk' of github.com:mongodb/terrafo…

de65a01

…rm-provider-mongodbatlas into CLOUDP-219771-new-org-params

minor

8e631e7

marcosuma approved these changes Jan 17, 2024

View reviewed changes

lantoli reviewed Jan 17, 2024

View reviewed changes

lantoli approved these changes Jan 17, 2024

View reviewed changes

Base automatically changed from CLOUDP-219771-update-sdk to master January 17, 2024 21:00

Zuhairahmed approved these changes Jan 18, 2024

View reviewed changes

AgustinBettati approved these changes Jan 18, 2024

View reviewed changes

maastha added 2 commits January 18, 2024 10:40

Merge branch 'master' of github.com:mongodb/terraform-provider-mongod…

fbe2c8c

…batlas into CLOUDP-219771-new-org-params

update include_deleted_orgs deprecation message

0d2f77f

maastha merged commit 8b0836f into master Jan 18, 2024
35 checks passed

maastha deleted the CLOUDP-219771-new-org-params branch January 18, 2024 11:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Adds atlas Organization New Parameters Support #1835

feat: Adds atlas Organization New Parameters Support #1835

maastha commented Jan 12, 2024 •

edited

marcosuma Jan 17, 2024

maastha Jan 17, 2024

marcosuma Jan 17, 2024

maastha Jan 17, 2024

marcosuma Jan 17, 2024

maastha Jan 17, 2024

lantoli Jan 17, 2024

maastha Jan 19, 2024

AgustinBettati left a comment

feat: Adds atlas Organization New Parameters Support #1835

feat: Adds atlas Organization New Parameters Support #1835

Conversation

maastha commented Jan 12, 2024 • edited

Description

Type of change:

Required Checklist:

Further comments

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AgustinBettati left a comment

Choose a reason for hiding this comment

maastha commented Jan 12, 2024 •

edited