Skip to content

Commit

Permalink
chore: Updates Atlas Go SDK (#1865)
Browse files Browse the repository at this point in the history
* build(deps): bump go.mongodb.org/atlas-sdk

* revert changes to admin20231001002

* use renamed FederationIdentityProviderUpdate

* fix filename typo

---------

Co-authored-by: lantoli <lantoli@users.noreply.github.com>
Co-authored-by: Leo Antoli <430982+lantoli@users.noreply.github.com>
  • Loading branch information
3 people committed Jan 25, 2024
1 parent cd976ca commit 5092677
Show file tree
Hide file tree
Showing 74 changed files with 76 additions and 76 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -27,7 +27,7 @@ require (
github.com/zclconf/go-cty v1.14.1
go.mongodb.org/atlas v0.36.0
go.mongodb.org/atlas-sdk/v20231001002 v20231001002.0.0
go.mongodb.org/atlas-sdk/v20231115004 v20231115004.1.0
go.mongodb.org/atlas-sdk/v20231115005 v20231115005.0.0
go.mongodb.org/realm v0.1.0
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -761,8 +761,8 @@ go.mongodb.org/atlas v0.36.0 h1:m05S3AO7zkl+bcG1qaNsEKBnAqnKx2FDwLooHpIG3j4=
go.mongodb.org/atlas v0.36.0/go.mod h1:nfPldE9dSama6G2IbIzmEza02Ly7yFZjMMVscaM0uEc=
go.mongodb.org/atlas-sdk/v20231001002 v20231001002.0.0 h1:h1X2CGKyN1UFvNs69vp7xpufbbreq6p7bbrg5uJ1sxw=
go.mongodb.org/atlas-sdk/v20231001002 v20231001002.0.0/go.mod h1:4TAUPaWPFNSbi8c1hbQLr1wAdkmqi48O7zvyXjBM+a8=
go.mongodb.org/atlas-sdk/v20231115004 v20231115004.1.0 h1:vOvfk8bPedcphaTHIm6p8UB/ZPeVOqJZ7+MmTuI1eGs=
go.mongodb.org/atlas-sdk/v20231115004 v20231115004.1.0/go.mod h1:FzD5DLz+WPB+z3OGgNBjXMPQJjJ7Y+hKn4iupXZuoOc=
go.mongodb.org/atlas-sdk/v20231115005 v20231115005.0.0 h1:BbzZAZLhUy8EUtKjNeI9ajmPAjFYxudfd+2LB8ChQM8=
go.mongodb.org/atlas-sdk/v20231115005 v20231115005.0.0/go.mod h1:rtQDZDZ/Mcw6WA4n/IQVQgKzeaDk7btGvCU3HlKfX/k=
go.mongodb.org/realm v0.1.0 h1:zJiXyLaZrznQ+Pz947ziSrDKUep39DO4SfA0Fzx8M4M=
go.mongodb.org/realm v0.1.0/go.mod h1:4Vj6iy+Puo1TDERcoh4XZ+pjtwbOzPpzqy3Cwe8ZmDM=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
Expand Down
2 changes: 1 addition & 1 deletion internal/config/client.go
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/version"
"github.com/spf13/cast"
admin20231001002 "go.mongodb.org/atlas-sdk/v20231001002/admin"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
matlasClient "go.mongodb.org/atlas/mongodbatlas"
realmAuth "go.mongodb.org/realm/auth"
"go.mongodb.org/realm/realm"
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/provider_authentication_test.go
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccSTSAssumeRole_basic(t *testing.T) {
Expand Down
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"github.com/zclconf/go-cty/cty"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

var _ datasource.DataSource = &alertConfigurationDS{}
Expand Down
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccConfigDSAlertConfiguration_basic(t *testing.T) {
Expand Down
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const alertConfigurationsDataSourceName = "alert_configurations"
Expand Down
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mwielbut/pointy"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func NewNotificationList(list []TfNotificationModel) (*[]admin.AlertsNotificationRootForGroup, error) {
Expand Down
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/alertconfiguration"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const (
Expand Down
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"github.com/mwielbut/pointy"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const (
Expand Down
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand Down
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/alertconfiguration"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccConfigRSAlertConfiguration_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/atlasuser/data_source_atlas_user.go
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/service/atlasuser/data_source_atlas_user_test.go
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccConfigDSAtlasUser_ByUserID(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/atlasuser/data_source_atlas_users.go
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/service/atlasuser/data_source_atlas_users_test.go
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/atlasuser"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccConfigDSAtlasUsers_ByOrgID(t *testing.T) {
Expand Down
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccConfigDSDatabaseUser_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/databaseuser/model_database_user.go
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func NewMongoDBDatabaseUser(ctx context.Context, dbUserModel *TfDatabaseUserModel) (*admin.CloudDatabaseUser, diag.Diagnostics) {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/databaseuser/model_database_user_test.go
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/databaseuser"
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

var (
Expand Down
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand Down
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccConfigRSDatabaseUser_basic(t *testing.T) {
Expand Down
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func NewTfEncryptionAtRestRSModel(ctx context.Context, projectID string, encryptionResp *admin.EncryptionAtRest) *TfEncryptionAtRestRSModel {
Expand Down
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/encryptionatrest"
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

var (
Expand Down
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/project"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const (
Expand Down
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/mig"
"github.com/mwielbut/pointy"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccMigrationAdvRS_EncryptionAtRest_basicAWS(t *testing.T) {
Expand Down
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/mwielbut/pointy"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const (
Expand Down
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/http"

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

type EarService interface {
Expand Down
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccFederatedDatabaseInstanceDS_basic(t *testing.T) {
Expand Down
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
Expand Down
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"strings"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func FlattenFederatedSettingsIdentityProvider(federatedSettingsIdentityProvider []admin.FederationIdentityProvider) []map[string]any {
Expand Down
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/federatedsettingsidentityprovider"
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

var (
Expand Down
Expand Up @@ -8,7 +8,7 @@ import (
"regexp"

admin20231001002 "go.mongodb.org/atlas-sdk/v20231001002/admin"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -223,7 +223,7 @@ func resourceMongoDBAtlasFederatedSettingsIdentityProviderUpdate(ctx context.Con
return append(oldSDKUpdate(ctx, federationSettingsID, oktaIdpID, d, meta), getGracePeriodWarning())
}

updateRequest := new(admin.IdentityProviderUpdate)
updateRequest := new(admin.FederationIdentityProviderUpdate)
_, _, err := connV2.FederatedAuthenticationApi.GetIdentityProvider(context.Background(), federationSettingsID, oktaIdpID).Execute()

if err != nil {
Expand Down
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func TestAccFedRSFederatedSettingsIdentityProvider_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/organization/data_source_organizations.go
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"log"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/organization/resource_organization.go
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"net/http"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"testing"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/project/data_source_project.go
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
"github.com/hashicorp/terraform-plugin-framework/datasource"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/project/data_source_project_test.go
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/project/data_source_projects.go
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const projectsDataSourceName = "projects"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/project/data_source_projects_test.go
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"

"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/project/model_project.go
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

func NewTFProjectDataSourceModel(ctx context.Context, project *admin.Group, projectProps AdditionalProperties) (*TFProjectDSModel, diag.Diagnostics) {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/project/model_project_test.go
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/project"
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas-sdk/v20231115004/admin"
"go.mongodb.org/atlas-sdk/v20231115005/admin"
)

const (
Expand Down

0 comments on commit 5092677

Please sign in to comment.