|
8 | 8 | "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" |
9 | 9 | "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" |
10 | 10 | "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" |
11 | | - matlas "go.mongodb.org/atlas/mongodbatlas" |
12 | 11 | ) |
13 | 12 |
|
14 | 13 | func dataSourceMongoDBAtlasOnlineArchives() *schema.Resource { |
@@ -187,48 +186,49 @@ func schemaOnlineArchive() map[string]*schema.Schema { |
187 | 186 | } |
188 | 187 |
|
189 | 188 | func dataSourceMongoDBAtlasOnlineArchiveRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { |
190 | | - conn := meta.(*MongoDBClient).Atlas |
| 189 | + connV2 := meta.(*MongoDBClient).AtlasV2 |
191 | 190 | projectID := d.Get("project_id").(string) |
192 | 191 | clusterName := d.Get("cluster_name").(string) |
193 | | - atlasID := d.Get("archive_id").(string) |
| 192 | + archiveID := d.Get("archive_id").(string) |
194 | 193 |
|
195 | | - archive, _, err := conn.OnlineArchives.Get(ctx, projectID, clusterName, atlasID) |
| 194 | + archive, _, err := connV2.OnlineArchiveApi.GetOnlineArchive(ctx, projectID, archiveID, clusterName).Execute() |
196 | 195 |
|
197 | 196 | 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())) |
199 | 198 | } |
200 | 199 |
|
201 | 200 | onlineArchiveMap := fromOnlineArchiveToMap(archive) |
202 | 201 |
|
203 | 202 | for key, val := range onlineArchiveMap { |
204 | 203 | 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())) |
206 | 205 | } |
207 | 206 | } |
208 | 207 |
|
209 | 208 | d.SetId(encodeStateID(map[string]string{ |
210 | 209 | "project_id": projectID, |
211 | | - "cluster_name": archive.ClusterName, |
212 | | - "archive_id": archive.ID, |
| 210 | + "cluster_name": clusterName, |
| 211 | + "archive_id": archiveID, |
213 | 212 | })) |
214 | 213 |
|
215 | 214 | return nil |
216 | 215 | } |
217 | 216 |
|
218 | 217 | func dataSourceMongoDBAtlasOnlineArchivesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { |
219 | | - conn := meta.(*MongoDBClient).Atlas |
| 218 | + connV2 := meta.(*MongoDBClient).AtlasV2 |
220 | 219 | projectID := d.Get("project_id").(string) |
221 | 220 | 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() |
223 | 223 |
|
224 | 224 | if err != nil { |
225 | 225 | return diag.FromErr(fmt.Errorf("error getting Online Archives list for project(%s) in cluster (%s): (%s)", projectID, clusterName, err.Error())) |
226 | 226 | } |
227 | 227 |
|
228 | 228 | results := make([]map[string]interface{}, 0, len(archives.Results)) |
229 | 229 |
|
230 | | - for _, archive := range archives.Results { |
231 | | - archiveData := fromOnlineArchiveToMap(archive) |
| 230 | + for i := range archives.Results { |
| 231 | + archiveData := fromOnlineArchiveToMap(&archives.Results[i]) |
232 | 232 | archiveData["project_id"] = projectID |
233 | 233 | results = append(results, archiveData) |
234 | 234 | } |
|
0 commit comments