Docker URI

This change updates the update-package-dependency command to support the uri tag instead of the image tag. Signed-off-by: Ben Hale <[email protected]>
paketo-buildpacks · Nov 13, 2020 · 07b6c98 · 07b6c98
1 parent d888e7e
commit 07b6c98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/carton/package_dependency.go b/carton/package_dependency.go
@@ -29,7 +29,7 @@ import (
 
 const (
 	PackageIdDependencyPattern    = `(?m)(.*id[\s]+=[\s]+".+-buildpacks/%s",[\s]+version=")[^"]+(".*)`
-	PackageImageDependencyPattern = `(?m)(.*image[\s]+=[\s]+"%s:)[^"]+(".*)`
+	PackageImageDependencyPattern = `(?m)(.*uri[\s]+=[\s]+".*%s:)[^"]+(".*)`
 	PackageDependencySubstitution = "${1}%s${2}"
 )
 

diff --git a/carton/package_dependency_test.go b/carton/package_dependency_test.go
@@ -75,8 +75,8 @@ func testPackageDependency(t *testing.T, context spec.G, it spec.S) {
 
 	it("updates builder dependency", func() {
 		Expect(ioutil.WriteFile(path, []byte(`
-{ id = "paketo-buildpacks/test-1", image = "gcr.io/paketo-buildpacks/test-1:test-version-1" },
-{ id = "paketo-buildpacks/test-2", image = "gcr.io/paketo-buildpacks/test-2:test-version-2" },
+{ id = "paketo-buildpacks/test-1", uri = "docker://gcr.io/paketo-buildpacks/test-1:test-version-1" },
+{ id = "paketo-buildpacks/test-2", uri = "docker://gcr.io/paketo-buildpacks/test-2:test-version-2" },
 `), 0644)).To(Succeed())
 
 		p := carton.PackageDependency{
@@ -88,15 +88,15 @@ func testPackageDependency(t *testing.T, context spec.G, it spec.S) {
 		p.Update(carton.WithExitHandler(exitHandler))
 
 		Expect(ioutil.ReadFile(path)).To(Equal([]byte(`
-{ id = "paketo-buildpacks/test-1", image = "gcr.io/paketo-buildpacks/test-1:test-version-3" },
-{ id = "paketo-buildpacks/test-2", image = "gcr.io/paketo-buildpacks/test-2:test-version-2" },
+{ id = "paketo-buildpacks/test-1", uri = "docker://gcr.io/paketo-buildpacks/test-1:test-version-3" },
+{ id = "paketo-buildpacks/test-2", uri = "docker://gcr.io/paketo-buildpacks/test-2:test-version-2" },
 `)))
 	})
 
 	it("updates package dependency", func() {
 		Expect(ioutil.WriteFile(path, []byte(`
-{ image = "gcr.io/paketo-buildpacks/test-1:test-version-1" },
-{ image = "gcr.io/paketo-buildpacks/test-2:test-version-2" },
+{ uri = "docker://gcr.io/paketo-buildpacks/test-1:test-version-1" },
+{ uri = "docker://gcr.io/paketo-buildpacks/test-2:test-version-2" },
 `), 0644)).To(Succeed())
 
 		p := carton.PackageDependency{
@@ -108,8 +108,8 @@ func testPackageDependency(t *testing.T, context spec.G, it spec.S) {
 		p.Update(carton.WithExitHandler(exitHandler))
 
 		Expect(ioutil.ReadFile(path)).To(Equal([]byte(`
-{ image = "gcr.io/paketo-buildpacks/test-1:test-version-3" },
-{ image = "gcr.io/paketo-buildpacks/test-2:test-version-2" },
+{ uri = "docker://gcr.io/paketo-buildpacks/test-1:test-version-3" },
+{ uri = "docker://gcr.io/paketo-buildpacks/test-2:test-version-2" },
 `)))
 	})