Skip to content

Commit

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

* fix tags

* undo changes to admin20231001002

* API breaking change fixes

---------

Co-authored-by: lantoli <430982+lantoli@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and lantoli committed Mar 20, 2024
1 parent febe2be commit 4db6c1c
Show file tree
Hide file tree
Showing 122 changed files with 173 additions and 168 deletions.
2 changes: 1 addition & 1 deletion .mockery.yaml
Expand Up @@ -6,7 +6,7 @@ filename: "{{ .InterfaceName | snakecase }}.go"
mockname: "{{.InterfaceName}}"

packages:
go.mongodb.org/atlas-sdk/v20231115007/admin:
go.mongodb.org/atlas-sdk/v20231115008/admin:
interfaces:
AtlasSearchApi:
EncryptionAtRestUsingCustomerKeyManagementApi:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -23,7 +23,7 @@ require (
github.com/zclconf/go-cty v1.14.3
go.mongodb.org/atlas v0.36.0
go.mongodb.org/atlas-sdk/v20231001002 v20231001002.0.0
go.mongodb.org/atlas-sdk/v20231115007 v20231115007.1.0
go.mongodb.org/atlas-sdk/v20231115008 v20231115008.0.0
go.mongodb.org/realm v0.1.0
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -693,8 +693,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/v20231115007 v20231115007.1.0 h1:RAnP53qeTT32iySa4sjfl1PawxNsXZjcieVYLrVw8vs=
go.mongodb.org/atlas-sdk/v20231115007 v20231115007.1.0/go.mod h1:JU7JOUGcv7pfDzbRTwIr8hGy2R1lehdrdfGj9fDjSVY=
go.mongodb.org/atlas-sdk/v20231115008 v20231115008.0.0 h1:F3hwcyCHR7nmtcxHdGjO708OpQC0UtZlx/TkJv9BUSw=
go.mongodb.org/atlas-sdk/v20231115008 v20231115008.0.0/go.mod h1:RrD0o0SpMLmk9IE3HHXBPvVC+Dil9BVghXKjQjhmHps=
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
6 changes: 3 additions & 3 deletions internal/common/conversion/flatten_expand.go
Expand Up @@ -3,7 +3,7 @@ package conversion
import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func FlattenLinks(links []admin.Link) []map[string]string {
Expand Down Expand Up @@ -34,8 +34,8 @@ func ExpandTagsFromSetSchema(d *schema.ResourceData) *[]admin.ResourceTag {
for i, item := range list.List() {
tag := item.(map[string]any)
ret[i] = admin.ResourceTag{
Key: StringPtr(tag["key"].(string)),
Value: StringPtr(tag["value"].(string)),
Key: tag["key"].(string),
Value: tag["value"].(string),
}
}
return &ret
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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/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 @@ -6,7 +6,7 @@ import (

"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func TestAccSTSAssumeRole_basic(t *testing.T) {
Expand Down
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"

"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func PluralDataSource() *schema.Resource {
Expand Down Expand Up @@ -93,7 +93,7 @@ func dataSourcePluralRead(ctx context.Context, d *schema.ResourceData, meta any)
return nil
}

func flattenAccessListAPIKeys(ctx context.Context, orgID string, list []admin.UserAccessList) []map[string]any {
func flattenAccessListAPIKeys(ctx context.Context, orgID string, list []admin.UserAccessListResponse) []map[string]any {
results := make([]map[string]any, len(list))
for k, elm := range list {
results[k] = map[string]any{
Expand Down
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func Resource() *schema.Resource {
Expand Down Expand Up @@ -95,7 +95,7 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
entry = IPAddress
}

accessList := &[]admin.UserAccessList{
accessList := &[]admin.UserAccessListRequest{
{
CidrBlock: conversion.StringPtr(CIDRBlock),
IpAddress: conversion.StringPtr(IPAddress),
Expand Down
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func PluralDataSource() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/advancedcluster/model_advanced_cluster.go
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/spf13/cast"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

var (
Expand Down
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/mocksvc"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

var (
Expand Down
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"github.com/spf13/cast"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down
Expand Up @@ -11,7 +11,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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down Expand Up @@ -606,12 +606,12 @@ func TestAccClusterAdvancedCluster_withTags(t *testing.T) {
{
Config: configWithTags(orgID, projectName, clusterName, []admin.ResourceTag{
{
Key: conversion.StringPtr("key 1"),
Value: conversion.StringPtr("value 1"),
Key: "key 1",
Value: "value 1",
},
{
Key: conversion.StringPtr("key 2"),
Value: conversion.StringPtr("value 2"),
Key: "key 2",
Value: "value 2",
},
}),
Check: resource.ComposeTestCheckFunc(
Expand All @@ -633,8 +633,8 @@ func TestAccClusterAdvancedCluster_withTags(t *testing.T) {
{
Config: configWithTags(orgID, projectName, clusterName, []admin.ResourceTag{
{
Key: conversion.StringPtr("key 3"),
Value: conversion.StringPtr("value 3"),
Key: "key 3",
Value: "value 3",
},
}),
Check: resource.ComposeTestCheckFunc(
Expand Down
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/http"

"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

type ClusterService interface {
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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

var _ datasource.DataSource = &alertConfigurationDS{}
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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const alertConfigurationsDataSourceName = "alert_configurations"
Expand Down
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down
Expand Up @@ -20,7 +20,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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/service/apikey/data_source_api_keys.go
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func PluralDataSource() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/apikey/resource_api_key.go
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func Resource() *schema.Resource {
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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/service/atlasuser/data_source_atlas_users_test.go
Expand Up @@ -11,7 +11,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/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func TestAccConfigDSAtlasUsers_ByOrgID(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/auditing/resource_auditing.go
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupschedule"
"github.com/spf13/cast"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"github.com/spf13/cast"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
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/testutil/acc"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/mig"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func TestMigBackupRSCloudBackupSchedule_basic(t *testing.T) {
Expand Down
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

var (
Expand Down
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func PluralDataSource() *schema.Resource {
Expand Down
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"regexp"

"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func SplitSnapshotImportID(id string) (*admin.GetReplicaSetBackupApiParams, error) {
Expand Down
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/go-test/deep"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupsnapshot"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func TestSplitSnapshotImportID(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/mongodb/terraform-provider-mongodbatlas/internal/service/cluster"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func Resource() *schema.Resource {
Expand Down
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

const (
Expand Down
Expand Up @@ -8,7 +8,7 @@ import (
"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"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func PluralDataSource() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/customdbrole/resource_custom_db_role.go
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
"github.com/spf13/cast"
"go.mongodb.org/atlas-sdk/v20231115007/admin"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
)

func Resource() *schema.Resource {
Expand Down

0 comments on commit 4db6c1c

Please sign in to comment.