Skip to content

Commit 894673d

Browse files
authored
Workaround to handle tests failing due to provider name not passed back from API (#927)
1 parent da308f2 commit 894673d

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

mongodbatlas/resource_mongodbatlas_privatelink_endpoint_serverless.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,16 @@ func resourceMongoDBAtlasPrivateLinkEndpointServerlessImportState(ctx context.Co
225225
log.Printf("[WARN] Error setting endpoint_service_name for (%s): %s", endpointID, err)
226226
}
227227

228+
if privateLinkResponse.PrivateLinkServiceResourceID != "" {
229+
if err := d.Set("provider_name", "AZURE"); err != nil {
230+
log.Printf("[WARN] Error setting provider_name for (%s): %s", endpointID, err)
231+
}
232+
} else {
233+
if err := d.Set("provider_name", "AWS"); err != nil {
234+
log.Printf("[WARN] Error setting provider_name for (%s): %s", endpointID, err)
235+
}
236+
}
237+
228238
d.SetId(encodeStateID(map[string]string{
229239
"project_id": projectID,
230240
"instance_name": instanceName,

mongodbatlas/resource_mongodbatlas_privatelink_endpoint_service_serverless.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ func resourceMongoDBAtlasPrivateLinkEndpointServiceServerlessImportState(ctx con
226226
instanceName := parts[1]
227227
endpointID := parts[2]
228228

229-
_, _, err := conn.ServerlessPrivateEndpoints.Get(ctx, projectID, instanceName, endpointID)
229+
privateLinkResponse, _, err := conn.ServerlessPrivateEndpoints.Get(ctx, projectID, instanceName, endpointID)
230230
if err != nil {
231231
return nil, fmt.Errorf("couldn't import serverless private link endpoint (%s) in projectID (%s) , error: %s", endpointID, projectID, err)
232232
}
@@ -238,10 +238,21 @@ func resourceMongoDBAtlasPrivateLinkEndpointServiceServerlessImportState(ctx con
238238
if err := d.Set("endpoint_id", endpointID); err != nil {
239239
log.Printf("[WARN] Error setting endpoint_id for (%s): %s", endpointID, err)
240240
}
241+
241242
if err := d.Set("instance_name", instanceName); err != nil {
242243
log.Printf("[WARN] Error setting instance_name for (%s): %s", endpointID, err)
243244
}
244245

246+
if privateLinkResponse.PrivateLinkServiceResourceID != "" {
247+
if err := d.Set("provider_name", "AZURE"); err != nil {
248+
log.Printf("[WARN] Error setting provider_name for (%s): %s", endpointID, err)
249+
}
250+
} else {
251+
if err := d.Set("provider_name", "AWS"); err != nil {
252+
log.Printf("[WARN] Error setting provider_name for (%s): %s", endpointID, err)
253+
}
254+
}
255+
245256
d.SetId(encodeStateID(map[string]string{
246257
"project_id": projectID,
247258
"instance_name": instanceName,

0 commit comments

Comments
 (0)