Remove deprecated platform APIs (#1191)

* Remove deprecated platform APIs Signed-off-by: Natalie Arellano <[email protected]> * Adding back some things and removing more things Signed-off-by: Natalie Arellano <[email protected]> * Fix assertion Signed-off-by: Natalie Arellano <[email protected]> * Fix again Signed-off-by: Natalie Arellano <[email protected]> * Fix windows Signed-off-by: Natalie Arellano <[email protected]> --------- Signed-off-by: Natalie Arellano <[email protected]>
buildpacks · Sep 13, 2023 · 874e2c1 · 874e2c1
1 parent b384d8c
commit 874e2c1
Show file tree

Hide file tree

Showing 33 changed files with 317 additions and 2,264 deletions.
diff --git a/acceptance/analyzer_test.go b/acceptance/analyzer_test.go
diff --git a/acceptance/detector_test.go b/acceptance/detector_test.go
@@ -399,28 +399,4 @@ fail: fail_detect_buildpack@some_version
 			h.AssertEq(t, analyzed.RunImage.Image, "some-run-image-from-extension")
 		})
 	})
-
-	when("platform api < 0.6", func() {
-		when("no buildpack group passed detection", func() {
-			it("errors and exits with the expected code", func() {
-				command := exec.Command(
-					"docker",
-					"run",
-					"--rm",
-					"--env", "CNB_ORDER_PATH=/cnb/orders/empty_order.toml",
-					"--env", "CNB_PLATFORM_API=0.5",
-					detectImage,
-				)
-				output, err := command.CombinedOutput()
-				h.AssertNotNil(t, err)
-				failErr, ok := err.(*exec.ExitError)
-				if !ok {
-					t.Fatalf("expected an error of type exec.ExitError")
-				}
-				h.AssertEq(t, failErr.ExitCode(), 100) // platform code for failed detect
-				expected := "No buildpack groups passed detection."
-				h.AssertStringContains(t, string(output), expected)
-			})
-		})
-	})
 }
