Skip to content

Commit

Permalink
Add support for disk limit and memory for push option
Browse files Browse the repository at this point in the history
Signed-off-by: Kerem Avci <[email protected]>
  • Loading branch information
keremavci committed Oct 26, 2019
1 parent 91665a5 commit 444bebf
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
11 changes: 10 additions & 1 deletion out/cloud_foundry.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
type PAAS interface {
Login(api string, username string, password string, clientID string, clientSecret string, insecure bool) error
Target(organization string, space string) error
PushApp(manifest string, path string, currentAppName string, vars map[string]interface{}, varsFiles []string, dockerUser string, showLogs bool, noStart bool) error
PushApp(manifest string, path string, currentAppName string, vars map[string]interface{}, varsFiles []string, dockerUser string, showLogs bool, noStart bool, diskLimit string, memory string) error
}

type CloudFoundry struct {
Expand Down Expand Up @@ -50,6 +50,7 @@ func (cf *CloudFoundry) PushApp(
dockerUser string,
showLogs bool,
noStart bool,
diskLimit string, memory string,
) error {
args := []string{}

Expand Down Expand Up @@ -77,6 +78,14 @@ func (cf *CloudFoundry) PushApp(
args = append(args, "--docker-username", dockerUser)
}

if diskLimit != "" {
args = append(args, "-k", diskLimit)
}

if memory != "" {
args = append(args, "-m", memory)
}

if path != "" {
stat, err := os.Stat(path)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions out/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ func (command *Command) Run(request Request) (Response, error) {
request.Params.DockerUsername,
request.Params.ShowAppLog,
request.Params.NoStart,
request.Params.DiskLimit,
request.Params.Memory,
)
if err != nil {
return Response{}, err
Expand Down
6 changes: 5 additions & 1 deletion out/models.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package out

import "github.com/concourse/cf-resource"
import (
"github.com/concourse/cf-resource"
)

type Request struct {
Source resource.Source `json:"source"`
Expand All @@ -18,6 +20,8 @@ type Params struct {
DockerPassword string `json:"docker_password"`
ShowAppLog bool `json:"show_app_log"`
NoStart bool `json:"no_start"`
DiskLimit string `json:"disk_limit"`
Memory string `json:"memory"`
}

type Response struct {
Expand Down
12 changes: 8 additions & 4 deletions out/outfakes/fake_paas.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 444bebf

Please sign in to comment.