refactor: Migrates mongodbatlas_organization resource & data sources to new Atlas SDK (#1834)

maastha · web-flow · commit 1171c7bfabe6 · 2024-01-17T21:00:10.000Z
diff --git a/internal/service/organization/data_source_organization.go b/internal/service/organization/data_source_organization.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 )
 
@@ -47,27 +48,28 @@ func DataSource() *schema.Resource {
 
 func dataSourceMongoDBAtlasOrganizationRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	// Get client connection.
-	conn := meta.(*config.MongoDBClient).Atlas
+	conn := meta.(*config.MongoDBClient).AtlasV2
 	orgID := d.Get("org_id").(string)
 
-	organization, _, err := conn.Organizations.Get(ctx, orgID)
+	organization, _, err := conn.OrganizationsApi.GetOrganization(ctx, orgID).Execute()
+
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("error getting organizations information: %s", err))
 	}
 
-	if err := d.Set("name", organization.Name); err != nil {
+	if err := d.Set("name", organization.GetName()); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `name`: %s", err))
 	}
 
-	if err := d.Set("is_deleted", organization.IsDeleted); err != nil {
+	if err := d.Set("is_deleted", organization.GetIsDeleted()); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `is_deleted`: %s", err))
 	}
 
-	if err := d.Set("links", flattenOrganizationLinks(organization.Links)); err != nil {
+	if err := d.Set("links", flattenOrganizationLinks(organization.GetLinks())); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `is_deleted`: %s", err))
 	}
 
-	d.SetId(organization.ID)
+	d.SetId(organization.GetId())
 
 	return nil
 }
