From e61a20ddeb4df25b585a39fdb3042b4094d06fe4 Mon Sep 17 00:00:00 2001
From: Adrian Johnson <adrian.johnson@hashicorp.com>
Date: Fri, 12 Jan 2024 09:25:48 -0600
Subject: [PATCH 1/2] aws_ecr_image: fix regeression for most recent

---
 internal/service/ecr/image_data_source.go      | 12 ------------
 internal/service/ecr/image_data_source_test.go |  1 -
 2 files changed, 13 deletions(-)

diff --git a/internal/service/ecr/image_data_source.go b/internal/service/ecr/image_data_source.go
index 8932629b1c0..42ee4ff20d1 100644
--- a/internal/service/ecr/image_data_source.go
+++ b/internal/service/ecr/image_data_source.go
@@ -102,18 +102,6 @@ func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, meta inter
 		}
 	}
 
-	if v, ok := d.Get("most_recent").(bool); ok && v {
-		if len(input.ImageIds) == 0 {
-			input.ImageIds = []*ecr.ImageIdentifier{
-				{
-					ImageTag: aws.String("latest"),
-				},
-			}
-		} else {
-			input.ImageIds[0].ImageTag = aws.String("latest")
-		}
-	}
-
 	if v, ok := d.GetOk("registry_id"); ok {
 		input.RegistryId = aws.String(v.(string))
 	}
diff --git a/internal/service/ecr/image_data_source_test.go b/internal/service/ecr/image_data_source_test.go
index a7e3325e6f0..8f8a3e97ec2 100644
--- a/internal/service/ecr/image_data_source_test.go
+++ b/internal/service/ecr/image_data_source_test.go
@@ -38,7 +38,6 @@ func TestAccECRImageDataSource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceByDigest, "image_uri"),
 					resource.TestCheckResourceAttrSet(resourceByMostRecent, "image_pushed_at"),
 					resource.TestCheckResourceAttrSet(resourceByMostRecent, "image_size_in_bytes"),
-					resource.TestCheckTypeSetElemAttr(resourceByMostRecent, "image_tags.*", tag),
 				),
 			},
 		},

From f7b940525ad0aa155d935012997a6ea489198df7 Mon Sep 17 00:00:00 2001
From: Adrian Johnson <adrian.johnson@hashicorp.com>
Date: Fri, 12 Jan 2024 09:46:09 -0600
Subject: [PATCH 2/2] add CHANGELOG entry

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

diff --git a/.changelog/35269.txt b/.changelog/35269.txt
new file mode 100644
index 00000000000..23c435306f8
--- /dev/null
+++ b/.changelog/35269.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+data-source/aws_ecr_image: Fix error when `most_recent` is not also `latest`
+```