Merge pull request #409 from Dray56/app_instance

Allow to set manifest app_instances to 0

Author: sneal

operation/manifest.go

@@ -59,7 +59,7 @@ type AppManifestProcess struct {
 	HealthCheckType                  AppHealthCheckType `yaml:"health-check-type,omitempty"`
 	HealthCheckHTTPEndpoint          string             `yaml:"health-check-http-endpoint,omitempty"`
 	HealthCheckInvocationTimeout     uint               `yaml:"health-check-invocation-timeout,omitempty"`
-	Instances                        uint               `yaml:"instances,omitempty"`
+	Instances                        *uint              `yaml:"instances,omitempty"`
 	LogRateLimitPerSecond            string             `yaml:"log-rate-limit-per-second,omitempty"`
 	Memory                           string             `yaml:"memory,omitempty"`
 	Timeout                          uint               `yaml:"timeout,omitempty"`
@@ -150,12 +150,13 @@ func NewManifest(applications ...*AppManifest) *Manifest {
 }
 
 func NewAppManifest(appName string) *AppManifest {
+	var numOfInstances uint = 1
 	return &AppManifest{
 		Name: appName,
 		AppManifestProcess: AppManifestProcess{
 			HealthCheckType:         "port",
 			HealthCheckHTTPEndpoint: "/",
-			Instances:               1,
+			Instances:               &numOfInstances,
 			Memory:                  "256M",
 		},
 	}

operation/manifest_test.go

@@ -67,6 +67,7 @@ const fullSpringMusicYamlV2 = `applications:
 `
 
 func TestManifestMarshalling(t *testing.T) {
+	var numOfInstances uint = 2
 	m := &Manifest{
 		Applications: []*AppManifest{
 			{
@@ -86,7 +87,7 @@ func TestManifestMarshalling(t *testing.T) {
 				AppManifestProcess: AppManifestProcess{
 					HealthCheckType:         "http",
 					HealthCheckHTTPEndpoint: "/health",
-					Instances:               2,
+					Instances:               &numOfInstances,
 					LogRateLimitPerSecond:   "100MB",
 					Memory:                  "1G",
 					Timeout:                 60,

operation/push.go

@@ -155,7 +155,7 @@ func (p *AppPushOperation) pushRollingApp(ctx context.Context, space *resource.S
 	}
 	// In case application crashed due to new deployment, deployment will be stuck with value "ACTIVE" and reason "DEPLOYING"
 	// This will be considered as deployment failed after timeout
-	depPollErr := p.waitForDeployment(ctx, deployment.GUID, manifest.Instances)
+	depPollErr := p.waitForDeployment(ctx, deployment.GUID, *manifest.Instances)
 
 	// Check the app state if app not started or deployment failed rollback the deployment
 	originalApp, err = p.findApp(ctx, manifest.Name, space)
@@ -167,7 +167,7 @@ func (p *AppPushOperation) pushRollingApp(ctx context.Context, space *resource.S
 		if rollBackErr != nil {
 			return nil, fmt.Errorf("failed to confirm rollback deployment with: %s", rollBackErr.Error())
 		}
-		depRollPollErr := p.waitForDeployment(ctx, rollBackDeployment.GUID, manifest.Instances)
+		depRollPollErr := p.waitForDeployment(ctx, rollBackDeployment.GUID, *manifest.Instances)
 		if depRollPollErr != nil {
 			return nil, fmt.Errorf("failed to deploy with: %s \nfailed to confirm roll back to last deployment with: %s", depPollErr.Error(), depRollPollErr.Error())
 		}

operation/push_test.go

@@ -29,14 +29,15 @@ func TestAppPush(t *testing.T) {
 	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:               2,
+			Instances:               &numOfInstances,
 			Memory:                  "1G",
 		},
 		Routes: &AppManifestRoutes{