Merge pull request #495 from GSA-TTS/fix-missed-restarts

Post-deploy, explicitly restart apps that were already running

Author: sneal

operation/push.go

@@ -305,6 +305,7 @@ func (p *AppPushOperation) pushApp(ctx context.Context, space *resource.Space, m
 	if err != nil {
 		return nil, err
 	}
+	appWasStarted := app.State == "STARTED"
 
 	var pkg *resource.Package
 	// Check if lifecycle is explicitly set in manifest
@@ -342,9 +343,11 @@ func (p *AppPushOperation) pushApp(ctx context.Context, space *resource.Space, m
 
 	if p.stopped {
 		return p.client.Applications.Stop(ctx, app.GUID)
-	} else {
-		return p.client.Applications.Start(ctx, app.GUID)
 	}
+	if appWasStarted {
+		return p.client.Applications.Restart(ctx, app.GUID)
+	}
+	return p.client.Applications.Start(ctx, app.GUID)
 }
 
 func (p *AppPushOperation) applySpaceManifest(ctx context.Context, space *resource.Space, manifest *AppManifest) error {

operation/push_test.go

@@ -15,42 +15,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestAppPush(t *testing.T) {
-	serverURL := testutil.SetupFakeAPIServer()
-	defer testutil.Teardown()
-
-	g := testutil.NewObjectJSONGenerator()
-	org := g.Organization()
-	space := g.Space()
-	job := g.Job("COMPLETE")
-	app := g.Application()
-	pkg := g.Package("READY")
-	build := g.Build("STAGED")
-	droplet := g.Droplet()
-	dropletAssoc := g.DropletAssociation()
-
-	fakeAppZipReader := strings.NewReader("blah zip zip")
-	var numOfInstances uint = 2
-	manifest := &AppManifest{
-		Name:       app.Name,
-		Buildpacks: []string{"java-buildpack-offline"},
-
-		AppManifestProcess: AppManifestProcess{
-			HealthCheckType:         "http",
-			HealthCheckHTTPEndpoint: "/health",
-			Instances:               &numOfInstances,
-			Memory:                  "1G",
-		},
-		Routes: &AppManifestRoutes{
-			{
-				Route: "https://spring-music.cf.apps.example.org",
-			},
-		},
-		Services: &AppManifestServices{{Name: "spring-music-sql"}},
-		Stack:    "cflinuxfs3",
-	}
-
-	testutil.SetupMultiple([]testutil.MockRoute{
+func setupAppPushRoutes(t *testing.T, serverURL string, g *testutil.ObjectJSONGenerator, org, space, job, app, pkg, build, droplet, dropletAssoc *testutil.JSONResource, finalAction string) {
+	routes := []testutil.MockRoute{
 		{
 			Method:   http.MethodGet,
 			Endpoint: "/v3/organizations",
@@ -124,13 +90,55 @@ func TestAppPush(t *testing.T) {
 			Output:   g.Single(dropletAssoc.JSON),
 			Status:   http.StatusOK,
 		},
-		{
-			Method:   http.MethodPost,
-			Endpoint: fmt.Sprintf("/v3/apps/%s/actions/start", app.GUID),
-			Output:   g.Single(app.JSON),
-			Status:   http.StatusOK,
+	}
+
+	routes = append(routes, testutil.MockRoute{
+		Method:   http.MethodPost,
+		Endpoint: fmt.Sprintf("/v3/apps/%s/actions/%s", app.GUID, finalAction),
+		Output:   g.Single(app.JSON),
+		Status:   http.StatusOK,
+	})
+
+	testutil.SetupMultiple(routes, t)
+}
+
+func TestAppPushStartsStoppedApp(t *testing.T) {
+	serverURL := testutil.SetupFakeAPIServer()
+	defer testutil.Teardown()
+
+	g := testutil.NewObjectJSONGenerator()
+	org := g.Organization()
+	space := g.Space()
+	job := g.Job("COMPLETE")
+	app := g.Application()
+	app.JSON = strings.Replace(app.JSON, `"state": "STARTED"`, `"state": "STOPPED"`, 1)
+	pkg := g.Package("READY")
+	build := g.Build("STAGED")
+	droplet := g.Droplet()
+	dropletAssoc := g.DropletAssociation()
+
+	fakeAppZipReader := strings.NewReader("blah zip zip")
+	var numOfInstances uint = 2
+	manifest := &AppManifest{
+		Name:       app.Name,
+		Buildpacks: []string{"java-buildpack-offline"},
+
+		AppManifestProcess: AppManifestProcess{
+			HealthCheckType:         "http",
+			HealthCheckHTTPEndpoint: "/health",
+			Instances:               &numOfInstances,
+			Memory:                  "1G",
 		},
-	}, t)
+		Routes: &AppManifestRoutes{
+			{
+				Route: "https://spring-music.cf.apps.example.org",
+			},
+		},
+		Services: &AppManifestServices{{Name: "spring-music-sql"}},
+		Stack:    "cflinuxfs3",
+	}
+
+	setupAppPushRoutes(t, serverURL, g, org, space, job, app, pkg, build, droplet, dropletAssoc, "start")
 
 	c, _ := config.New(serverURL, config.Token("", "fake-refresh-token"), config.SkipTLSValidation())
 	cf, err := client.New(c)
@@ -144,6 +152,54 @@ func TestAppPush(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestAppPushRestartsRunningApp(t *testing.T) {
+	serverURL := testutil.SetupFakeAPIServer()
+	defer testutil.Teardown()
+
+	g := testutil.NewObjectJSONGenerator()
+	org := g.Organization()
+	space := g.Space()
+	job := g.Job("COMPLETE")
+	app := g.Application()
+	pkg := g.Package("READY")
+	build := g.Build("STAGED")
+	droplet := g.Droplet()
+	dropletAssoc := g.DropletAssociation()
+
+	fakeAppZipReader := strings.NewReader("blah zip zip")
+	var numOfInstances uint = 2
+	manifest := &AppManifest{
+		Name:       app.Name,
+		Buildpacks: []string{"java-buildpack-offline"},
+
+		AppManifestProcess: AppManifestProcess{
+			HealthCheckType:         "http",
+			HealthCheckHTTPEndpoint: "/health",
+			Instances:               &numOfInstances,
+			Memory:                  "1G",
+		},
+		Routes: &AppManifestRoutes{
+			{
+				Route: "https://spring-music.cf.apps.example.org",
+			},
+		},
+		Services: &AppManifestServices{{Name: "spring-music-sql"}},
+		Stack:    "cflinuxfs3",
+	}
+
+	setupAppPushRoutes(t, serverURL, g, org, space, job, app, pkg, build, droplet, dropletAssoc, "restart")
+
+	c, _ := config.New(serverURL, config.Token("", "fake-refresh-token"), config.SkipTLSValidation())
+	cf, err := client.New(c)
+	require.NoError(t, err)
+
+	pusher := NewAppPushOperation(cf, org.Name, space.Name)
+	strategy := StrategyMode(10)
+	pusher.WithStrategy(strategy)
+	_, err = pusher.Push(context.Background(), manifest, fakeAppZipReader)
+	require.NoError(t, err)
+}
+
 func TestDockerLifecycleBuildCreation(t *testing.T) {
 	serverURL := testutil.SetupFakeAPIServer()
 	defer testutil.Teardown()