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

chore: Upgrades teams resource to auto-generated SDK #1905

Merged
merged 15 commits into from
Feb 5, 2024
Merged

chore: Upgrades teams resource to auto-generated SDK #1905

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e0be381
rename CRUD methods
oarbusi Feb 2, 2024
f5a6877
rename methods for clarity
oarbusi Feb 2, 2024
1fbd745
remove redundant check
oarbusi Feb 2, 2024
d54125c
initial migratation to new SDK
oarbusi Feb 5, 2024
a99fa42
migrate data source
oarbusi Feb 5, 2024
f3c38cb
fix team rename
oarbusi Feb 5, 2024
6fe1131
lint
oarbusi Feb 5, 2024
a03758a
check error using SDK v2 way
oarbusi Feb 5, 2024
e5b7c3a
remove unnecessary comments and method
oarbusi Feb 5, 2024
5d7a1b2
use usernames array variable
oarbusi Feb 5, 2024
6d353c4
use PreCheckAtlasUsername in resource tests
oarbusi Feb 5, 2024
cd358ff
precheck checks atlas user
oarbusi Feb 5, 2024
d1892a2
Merge branch 'master' into CLOUDP-226093
oarbusi Feb 5, 2024
05c4820
remove teams parameter in checkExists
oarbusi Feb 5, 2024
8f13d90
refactor check for mig
oarbusi Feb 5, 2024
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
27 changes: 13 additions & 14 deletions internal/service/teams/data_source_teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"

matlas "go.mongodb.org/atlas/mongodbatlas"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func DataSource() *schema.Resource {
return &schema.Resource{
ReadContext: dataSourceMongoDBAtlasTeamRead,
ReadContext: dataSourceRead,
Schema: map[string]*schema.Schema{
"org_id": {
Type: schema.TypeString,
Expand Down Expand Up @@ -44,48 +44,47 @@ func DataSource() *schema.Resource {
}
}

func dataSourceMongoDBAtlasTeamRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
func dataSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
var (
conn = meta.(*config.MongoDBClient).Atlas
connV2 = meta.(*config.MongoDBClient).AtlasV2
orgID = d.Get("org_id").(string)
teamID, teamIDOk = d.GetOk("team_id")
name, nameOk = d.GetOk("name")

err error
team *matlas.Team
team *admin.TeamResponse
)

if !teamIDOk && !nameOk {
return diag.FromErr(errors.New("either team_id or name must be configured"))
}

if teamIDOk {
team, _, err = conn.Teams.Get(ctx, orgID, teamID.(string))
team, _, err = connV2.TeamsApi.GetTeamById(ctx, orgID, teamID.(string)).Execute()
} else {
team, _, err = conn.Teams.GetOneTeamByName(ctx, orgID, name.(string))
team, _, err = connV2.TeamsApi.GetTeamByName(ctx, orgID, name.(string)).Execute()
}

if err != nil {
return diag.FromErr(fmt.Errorf(errorTeamRead, err))
}

if err := d.Set("team_id", team.ID); err != nil {
if err := d.Set("team_id", team.GetId()); err != nil {
return diag.FromErr(fmt.Errorf(errorTeamSetting, "name", d.Id(), err))
}

if err := d.Set("name", team.Name); err != nil {
if err := d.Set("name", team.GetName()); err != nil {
return diag.FromErr(fmt.Errorf(errorTeamSetting, "name", d.Id(), err))
}

// Set Usernames
users, _, err := conn.Teams.GetTeamUsersAssigned(ctx, orgID, team.ID)
users, _, err := connV2.TeamsApi.ListTeamUsers(ctx, orgID, team.GetId()).Execute()
if err != nil {
return diag.FromErr(fmt.Errorf(errorTeamRead, err))
}

usernames := []string{}
for i := range users {
usernames = append(usernames, users[i].Username)
for i := range users.GetResults() {
usernames = append(usernames, users.GetResults()[i].GetUsername())
}

if err := d.Set("usernames", usernames); err != nil {
Expand All @@ -94,7 +93,7 @@ func dataSourceMongoDBAtlasTeamRead(ctx context.Context, d *schema.ResourceData,

d.SetId(conversion.EncodeStateID(map[string]string{
"org_id": orgID,
"id": team.ID,
"id": team.GetId(),
}))

return nil
Expand Down
12 changes: 6 additions & 6 deletions internal/service/teams/data_source_teams_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ func TestAccConfigDSTeam_basic(t *testing.T) {
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasic(t) },
PreCheck: func() { acc.PreCheckAtlasUsername(t) },
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
CheckDestroy: acc.CheckDestroyTeam,
Steps: []resource.TestStep{
{
Config: testAccDataSourceMongoDBAtlasTeamConfig(orgID, name, username),
Config: dataSourceConfigBasic(orgID, name, username),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet(dataSourceName, "org_id"),
resource.TestCheckResourceAttrSet(dataSourceName, "team_id"),
Expand All @@ -45,12 +45,12 @@ func TestAccConfigDSTeamByName_basic(t *testing.T) {
)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acc.PreCheckBasic(t) },
PreCheck: func() { acc.PreCheckAtlasUsername(t) },
ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
CheckDestroy: acc.CheckDestroyTeam,
Steps: []resource.TestStep{
{
Config: testAccDataSourceMongoDBAtlasTeamConfigByName(orgID, name, username),
Config: dataSourceConfigBasicByName(orgID, name, username),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet(dataSourceName, "org_id"),
resource.TestCheckResourceAttrSet(dataSourceName, "team_id"),
Expand All @@ -62,7 +62,7 @@ func TestAccConfigDSTeamByName_basic(t *testing.T) {
})
}

func testAccDataSourceMongoDBAtlasTeamConfig(orgID, name, username string) string {
func dataSourceConfigBasic(orgID, name, username string) string {
return fmt.Sprintf(`
resource "mongodbatlas_teams" "test" {
org_id = "%s"
Expand All @@ -78,7 +78,7 @@ func testAccDataSourceMongoDBAtlasTeamConfig(orgID, name, username string) strin
`, orgID, name, username)
}

func testAccDataSourceMongoDBAtlasTeamConfigByName(orgID, name, username string) string {
func dataSourceConfigBasicByName(orgID, name, username string) string {
return fmt.Sprintf(`
resource "mongodbatlas_teams" "test" {
org_id = "%s"
Expand Down
Loading
Loading