Skip to content

Commit 17a83f2

Browse files
refactor: migrate online archive resource and data sources to new sdk (#1523)
1 parent 7d38199 commit 17a83f2

File tree

3 files changed

+103
-100
lines changed

3 files changed

+103
-100
lines changed

mongodbatlas/data_source_mongodbatlas_online_archive.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
11-
matlas "go.mongodb.org/atlas/mongodbatlas"
1211
)
1312

1413
func dataSourceMongoDBAtlasOnlineArchives() *schema.Resource {
@@ -187,48 +186,49 @@ func schemaOnlineArchive() map[string]*schema.Schema {
187186
}
188187

189188
func dataSourceMongoDBAtlasOnlineArchiveRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
190-
conn := meta.(*MongoDBClient).Atlas
189+
connV2 := meta.(*MongoDBClient).AtlasV2
191190
projectID := d.Get("project_id").(string)
192191
clusterName := d.Get("cluster_name").(string)
193-
atlasID := d.Get("archive_id").(string)
192+
archiveID := d.Get("archive_id").(string)
194193

195-
archive, _, err := conn.OnlineArchives.Get(ctx, projectID, clusterName, atlasID)
194+
archive, _, err := connV2.OnlineArchiveApi.GetOnlineArchive(ctx, projectID, archiveID, clusterName).Execute()
196195

197196
if err != nil {
198-
return diag.FromErr(fmt.Errorf("error reading Online Archive datasource with id %s: %s", atlasID, err.Error()))
197+
return diag.FromErr(fmt.Errorf("error reading Online Archive datasource with id %s: %s", archiveID, err.Error()))
199198
}
200199

201200
onlineArchiveMap := fromOnlineArchiveToMap(archive)
202201

203202
for key, val := range onlineArchiveMap {
204203
if err := d.Set(key, val); err != nil {
205-
return diag.FromErr(fmt.Errorf("error reading Online Archive datasource with id %s: %s", atlasID, err.Error()))
204+
return diag.FromErr(fmt.Errorf("error reading Online Archive datasource with id %s: %s", archiveID, err.Error()))
206205
}
207206
}
208207

209208
d.SetId(encodeStateID(map[string]string{
210209
"project_id": projectID,
211-
"cluster_name": archive.ClusterName,
212-
"archive_id": archive.ID,
210+
"cluster_name": clusterName,
211+
"archive_id": archiveID,
213212
}))
214213

215214
return nil
216215
}
217216

218217
func dataSourceMongoDBAtlasOnlineArchivesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
219-
conn := meta.(*MongoDBClient).Atlas
218+
connV2 := meta.(*MongoDBClient).AtlasV2
220219
projectID := d.Get("project_id").(string)
221220
clusterName := d.Get("cluster_name").(string)
222-
archives, _, err := conn.OnlineArchives.List(ctx, projectID, clusterName, &matlas.ListOptions{})
221+
222+
archives, _, err := connV2.OnlineArchiveApi.ListOnlineArchives(ctx, projectID, clusterName).Execute()
223223

224224
if err != nil {
225225
return diag.FromErr(fmt.Errorf("error getting Online Archives list for project(%s) in cluster (%s): (%s)", projectID, clusterName, err.Error()))
226226
}
227227

228228
results := make([]map[string]interface{}, 0, len(archives.Results))
229229

230-
for _, archive := range archives.Results {
231-
archiveData := fromOnlineArchiveToMap(archive)
230+
for i := range archives.Results {
231+
archiveData := fromOnlineArchiveToMap(&archives.Results[i])
232232
archiveData["project_id"] = projectID
233233
results = append(results, archiveData)
234234
}

0 commit comments

Comments
 (0)