packit, occam fixes

build.go

@@ -55,7 +55,7 @@ func Build(entryResolver EntryResolver, dependencyService DependencyService, pro
 			return packit.BuildResult{}, fmt.Errorf("failed to create logs dir : %w", err)
 		}
 
-		nginxLayer, err := context.Layers.Get(NGINX, packit.LaunchLayer)
+		nginxLayer, err := context.Layers.Get(NGINX)
 		if err != nil {
 			return packit.BuildResult{}, err
 		}
@@ -80,18 +80,24 @@ func Build(entryResolver EntryResolver, dependencyService DependencyService, pro
 				Layers: []packit.Layer{
 					nginxLayer,
 				},
-				Processes: defaultStartProcesses,
+				Launch: packit.LaunchMetadata{
+					Processes: defaultStartProcesses,
+				},
 			}, nil
 		}
 
 		logger.Break()
 		logger.Process("Executing build process")
 
-		err = nginxLayer.Reset()
+		nginxLayer, err = nginxLayer.Reset()
 		if err != nil {
 			return packit.BuildResult{}, err
 		}
 
+		// later todo: ask for launch in metadata (detect) and
+		// read metadata here
+		nginxLayer.Launch = true
+
 		err = os.MkdirAll(filepath.Join(nginxLayer.Path, "bin"), os.ModePerm)
 		if err != nil {
 			return packit.BuildResult{}, err
@@ -141,7 +147,9 @@ func Build(entryResolver EntryResolver, dependencyService DependencyService, pro
 			Layers: []packit.Layer{
 				nginxLayer,
 			},
-			Processes: defaultStartProcesses,
+			Launch: packit.LaunchMetadata{
+				Processes: defaultStartProcesses,
+			},
 		}, nil
 	}
 }

build_test.go

@@ -139,10 +139,12 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 					},
 				},
 			},
-			Processes: []packit.Process{
-				{
-					Type:    "web",
-					Command: fmt.Sprintf(`nginx -p $PWD -c "%s"`, filepath.Join(workspaceDir, "nginx.conf")),
+			Launch: packit.LaunchMetadata{
+				Processes: []packit.Process{
+					{
+						Type:    "web",
+						Command: fmt.Sprintf(`nginx -p $PWD -c "%s"`, filepath.Join(workspaceDir, "nginx.conf")),
+					},
 				},
 			},
 		}))
@@ -188,7 +190,8 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 
 	context("when rebuilding a layer", func() {
 		it.Before(func() {
-			err := ioutil.WriteFile(filepath.Join(layersDir, "nginx.toml"), []byte(fmt.Sprintf(`[metadata]
+			err := ioutil.WriteFile(filepath.Join(layersDir, "nginx.toml"), []byte(fmt.Sprintf(`launch = true
+[metadata]
 			dependency-sha = "some-sha"
 			configure-bin-sha = "some-bin-sha"
 			built_at = "%s"
@@ -242,10 +245,12 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 						},
 					},
 				},
-				Processes: []packit.Process{
-					{
-						Type:    "web",
-						Command: fmt.Sprintf(`nginx -p $PWD -c "%s"`, filepath.Join(workspaceDir, "nginx.conf")),
+				Launch: packit.LaunchMetadata{
+					Processes: []packit.Process{
+						{
+							Type:    "web",
+							Command: fmt.Sprintf(`nginx -p $PWD -c "%s"`, filepath.Join(workspaceDir, "nginx.conf")),
+						},
 					},
 				},
 			}))