From ff672dacc4c3f5c2702d47c808c5c5f06d6df46e Mon Sep 17 00:00:00 2001
From: Izaak Lauer <8404559+izaaklauer@users.noreply.github.com>
Date: Wed, 5 Jul 2023 16:03:11 +0000
Subject: [PATCH 1/3] backport of commit
 a4dd181d529a7f26b045851f1ac060820218957d

---
 internal/runnerinstall/ecs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/runnerinstall/ecs.go b/internal/runnerinstall/ecs.go
index 01f6356fd1a..d68370e3ec7 100644
--- a/internal/runnerinstall/ecs.go
+++ b/internal/runnerinstall/ecs.go
@@ -397,7 +397,7 @@ func (i *ECSRunnerInstaller) Uninstall(ctx context.Context, opts *InstallOpts) e
 		}
 	}
 
-	if *fileSystemId == "" {
+	if fileSystemId == nil || *fileSystemId == "" {
 		s.Update("File system with tag key `runner-id` and value " + opts.Id + " not detected, skipping deletion")
 		s.Done()
 		return nil

From 4e7727e1ab656100ef8b397846b0a67f430d88aa Mon Sep 17 00:00:00 2001
From: Izaak Lauer <8404559+izaaklauer@users.noreply.github.com>
Date: Wed, 5 Jul 2023 16:04:49 +0000
Subject: [PATCH 2/3] backport of commit
 dd31fb39ac42325ff8c374c99cf2e5996492264b

---
 .changelog/4829.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/4829.txt

diff --git a/.changelog/4829.txt b/.changelog/4829.txt
new file mode 100644
index 00000000000..cb71ecb330e
--- /dev/null
+++ b/.changelog/4829.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+plugin/aws-ecs: Fix panic when uninstalling ECS runner after failing to find EFS
+```

From d770db6df46fb329765b575d1a3ef208fae77835 Mon Sep 17 00:00:00 2001
From: Izaak Lauer <8404559+izaaklauer@users.noreply.github.com>
Date: Thu, 6 Jul 2023 13:17:31 +0000
Subject: [PATCH 3/3] backport of commit
 91508cb5c844a4c7c3ab3fc041c1a5346d01d6de

---
 .changelog/4829.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changelog/4829.txt b/.changelog/4829.txt
index cb71ecb330e..a334fcaf1c6 100644
--- a/.changelog/4829.txt
+++ b/.changelog/4829.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
-plugin/aws-ecs: Fix panic when uninstalling ECS runner after failing to find EFS
+runneruninstall/aws-ecs: Fix panic when uninstalling ECS runner after failing to find EFS
 ```