Merge pull request #482 from GSA-TTS/fix-docker-build-issue

Fix Docker lifecycle creation issue

Author: sneal

operation/push.go

@@ -351,7 +351,10 @@ func (p *AppPushOperation) uploadBitsPackage(ctx context.Context, app *resource.
 func (p *AppPushOperation) buildDroplet(ctx context.Context, pkg *resource.Package, manifest *AppManifest) (*resource.Droplet, error) {
 	newBuild := resource.NewBuildCreate(pkg.GUID)
 	if pkg.Type == resource.LifecycleDocker.String() {
-		newBuild.Lifecycle = &resource.Lifecycle{Type: pkg.Type}
+		newBuild.Lifecycle = &resource.Lifecycle{
+			Type: pkg.Type,
+			Data: &resource.DockerLifecycle{}, // Empty docker lifecycle data
+		}
 	} else {
 		newBuild.Lifecycle = &resource.Lifecycle{
 			Type: resource.LifecycleBuildpack.String(),

operation/push_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/cloudfoundry/go-cfclient/v3/client"
 	"github.com/cloudfoundry/go-cfclient/v3/config"
+	"github.com/cloudfoundry/go-cfclient/v3/resource"
 	"github.com/cloudfoundry/go-cfclient/v3/testutil"
 
 	"github.com/stretchr/testify/require"
@@ -142,3 +143,113 @@ func TestAppPush(t *testing.T) {
 	_, err = pusher.Push(context.Background(), manifest, fakeAppZipReader)
 	require.NoError(t, err)
 }
+
+func TestDockerLifecycleBuildCreation(t *testing.T) {
+	serverURL := testutil.SetupFakeAPIServer()
+	defer testutil.Teardown()
+
+	g := testutil.NewObjectJSONGenerator()
+	build := g.Build("STAGED")
+	droplet := g.Droplet()
+
+	manifest := &AppManifest{
+		Name: "test-docker-app",
+		Docker: &AppManifestDocker{
+			Image: "kennethreitz/httpbin",
+		},
+	}
+
+	// Create a docker package manually for testing
+	dockerPkg := &resource.Package{
+		Type: "docker",
+		Resource: resource.Resource{
+			GUID: "docker-package-guid",
+		},
+	}
+
+	// Mock the API calls for docker build creation
+	testutil.SetupMultiple([]testutil.MockRoute{
+		{
+			Method:   http.MethodPost,
+			Endpoint: "/v3/builds",
+			Output:   g.Single(build.JSON),
+			Status:   http.StatusCreated,
+			// Verify that the lifecycle data contains proper docker lifecycle structure
+			PostForm: `{"package":{"guid":"docker-package-guid"},"lifecycle":{"type":"docker","data":{}}}`,
+		},
+		{
+			Method:   http.MethodGet,
+			Endpoint: fmt.Sprintf("/v3/builds/%s", build.GUID),
+			Output:   g.Single(build.JSON),
+			Status:   http.StatusOK,
+		},
+		{
+			Method:   http.MethodGet,
+			Endpoint: "/v3/packages/docker-package-guid/droplets",
+			Output:   g.SinglePaged(droplet.JSON),
+			Status:   http.StatusOK,
+		},
+	}, t)
+
+	c, _ := config.New(serverURL, config.Token("", "fake-refresh-token"), config.SkipTLSValidation())
+	cf, err := client.New(c)
+	require.NoError(t, err)
+
+	pusher := NewAppPushOperation(cf, "", "")
+	
+	// Test the buildDroplet method specifically with a docker package
+	resultDroplet, err := pusher.buildDroplet(context.Background(), dockerPkg, manifest)
+	require.NoError(t, err, "Docker lifecycle build should not fail")
+	require.NotNil(t, resultDroplet, "Docker lifecycle build should return a droplet")
+}
+
+// TestDockerLifecycleStructure tests that docker builds have the correct lifecycle structure
+func TestDockerLifecycleStructure(t *testing.T) {
+	// Test the lifecycle structure directly without HTTP mocking
+	dockerPkg := &resource.Package{
+		Type: resource.LifecycleDocker.String(),
+		Resource: resource.Resource{
+			GUID: "test-docker-package",
+		},
+	}
+
+	// Create build request directly to test lifecycle structure
+	buildCreate := resource.NewBuildCreate(dockerPkg.GUID)
+	
+	// Apply the same logic as in buildDroplet method
+	if dockerPkg.Type == resource.LifecycleDocker.String() {
+		buildCreate.Lifecycle = &resource.Lifecycle{
+			Type: dockerPkg.Type,
+			Data: &resource.DockerLifecycle{}, // Empty docker lifecycle data
+		}
+	}
+
+	// Verify the structure
+	require.NotNil(t, buildCreate.Lifecycle, "Docker build should have lifecycle")
+	require.Equal(t, "docker", buildCreate.Lifecycle.Type, "Docker build should have docker lifecycle type")
+	require.NotNil(t, buildCreate.Lifecycle.Data, "Docker build should have lifecycle data")
+	
+	// Verify it's the correct type
+	dockerLifecycle, ok := buildCreate.Lifecycle.Data.(*resource.DockerLifecycle)
+	require.True(t, ok, "Docker build lifecycle data should be DockerLifecycle type")
+	require.NotNil(t, dockerLifecycle, "Docker lifecycle data should not be nil")
+}
+
+// TestDockerLifecycleJSONMarshaling tests that docker lifecycle marshals to correct JSON
+func TestDockerLifecycleJSONMarshaling(t *testing.T) {
+	dockerLifecycle := &resource.Lifecycle{
+		Type: "docker",
+		Data: &resource.DockerLifecycle{}, // Empty docker lifecycle data
+	}
+
+	// Test JSON marshaling to ensure it produces the expected structure
+	// This is what the CF API expects: {"type":"docker","data":{}}
+	expectedJSON := `{"type":"docker","data":{}}`
+	
+	// Marshal the lifecycle
+	actualJSON, err := dockerLifecycle.MarshalJSON()
+	require.NoError(t, err, "Docker lifecycle should marshal without error")
+	
+	// Verify the JSON structure matches expectations
+	require.JSONEq(t, expectedJSON, string(actualJSON), "Docker lifecycle JSON should match expected format")
+}