Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cmd/extract-images/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,11 @@ func extractLambdaImage(content []byte, repoName, version string, images map[str
continue
}

ref := fmt.Sprintf("%s:%s", repoName, tag)
uri := fmt.Sprintf("%s@%s", repoName, line.digest)
ref := line.ref
uri, ok := digestPinnedURI(ref, line.digest)
if !ok {
continue
}
isIndex := false
images[lambdaArm64ImageKey] = pb.Image_builder{
Ref: &ref,
Expand Down
7 changes: 5 additions & 2 deletions cmd/extract-images/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ccc333 public.ecr.aws/conductorone/baton-example:0.1.2
}
}

func TestExtractLambdaImageUsesGenericRef(t *testing.T) {
func TestExtractLambdaImagePreservesECRRef(t *testing.T) {
images := make(map[string]*pb.Image)
found := extractLambdaImage([]byte(`
ddd444 168442440833.dkr.ecr.us-west-2.amazonaws.com/baton-example:0.1.2-arm64
Expand All @@ -34,9 +34,12 @@ ddd444 168442440833.dkr.ecr.us-west-2.amazonaws.com/baton-example:0.1.2-arm64
if image == nil {
t.Fatalf("missing %s image", lambdaArm64ImageKey)
}
if image.GetRef() != "baton-example:0.1.2-arm64" {
if image.GetRef() != "168442440833.dkr.ecr.us-west-2.amazonaws.com/baton-example:0.1.2-arm64" {
t.Fatalf("lambda ref = %q", image.GetRef())
}
if image.GetUri() != "168442440833.dkr.ecr.us-west-2.amazonaws.com/baton-example@sha256:ddd444" {
t.Fatalf("lambda uri = %q", image.GetUri())
}
if image.GetDigest() != "sha256:ddd444" {
t.Fatalf("lambda digest = %q", image.GetDigest())
}
Expand Down