fix(iaas): Store IDs immediately after provisioning (#1228)

STACKITTPR-379

Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>

Author: Fyusel

stackit/internal/services/iaas/network/resource.go

@@ -428,8 +428,21 @@ func (r *networkResource) Create(ctx context.Context, req resource.CreateRequest
 		return
 	}
 
+	if network.Id == nil {
+		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating network", "Got empty network id")
+		return
+	}
+
 	networkId := *network.Id
-	ctx = tflog.SetField(ctx, "network_id", networkId)
+	// Write id attributes to state before polling via the wait handler - just in case anything goes wrong during the wait handler
+	ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
+		"project_id": projectId,
+		"region":     region,
+		"network_id": networkId,
+	})
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
 	network, err = wait.CreateNetworkWaitHandler(ctx, r.client, projectId, region, networkId).WaitWithContext(ctx)
 	if err != nil {
@@ -592,17 +605,11 @@ func (r *networkResource) ImportState(ctx context.Context, req resource.ImportSt
 		)
 		return
 	}
-
-	projectId := idParts[0]
-	region := idParts[1]
-	networkId := idParts[2]
-	ctx = tflog.SetField(ctx, "project_id", projectId)
-	ctx = tflog.SetField(ctx, "region", region)
-	ctx = tflog.SetField(ctx, "network_id", networkId)
-
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), projectId)...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), region)...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("network_id"), networkId)...)
+	ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
+		"project_id": idParts[0],
+		"region":     idParts[1],
+		"network_id": idParts[2],
+	})
 	tflog.Info(ctx, "Network state imported")
 }
 

stackit/internal/services/iaas/server/resource.go

@@ -498,13 +498,26 @@ func (r *serverResource) Create(ctx context.Context, req resource.CreateRequest,
 
 	ctx = core.LogResponse(ctx)
 
+	if server.Id == nil {
+		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating server", "Got empty server id")
+		return
+	}
 	serverId := *server.Id
+	// Write id attributes to state before polling via the wait handler - just in case anything goes wrong during the wait handler
+	ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
+		"project_id": projectId,
+		"region":     region,
+		"server_id":  serverId,
+	})
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	_, err = wait.CreateServerWaitHandler(ctx, r.client, projectId, region, serverId).WaitWithContext(ctx)
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating server", fmt.Sprintf("server creation waiting: %v", err))
 		return
 	}
-	ctx = tflog.SetField(ctx, "server_id", serverId)
 
 	// Get Server with details
 	serverReq := r.client.GetServer(ctx, projectId, region, serverId)

stackit/internal/services/iaas/volume/resource.go

@@ -465,15 +465,27 @@ func (r *volumeResource) Create(ctx context.Context, req resource.CreateRequest,
 
 	ctx = core.LogResponse(ctx)
 
+	if volume.Id == nil {
+		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating volume", "Got empty volume id")
+		return
+	}
 	volumeId := *volume.Id
+	// Write id attributes to state before polling via the wait handler - just in case anything goes wrong during the wait handler
+	ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
+		"project_id": projectId,
+		"region":     region,
+		"volume_id":  volumeId,
+	})
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	volume, err = wait.CreateVolumeWaitHandler(ctx, r.client, projectId, region, volumeId).WaitWithContext(ctx)
 	if err != nil {
 		core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating volume", fmt.Sprintf("volume creation waiting: %v", err))
 		return
 	}
 
-	ctx = tflog.SetField(ctx, "volume_id", volumeId)
-
 	// Map response body to schema
 	err = mapFields(ctx, volume, &model, region)
 	if err != nil {

stackit/internal/services/iaas/volumeattach/resource.go

@@ -197,6 +197,16 @@ func (r *volumeAttachResource) Create(ctx context.Context, req resource.CreateRe
 	}
 
 	ctx = core.LogResponse(ctx)
+	// Write id attributes to state before polling via the wait handler - just in case anything goes wrong during the wait handler
+	ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
+		"project_id": projectId,
+		"region":     region,
+		"server_id":  serverId,
+		"volume_id":  volumeId,
+	})
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
 	_, err = wait.AddVolumeToServerWaitHandler(ctx, r.client, projectId, region, serverId, volumeId).WaitWithContext(ctx)
 	if err != nil {