diff --git a/internal/service/organization/data_source_organizations.go b/internal/service/organization/data_source_organizations.go
@@ -4,13 +4,15 @@ import (
 	"context"
 	"fmt"
 
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 	"github.com/mwielbut/pointy"
 
-	matlas "go.mongodb.org/atlas/mongodbatlas"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 )
 
 func PluralDataSource() *schema.Resource {
@@ -22,8 +24,9 @@ func PluralDataSource() *schema.Resource {
 				Optional: true,
 			},
 			"include_deleted_orgs": {
-				Type:     schema.TypeBool,
-				Optional: true,
+				Type:       schema.TypeBool,
+				Optional:   true,
+				Deprecated: fmt.Sprintf(constant.DeprecationParamByDate, "January 2025"),
 			},
 			"page_num": {
 				Type:     schema.TypeInt,
@@ -79,29 +82,25 @@ func PluralDataSource() *schema.Resource {
 
 func dataSourceMongoDBAtlasOrganizationsRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	// Get client connection.
-	conn := meta.(*config.MongoDBClient).Atlas
+	conn := meta.(*config.MongoDBClient).AtlasV2
 
-	options := &matlas.ListOptions{
-		PageNum:      d.Get("page_num").(int),
-		ItemsPerPage: d.Get("items_per_page").(int),
+	organizationOptions := &admin.ListOrganizationsApiParams{
+		PageNum:      pointy.Int(d.Get("page_num").(int)),
+		ItemsPerPage: pointy.Int(d.Get("items_per_page").(int)),
+		Name:         pointy.String(d.Get("name").(string)),
 	}
 
-	organizationOptions := &matlas.OrganizationsListOptions{
-		Name:               d.Get("name").(string),
-		IncludeDeletedOrgs: pointy.Bool(d.Get("include_deleted_orgs").(bool)),
-		ListOptions:        *options,
-	}
+	organizations, _, err := conn.OrganizationsApi.ListOrganizationsWithParams(ctx, organizationOptions).Execute()
 
-	organizations, _, err := conn.Organizations.List(ctx, organizationOptions)
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("error getting organization information: %s", err))
 	}
 
-	if err := d.Set("results", flattenOrganizations(organizations.Results)); err != nil {
+	if err := d.Set("results", flattenOrganizations(organizations.GetResults())); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `results`: %s", err))
 	}
 
-	if err := d.Set("total_count", organizations.TotalCount); err != nil {
+	if err := d.Set("total_count", organizations.GetTotalCount()); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `total_count`: %s", err))
 	}
 
@@ -110,7 +109,7 @@ func dataSourceMongoDBAtlasOrganizationsRead(ctx context.Context, d *schema.Reso
 	return nil
 }
 
-func flattenOrganizationLinks(links []*matlas.Link) []map[string]any {
+func flattenOrganizationLinks(links []admin.Link) []map[string]any {
 	linksList := make([]map[string]any, 0)
 
 	for _, link := range links {
@@ -124,7 +123,7 @@ func flattenOrganizationLinks(links []*matlas.Link) []map[string]any {
 	return linksList
 }
 
-func flattenOrganizations(organizations []*matlas.Organization) []map[string]any {
+func flattenOrganizations(organizations []admin.AtlasOrganization) []map[string]any {
 	var results []map[string]any
 
 	if len(organizations) == 0 {
@@ -135,10 +134,10 @@ func flattenOrganizations(organizations []*matlas.Organization) []map[string]any
 
 	for k, organization := range organizations {
 		results[k] = map[string]any{
-			"id":         organization.ID,
+			"id":         organization.Id,
 			"name":       organization.Name,
 			"is_deleted": organization.IsDeleted,
-			"links":      flattenOrganizationLinks(organization.Links),
+			"links":      flattenOrganizationLinks(organization.GetLinks()),
 		}
 	}
 
diff --git a/internal/service/organization/resource_organization.go b/internal/service/organization/resource_organization.go
@@ -6,12 +6,14 @@ import (
 	"log"
 	"net/http"
 
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/mwielbut/pointy"
+
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
-	"github.com/mwielbut/pointy"
-	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 func Resource() *schema.Resource {
@@ -64,8 +66,8 @@ func Resource() *schema.Resource {
 }
 
 func resourceMongoDBAtlasOrganizationCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
-	conn := meta.(*config.MongoDBClient).Atlas
-	organization, resp, err := conn.Organizations.Create(ctx, newCreateOrganizationRequest(d))
+	conn := meta.(*config.MongoDBClient).AtlasV2
+	organization, resp, err := conn.OrganizationsApi.CreateOrganization(ctx, newCreateOrganizationRequest(d)).Execute()
 	if err != nil {
 		if resp != nil && resp.StatusCode == http.StatusNotFound {
 			d.SetId("")
@@ -75,20 +77,20 @@ func resourceMongoDBAtlasOrganizationCreate(ctx context.Context, d *schema.Resou
 		return diag.FromErr(fmt.Errorf("error create Organization: %s", err))
 	}
 
-	if err := d.Set("private_key", organization.APIKey.PrivateKey); err != nil {
+	if err := d.Set("private_key", organization.ApiKey.GetPrivateKey()); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `private_key`: %s", err))
 	}
 
-	if err := d.Set("public_key", organization.APIKey.PublicKey); err != nil {
+	if err := d.Set("public_key", organization.ApiKey.GetPublicKey()); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `public_key`: %s", err))
 	}
 
-	if err := d.Set("org_id", organization.Organization.ID); err != nil {
+	if err := d.Set("org_id", organization.Organization.GetId()); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `org_id`: %s", err))
 	}
 
 	d.SetId(conversion.EncodeStateID(map[string]string{
-		"org_id": organization.Organization.ID,
+		"org_id": organization.Organization.GetId(),
 	}))
 
 	return resourceMongoDBAtlasOrganizationRead(ctx, d, meta)
@@ -103,12 +105,12 @@ func resourceMongoDBAtlasOrganizationRead(ctx context.Context, d *schema.Resourc
 	}
 
 	clients, _ := cfg.NewClient(ctx)
-	conn := clients.(*config.MongoDBClient).Atlas
+	conn := clients.(*config.MongoDBClient).AtlasV2
 
 	ids := conversion.DecodeStateID(d.Id())
 	orgID := ids["org_id"]
 
-	organization, resp, err := conn.Organizations.Get(ctx, orgID)
+	organization, resp, err := conn.OrganizationsApi.GetOrganization(ctx, orgID).Execute()
 	if err != nil {
 		if resp != nil && resp.StatusCode == http.StatusNotFound {
 			log.Printf("warning Organization deleted will recreate: %s \n", err.Error())
@@ -118,7 +120,7 @@ func resourceMongoDBAtlasOrganizationRead(ctx context.Context, d *schema.Resourc
 		return diag.FromErr(fmt.Errorf("error reading organization information: %s", err))
 	}
 	d.SetId(conversion.EncodeStateID(map[string]string{
-		"org_id": organization.ID,
+		"org_id": organization.GetId(),
 	}))
 	return nil
 }
@@ -132,14 +134,14 @@ func resourceMongoDBAtlasOrganizationUpdate(ctx context.Context, d *schema.Resou
 	}
 
 	clients, _ := cfg.NewClient(ctx)
-	conn := clients.(*config.MongoDBClient).Atlas
+	conn := clients.(*config.MongoDBClient).AtlasV2
 	ids := conversion.DecodeStateID(d.Id())
 	orgID := ids["org_id"]
 
-	updateRequest := new(matlas.Organization)
+	updateRequest := new(admin.AtlasOrganization)
 	if d.HasChange("name") {
 		updateRequest.Name = d.Get("name").(string)
-		_, _, err := conn.Organizations.Update(ctx, orgID, updateRequest)
+		_, _, err := conn.OrganizationsApi.RenameOrganization(ctx, orgID, updateRequest).Execute()
 		if err != nil {
 			return diag.FromErr(fmt.Errorf("error updating Organization: %s", err))
 		}
@@ -156,28 +158,29 @@ func resourceMongoDBAtlasOrganizationDelete(ctx context.Context, d *schema.Resou
 	}
 
 	clients, _ := cfg.NewClient(ctx)
-	conn := clients.(*config.MongoDBClient).Atlas
+	conn := clients.(*config.MongoDBClient).AtlasV2
 	ids := conversion.DecodeStateID(d.Id())
 	orgID := ids["org_id"]
 
-	if _, err := conn.Organizations.Delete(ctx, orgID); err != nil {
+	if _, _, err := conn.OrganizationsApi.DeleteOrganization(ctx, orgID).Execute(); err != nil {
 		return diag.FromErr(fmt.Errorf("error Organization: %s", err))
 	}
 	return nil
 }
 
-func newCreateOrganizationRequest(d *schema.ResourceData) *matlas.CreateOrganizationRequest {
-	createRequest := &matlas.CreateOrganizationRequest{
+func newCreateOrganizationRequest(d *schema.ResourceData) *admin.CreateOrganizationRequest {
+	createRequest := &admin.CreateOrganizationRequest{
 		Name:       d.Get("name").(string),
-		OrgOwnerID: pointy.String(d.Get("org_owner_id").(string)),
-		APIKey: &matlas.APIKeyInput{
+		OrgOwnerId: pointy.String(d.Get("org_owner_id").(string)),
+
+		ApiKey: &admin.CreateAtlasOrganizationApiKey{
 			Roles: conversion.ExpandStringList(d.Get("role_names").(*schema.Set).List()),
 			Desc:  d.Get("description").(string),
 		},
 	}
 
 	if federationSettingsID, ok := d.Get("federation_settings_id").(string); ok && federationSettingsID != "" {
-		createRequest.FederationSettingsID = &federationSettingsID
+		createRequest.FederationSettingsId = &federationSettingsID
 	}
 
 	return createRequest
diff --git a/internal/service/organization/resource_organization_migration_test.go b/internal/service/organization/resource_organization_migration_test.go
@@ -0,0 +1,49 @@
+package organization_test
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
+
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/mig"
+)
+
+func TestAccMigrationConfigRSOrganization_Basic(t *testing.T) {
+	acc.SkipTestForCI(t)
+	var (
+		resourceName = "mongodbatlas_organization.test"
+		orgOwnerID   = os.Getenv("MONGODB_ATLAS_ORG_OWNER_ID")
+		name         = fmt.Sprintf("test-acc-organization-%s", acctest.RandString(5))
+		description  = "test Key for Acceptance tests"
+		roleName     = "ORG_OWNER"
+	)
+
+	resource.Test(t, resource.TestCase{
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: mig.ExternalProviders(),
+				Config:            testAccMongoDBAtlasOrganizationConfigBasic(orgOwnerID, name, description, roleName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(resourceName, "org_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "description"),
+					resource.TestCheckResourceAttr(resourceName, "description", description),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
+				Config:                   testAccMongoDBAtlasOrganizationConfigBasic(orgOwnerID, name, description, roleName),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						acc.DebugPlan(),
+						plancheck.ExpectEmptyPlan(),
+					},
+				},
+			},
+		},
+	})
+}
diff --git a/internal/service/organization/resource_organization_test.go b/internal/service/organization/resource_organization_test.go

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/hashicorp/terraform-plugin-sdk/v2/diag"`
`8`	`8`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"`
	`9`	`+`
`9`	`10`	`"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"`
`10`	`11`	`)`
`11`	`12`
`@@ -47,27 +48,28 @@ func DataSource() *schema.Resource {`
`47`	`48`
`48`	`49`	`func dataSourceMongoDBAtlasOrganizationRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {`
`49`	`50`	`// Get client connection.`
`50`		`- conn := meta.(*config.MongoDBClient).Atlas`
	`51`	`+ conn := meta.(*config.MongoDBClient).AtlasV2`
`51`	`52`	`orgID := d.Get("org_id").(string)`
`52`	`53`
`53`		`- organization, _, err := conn.Organizations.Get(ctx, orgID)`
	`54`	`+ organization, _, err := conn.OrganizationsApi.GetOrganization(ctx, orgID).Execute()`
	`55`	`+`
`54`	`56`	`if err != nil {`
`55`	`57`	`return diag.FromErr(fmt.Errorf("error getting organizations information: %s", err))`
`56`	`58`	`}`
`57`	`59`
`58`		`- if err := d.Set("name", organization.Name); err != nil {`
	`60`	`+ if err := d.Set("name", organization.GetName()); err != nil {`
`59`	`61`	return diag.FromErr(fmt.Errorf("error setting `name`: %s", err))
`60`	`62`	`}`
`61`	`63`
`62`		`- if err := d.Set("is_deleted", organization.IsDeleted); err != nil {`
	`64`	`+ if err := d.Set("is_deleted", organization.GetIsDeleted()); err != nil {`
`63`	`65`	return diag.FromErr(fmt.Errorf("error setting `is_deleted`: %s", err))
`64`	`66`	`}`
`65`	`67`
`66`		`- if err := d.Set("links", flattenOrganizationLinks(organization.Links)); err != nil {`
	`68`	`+ if err := d.Set("links", flattenOrganizationLinks(organization.GetLinks())); err != nil {`
`67`	`69`	return diag.FromErr(fmt.Errorf("error setting `is_deleted`: %s", err))
`68`	`70`	`}`
`69`	`71`
`70`		`- d.SetId(organization.ID)`
	`72`	`+ d.SetId(organization.GetId())`
`71`	`73`
`72`	`74`	`return nil`
`73`	`75`	`}`