fix: terminate not running

Signed-off-by: Eric Lin <[email protected]>
Ezzahhh · Dec 30, 2024 · b73f7d2 · b73f7d2
1 parent 154b728
commit b73f7d2
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/internal/provider/ephemeral_ssm.go b/internal/provider/ephemeral_ssm.go
@@ -137,22 +137,19 @@ func (d *SSMEphemeral) Close(ctx context.Context, req ephemeral.CloseRequest, re
 
 	sessionID, _ := req.Private.GetKey(ctx, "session_id")
 	ssmRegion, _ := req.Private.GetKey(ctx, "ssm_region")
-	if len(sessionID) > 0 {
-		awsCfg, err := config.LoadDefaultConfig(ctx)
-		if err != nil {
-			resp.Diagnostics.AddError("Failed to load AWS config", fmt.Sprintf("Error: %s", err))
-			return
-		}
-		awsCfg.Region = string(ssmRegion)
-
-		ssmClient := aws_ssm.NewFromConfig(awsCfg)
-
-		_, err = ssmClient.TerminateSession(ctx, &aws_ssm.TerminateSessionInput{
-			SessionId: aws.String(string(sessionID)),
-		})
-		if err != nil {
-			resp.Diagnostics.AddError("Failed to terminate SSM session", fmt.Sprintf("Error: %s", err))
-			return
-		}
+	awsCfg, err := config.LoadDefaultConfig(ctx, config.WithRegion(string(ssmRegion)))
+	if err != nil {
+		resp.Diagnostics.AddError("Failed to load AWS config", fmt.Sprintf("Error: %s", err))
+		return
+	}
+
+	ssmClient := aws_ssm.NewFromConfig(awsCfg)
+
+	_, err = ssmClient.TerminateSession(ctx, &aws_ssm.TerminateSessionInput{
+		SessionId: aws.String(string(sessionID)),
+	})
+	if err != nil {
+		resp.Diagnostics.AddError("Failed to terminate SSM session", fmt.Sprintf("Error: %s", err))
+		return
 	}
 }