diff --git a/acceptance/exporter_test.go b/acceptance/exporter_test.go
@@ -75,10 +75,6 @@ func testExporterFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 				when("app", func() {
 					it("is created", func() {
 						exportFlags := []string{"-daemon", "-log-level", "debug"}
-						if api.MustParse(platformAPI).LessThan("0.7") {
-							exportFlags = append(exportFlags, []string{"-run-image", exportRegFixtures.ReadOnlyRunImage}...) // though the run image is registry image, it also exists in the daemon with the same tag
-						}
-
 						exportArgs := append([]string{ctrPath(exporterPath)}, exportFlags...)
 						exportedImageName = "some-exported-image-" + h.RandString(10)
 						exportArgs = append(exportArgs, exportedImageName)
@@ -202,12 +198,7 @@ func testExporterFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 				it("Image CreatedAt is set to SOURCE_DATE_EPOCH", func() {
 					h.SkipIf(t, api.MustParse(platformAPI).LessThan("0.9"), "SOURCE_DATE_EPOCH support added in 0.9")
 					expectedTime := time.Date(2022, 1, 5, 5, 5, 5, 0, time.UTC)
-
 					exportFlags := []string{"-daemon"}
-					if api.MustParse(platformAPI).LessThan("0.7") {
-						exportFlags = append(exportFlags, []string{"-run-image", exportRegFixtures.ReadOnlyRunImage}...)
-					}
-
 					exportArgs := append([]string{ctrPath(exporterPath)}, exportFlags...)
 					exportedImageName = "some-exported-image-" + h.RandString(10)
 					exportArgs = append(exportArgs, exportedImageName)
@@ -235,10 +226,6 @@ func testExporterFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 				when("app", func() {
 					it("is created", func() {
 						var exportFlags []string
-						if api.MustParse(platformAPI).LessThan("0.7") {
-							exportFlags = append(exportFlags, []string{"-run-image", exportRegFixtures.ReadOnlyRunImage}...)
-						}
-
 						exportArgs := append([]string{ctrPath(exporterPath)}, exportFlags...)
 						exportedImageName = exportTest.RegRepoName("some-exported-image-" + h.RandString(10))
 						exportArgs = append(exportArgs, exportedImageName)
@@ -265,10 +252,6 @@ func testExporterFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 						expectedTime := time.Date(2022, 1, 5, 5, 5, 5, 0, time.UTC)
 
 						var exportFlags []string
-						if api.MustParse(platformAPI).LessThan("0.7") {
-							exportFlags = append(exportFlags, []string{"-run-image", exportRegFixtures.ReadOnlyRunImage}...)
-						}
-
 						exportArgs := append([]string{ctrPath(exporterPath)}, exportFlags...)
 						exportedImageName = exportTest.RegRepoName("some-exported-image-" + h.RandString(10))
 						exportArgs = append(exportArgs, exportedImageName)
@@ -295,10 +278,6 @@ func testExporterFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 						it("is created", func() {
 							cacheImageName := exportTest.RegRepoName("some-cache-image-" + h.RandString(10))
 							exportFlags := []string{"-cache-image", cacheImageName}
-							if api.MustParse(platformAPI).LessThan("0.7") {
-								exportFlags = append(exportFlags, "-run-image", exportRegFixtures.ReadOnlyRunImage)
-							}
-
 							exportArgs := append([]string{ctrPath(exporterPath)}, exportFlags...)
 							exportedImageName = exportTest.RegRepoName("some-exported-image-" + h.RandString(10))
 							exportArgs = append(exportArgs, exportedImageName)
@@ -321,10 +300,6 @@ func testExporterFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 						it("is created with empty layer", func() {
 							cacheImageName := exportTest.RegRepoName("some-empty-cache-image-" + h.RandString(10))
 							exportFlags := []string{"-cache-image", cacheImageName, "-layers", "/other_layers"}
-							if api.MustParse(platformAPI).LessThan("0.7") {
-								exportFlags = append(exportFlags, "-run-image", exportRegFixtures.ReadOnlyRunImage)
-							}
-
 							exportArgs := append([]string{ctrPath(exporterPath)}, exportFlags...)
 							exportedImageName = exportTest.RegRepoName("some-exported-image-" + h.RandString(10))
 							exportArgs = append(exportArgs, exportedImageName)

diff --git a/acceptance/launcher_test.go b/acceptance/launcher_test.go
@@ -66,170 +66,79 @@ func testLauncher(t *testing.T, when spec.G, it spec.S) {
 		})
 	})
 
-	when("Platform API >= 0.4", func() {
-		when("entrypoint is a process", func() {
+	when("entrypoint is a process", func() {
+		it("launches that process", func() {
+			cmd := exec.Command("docker", "run", "--rm", //nolint
+				"--entrypoint=web",
+				"--env=CNB_PLATFORM_API="+latestPlatformAPI,
+				launchImage)
+			assertOutput(t, cmd, "Executing web process-type")
+		})
+
+		when("process contains a period", func() {
 			it("launches that process", func() {
 				cmd := exec.Command("docker", "run", "--rm",
-					"--entrypoint=web",
+					"--entrypoint=process.with.period"+exe,
 					"--env=CNB_PLATFORM_API="+latestPlatformAPI,
 					launchImage)
-				assertOutput(t, cmd, "Executing web process-type")
-			})
-
-			when("process contains a period", func() {
-				it("launches that process", func() {
-					cmd := exec.Command("docker", "run", "--rm",
-						"--entrypoint=process.with.period"+exe,
-						"--env=CNB_PLATFORM_API="+latestPlatformAPI,
-						launchImage)
-					assertOutput(t, cmd, "Executing process.with.period process-type")
-				})
+				assertOutput(t, cmd, "Executing process.with.period process-type")
 			})
+		})
 
-			it("appends any args to the process args", func() {
-				cmd := exec.Command( //nolint
-					"docker", "run", "--rm",
-					"--entrypoint=web",
-					"--env=CNB_PLATFORM_API="+latestPlatformAPI,
-					launchImage, "with user provided args",
-				)
-				if runtime.GOOS == "windows" {
-					assertOutput(t, cmd, `Executing web process-type "with user provided args"`)
-				} else {
-					assertOutput(t, cmd, "Executing web process-type with user provided args")
-				}
-			})
+		it("appends any args to the process args", func() {
+			cmd := exec.Command( //nolint
+				"docker", "run", "--rm",
+				"--entrypoint=web",
+				"--env=CNB_PLATFORM_API="+latestPlatformAPI,
+				launchImage, "with user provided args",
+			)
+			if runtime.GOOS == "windows" {
+				assertOutput(t, cmd, `Executing web process-type "with user provided args"`)
+			} else {
+				assertOutput(t, cmd, "Executing web process-type with user provided args")
+			}
 		})
+	})
 
-		when("entrypoint is a not a process", func() {
-			it("builds a process from the arguments", func() {
-				cmd := exec.Command( //nolint
+	when("entrypoint is a not a process", func() {
+		it("builds a process from the arguments", func() {
+			cmd := exec.Command( //nolint
+				"docker", "run", "--rm",
+				"--entrypoint=launcher",
+				"--env=CNB_PLATFORM_API="+latestPlatformAPI,
+				launchImage, "--",
+				"env",
+			)
+			if runtime.GOOS == "windows" {
+				cmd = exec.Command( //nolint
 					"docker", "run", "--rm",
-					"--entrypoint=launcher",
-					"--env=CNB_PLATFORM_API="+latestPlatformAPI,
+					`--entrypoint=launcher`,
+					"--env=CNB_PLATFORM_API=0.7",
 					launchImage, "--",
-					"env",
-				)
-				if runtime.GOOS == "windows" {
-					cmd = exec.Command( //nolint
-						"docker", "run", "--rm",
-						`--entrypoint=launcher`,
-						"--env=CNB_PLATFORM_API=0.4",
-						launchImage, "--",
-						"cmd", "/c", "set",
-					)
-				}
-
-				assertOutput(t, cmd,
-					"SOME_VAR=some-bp-val",
-					"OTHER_VAR=other-bp-val",
+					"cmd", "/c", "set",
 				)
-			})
-		})
+			}
 
-		when("CNB_PROCESS_TYPE is set", func() {
-			it("should warn", func() {
-				cmd := exec.Command("docker", "run", "--rm",
-					"--env=CNB_PROCESS_TYPE=direct-process",
-					"--env=CNB_PLATFORM_API="+latestPlatformAPI,
-					"--env=CNB_NO_COLOR=true",
-					launchImage,
-				)
-				out, err := cmd.CombinedOutput()
-				h.AssertNotNil(t, err)
-				h.AssertStringContains(t, string(out), "Warning: CNB_PROCESS_TYPE is not supported in Platform API "+latestPlatformAPI)
-				h.AssertStringContains(t, string(out), `Warning: Run with ENTRYPOINT 'direct-process' to invoke the 'direct-process' process type`)
-				h.AssertStringContains(t, string(out), "ERROR: failed to launch: determine start command: when there is no default process a command is required")
-			})
+			assertOutput(t, cmd,
+				"SOME_VAR=some-bp-val",
+				"OTHER_VAR=other-bp-val",
+			)
 		})
 	})
 
-	when("Platform API < 0.4", func() {
-		when("there is no CMD provided", func() {
-			when("CNB_PROCESS_TYPE is NOT set", func() {
-				it("web is the default process-type", func() {
-					cmd := exec.Command("docker", "run", "--rm", "--env=CNB_PLATFORM_API=0.3", launchImage)
-					assertOutput(t, cmd, "Executing web process-type")
-				})
-			})
-
-			when("CNB_PROCESS_TYPE is set", func() {
-				it("should run the specified CNB_PROCESS_TYPE", func() {
-					cmd := exec.Command("docker", "run", "--rm", "--env=CNB_PLATFORM_API=0.3", "--env=CNB_PROCESS_TYPE=direct-process", launchImage)
-					if runtime.GOOS == "windows" {
-						assertOutput(t, cmd, "Usage: ping")
-					} else {
-						assertOutput(t, cmd, "Executing direct-process process-type")
-					}
-				})
-			})
-		})
-
-		when("process-type provided in CMD", func() {
-			it("launches that process-type", func() {
-				cmd := exec.Command("docker", "run", "--rm", "--env=CNB_PLATFORM_API=0.3", launchImage, "direct-process")
-				expected := "Executing direct-process process-type"
-				if runtime.GOOS == "windows" {
-					expected = "Usage: ping"
-				}
-				assertOutput(t, cmd, expected)
-			})
-
-			it("sets env vars from process specific directories", func() {
-				cmd := exec.Command("docker", "run", "--rm", "--env=CNB_PLATFORM_API=0.3", launchImage, "worker")
-				expected := "worker-process-val"
-				assertOutput(t, cmd, expected)
-			})
-		})
-
-		when("process is direct=false", func() {
-			when("the process type has no args", func() {
-				it("runs command as script", func() {
-					h.SkipIf(t, runtime.GOOS == "windows", "scripts are unsupported on windows")
-					cmd := exec.Command("docker", "run", "--rm",
-						"--env=CNB_PLATFORM_API=0.3",
-						"--env", "VAR1=val1",
-						"--env", "VAR2=val with space",
-						launchImage, "indirect-process-with-script",
-					)
-					assertOutput(t, cmd, "'val1' 'val with space'")
-				})
-			})
-
-			when("the process type has args", func() {
-				// buildpack API is determined by looking up the API of the process buildpack in metadata.toml
-
-				it("command and args become shell-parsed tokens in a script", func() {
-					var val2 string
-					if runtime.GOOS == "windows" {
-						val2 = `"val with space"` // windows values with spaces must contain quotes
-					} else {
-						val2 = "val with space"
-					}
-					cmd := exec.Command("docker", "run", "--rm",
-						"--env=CNB_PLATFORM_API=0.3",
-						"--env", "VAR1=val1",
-						"--env", "VAR2="+val2,
-						launchImage, "indirect-process-with-args",
-					) // #nosec G204
-					assertOutput(t, cmd, "'val1' 'val with space'")
-				})
-			})
-
-			it("sources scripts from process specific directories", func() {
-				cmd := exec.Command("docker", "run", "--rm", "--env=CNB_PLATFORM_API=0.3", launchImage, "profile-checker")
-				expected := "sourced bp profile\nsourced bp profile-checker profile\nsourced app profile\nval-from-profile"
-				assertOutput(t, cmd, expected)
-			})
-		})
-
-		it("respects CNB_APP_DIR and CNB_LAYERS_DIR environment variables", func() {
+	when("CNB_PROCESS_TYPE is set", func() {
+		it("should warn", func() {
 			cmd := exec.Command("docker", "run", "--rm",
-				"--env=CNB_PLATFORM_API=0.3",
-				"--env", "CNB_APP_DIR="+ctrPath("/other-app"),
-				"--env", "CNB_LAYERS_DIR=/other-layers",
-				launchImage) // #nosec G204
-			assertOutput(t, cmd, "sourced other app profile\nExecuting other-layers web process-type")
+				"--env=CNB_PROCESS_TYPE=direct-process",
+				"--env=CNB_PLATFORM_API="+latestPlatformAPI,
+				"--env=CNB_NO_COLOR=true",
+				launchImage,
+			)
+			out, err := cmd.CombinedOutput()
+			h.AssertNotNil(t, err)
+			h.AssertStringContains(t, string(out), "Warning: CNB_PROCESS_TYPE is not supported in Platform API "+latestPlatformAPI)
+			h.AssertStringContains(t, string(out), `Warning: Run with ENTRYPOINT 'direct-process' to invoke the 'direct-process' process type`)
+			h.AssertStringContains(t, string(out), "ERROR: failed to launch: determine start command: when there is no default process a command is required")
 		})
 	})
 

diff --git a/acceptance/restorer_test.go b/acceptance/restorer_test.go
@@ -80,28 +80,6 @@ func testRestorerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 			})
 		})
 
-		when("called with -analyzed (on older platforms)", func() {
-			it("errors", func() {
-				h.SkipIf(t, api.MustParse(platformAPI).AtLeast("0.7"), "Platform API >= 0.7 supports -analyzed flag")
-				command := exec.Command("docker", "run", "--rm", "--env", "CNB_PLATFORM_API="+platformAPI, restoreImage, "-analyzed some-file-location")
-				output, err := command.CombinedOutput()
-				h.AssertNotNil(t, err)
-				expected := "flag provided but not defined: -analyzed"
-				h.AssertStringContains(t, string(output), expected)
-			})
-		})
-
-		when("called with -skip-layers (on older platforms)", func() {
-			it("errors", func() {
-				h.SkipIf(t, api.MustParse(platformAPI).AtLeast("0.7"), "Platform API >= 0.7 supports -skip-layers flag")
-				command := exec.Command("docker", "run", "--rm", "--env", "CNB_PLATFORM_API="+platformAPI, restoreImage, "-skip-layers true")
-				output, err := command.CombinedOutput()
-				h.AssertNotNil(t, err)
-				expected := "flag provided but not defined: -skip-layers"
-				h.AssertStringContains(t, string(output), expected)
-			})
-		})
-
 		when("called without any cache flag", func() {
 			it("outputs it will not restore cache layer data", func() {
 				command := exec.Command("docker", "run", "--rm", "--env", "CNB_PLATFORM_API="+platformAPI, restoreImage)
@@ -114,7 +92,6 @@ func testRestorerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 
 		when("analyzed.toml exists with app metadata", func() {
 			it("restores app metadata", func() {
-				h.SkipIf(t, api.MustParse(platformAPI).LessThan("0.7"), "Platform API < 0.7 does not restore app metadata")
 				output := h.DockerRunAndCopy(t,
 					containerName,
 					copyDir,
@@ -252,7 +229,6 @@ func testRestorerFunc(platformAPI string) func(t *testing.T, when spec.G, it spe
 
 		when("target data", func() {
 			it("updates run image reference in analyzed.toml to include digest and target data on newer platforms", func() {
-				h.SkipIf(t, api.MustParse(platformAPI).LessThan("0.7"), "Platform API < 0.7 does not support -analyzed flag")
 				h.DockerRunAndCopy(t,
 					containerName,
 					copyDir,