From dfcc0d9a00f332faf38ee599bfe3817f8dc3b1d4 Mon Sep 17 00:00:00 2001
From: John Reese <john@reese.dev>
Date: Tue, 20 Feb 2024 23:09:12 -0500
Subject: [PATCH] fix: Catch Google Artifact Registry URL during OCI detection
 (#921)

Signed-off-by: John Reese <john@reese.dev>
---
 downloader/oci_detector.go      | 3 ++-
 downloader/oci_detector_test.go | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/downloader/oci_detector.go b/downloader/oci_detector.go
index 924b13f08..94b8b07ed 100644
--- a/downloader/oci_detector.go
+++ b/downloader/oci_detector.go
@@ -10,7 +10,7 @@ import (
 // them into URLs that the OCI getter can understand.
 type OCIDetector struct{}
 
-// Detect will detect if the source is an OCI registry
+// Detect will detect if the source is an OCI registry.
 func (d *OCIDetector) Detect(src, _ string) (string, bool, error) {
 	if len(src) == 0 {
 		return "", false, nil
@@ -33,6 +33,7 @@ func containsOCIRegistry(src string) bool {
 		regexp.MustCompile("azurecr.io"),
 		regexp.MustCompile("gcr.io"),
 		regexp.MustCompile("registry.gitlab.com"),
+		regexp.MustCompile("pkg.dev"),
 		regexp.MustCompile("[0-9]{12}.dkr.ecr.[a-z0-9-]*.amazonaws.com"),
 		regexp.MustCompile("^quay.io"),
 	}
diff --git a/downloader/oci_detector_test.go b/downloader/oci_detector_test.go
index 358927bc7..f90780aca 100644
--- a/downloader/oci_detector_test.go
+++ b/downloader/oci_detector_test.go
@@ -18,6 +18,11 @@ func TestOCIDetector_Detect(t *testing.T) {
 			"gcr.io/conftest/policies:tag",
 			"oci://gcr.io/conftest/policies:tag",
 		},
+		{
+			"should detect google artifact registry",
+			"region-docker.pkg.dev/conftest/policies:tag",
+			"oci://region-docker.pkg.dev/conftest/policies:tag",
+		},
 		{
 			"should detect ecr",
 			"123456789012.dkr.ecr.us-east-1.amazonaws.com/conftest/policies:tag",
@@ -69,17 +74,21 @@ func TestOCIDetector_Detect(t *testing.T) {
 			"oci://::1:32123/policies:tag",
 		},
 	}
+
 	pwd := "/pwd"
 	d := &OCIDetector{}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			out, ok, err := d.Detect(tt.input, pwd)
 			if err != nil {
 				t.Fatalf("OCIDetector.Detect() error = %v", err)
 			}
+
 			if !ok {
 				t.Fatal("OCIDetector.Detect() not ok, should have detected")
 			}
+
 			if out != tt.expected {
 				t.Errorf("OCIDetector.Detect() output = %v, want %v", out, tt.expected)
 			}