feat(stack): add stack support

Author: duanhongyi

api/builds.go

@@ -6,6 +6,7 @@ type Build struct {
 	Created    string            `json:"created"`
 	Dockerfile string            `json:"dockerfile,omitempty"`
 	Image      string            `json:"image,omitempty"`
+	Stack      string            `json:"stack,omitempty"`
 	Owner      string            `json:"owner"`
 	Procfile   map[string]string `json:"procfile"`
 	Sha        string            `json:"sha,omitempty"`
@@ -16,6 +17,7 @@ type Build struct {
 // CreateBuildRequest is the structure of POST /v2/apps/<app id>/builds/.
 type CreateBuildRequest struct {
 	Image    string            `json:"image"`
+	Stack    string            `json:"stack,omitempty"`
 	Procfile map[string]string `json:"procfile,omitempty"`
 }
 
@@ -25,6 +27,7 @@ type BuildHookRequest struct {
 	User       string      `json:"receive_user"`
 	App        string      `json:"receive_repo"`
 	Image      string      `json:"image"`
+	Stack      string      `json:"stack"`
 	Procfile   ProcessType `json:"procfile"`
 	Dockerfile string      `json:"dockerfile"`
 }

builds/builds.go

@@ -54,11 +54,11 @@ func List(c *drycc.Client, appID string, results int) ([]api.Build, int, error)
 //        log.Fatal(err)
 //    }
 func New(c *drycc.Client, appID string, image string,
-	procfile map[string]string) (api.Build, error) {
+	stack string, procfile map[string]string) (api.Build, error) {
 
 	u := fmt.Sprintf("/v2/apps/%s/builds/", appID)
 
-	req := api.CreateBuildRequest{Image: image, Procfile: procfile}
+	req := api.CreateBuildRequest{Image: image, Stack: stack, Procfile: procfile}
 
 	body, err := json.Marshal(req)
 

builds/builds_test.go

@@ -23,6 +23,7 @@ const buildsFixture string = `
             "created": "2014-01-01T00:00:00UTC",
             "dockerfile": "FROM drycc/slugrunner RUN mkdir -p /app WORKDIR /app ENTRYPOINT [\"/runner/init\"] ADD slug.tgz /app ENV GIT_SHA 060da68f654e75fac06dbedd1995d5f8ad9084db",
             "image": "example-go",
+            "stack": "container",
             "owner": "test",
             "procfile": {
                 "web": "example-go"
@@ -40,6 +41,7 @@ const buildFixture string = `
     "created": "2014-01-01T00:00:00UTC",
     "dockerfile": "",
     "image": "drycc/example-go:latest",
+    "stack": "heroku-18",
     "owner": "test",
     "procfile": {
         "web": "example-go"
@@ -49,7 +51,7 @@ const buildFixture string = `
     "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
 }`
 
-const buildExpected string = `{"image":"drycc/example-go","procfile":{"web":"example-go"}}`
+const buildExpected string = `{"image":"drycc/example-go","stack":"heroku-18","procfile":{"web":"example-go"}}`
 
 type fakeHTTPServer struct{}
 
@@ -96,6 +98,7 @@ func TestBuildsList(t *testing.T) {
 			Created:    "2014-01-01T00:00:00UTC",
 			Dockerfile: "FROM drycc/slugrunner RUN mkdir -p /app WORKDIR /app ENTRYPOINT [\"/runner/init\"] ADD slug.tgz /app ENV GIT_SHA 060da68f654e75fac06dbedd1995d5f8ad9084db",
 			Image:      "example-go",
+			Stack:      "container",
 			Owner:      "test",
 			Procfile: map[string]string{
 				"web": "example-go",
@@ -133,6 +136,7 @@ func TestBuildCreate(t *testing.T) {
 		App:     "example-go",
 		Created: "2014-01-01T00:00:00UTC",
 		Image:   "drycc/example-go:latest",
+		Stack:   "heroku-18",
 		Owner:   "test",
 		Procfile: map[string]string{
 			"web": "example-go",
@@ -154,7 +158,7 @@ func TestBuildCreate(t *testing.T) {
 		"web": "example-go",
 	}
 
-	actual, err := New(drycc, "example-go", "drycc/example-go", procfile)
+	actual, err := New(drycc, "example-go", "drycc/example-go", "heroku-18", procfile)
 
 	if err != nil {
 		t.Fatal(err)

hooks/hooks.go

@@ -53,13 +53,14 @@ func GetAppConfig(c *drycc.Client, username, app string) (api.Config, error) {
 // CreateBuild creates a new release of an application. It returns the version of the new release.
 // gitSha should be the first 8 characters of the git commit sha. Image is either the docker image
 // location for the dockerfile app the absolute url to the tar file for a buldpack app.
-func CreateBuild(c *drycc.Client, username, app, image, gitSha string, procfile api.ProcessType,
+func CreateBuild(c *drycc.Client, username, app, image, stack, gitSha string, procfile api.ProcessType,
 	usingDockerifle bool) (int, error) {
 	req := api.BuildHookRequest{
 		Sha:      gitSha,
 		User:     username,
 		App:      app,
 		Image:    image,
+		Stack:    stack,
 		Procfile: procfile,
 	}
 

hooks/hooks_test.go

@@ -55,7 +55,7 @@ const buildFixture = `
 const (
 	testingClientFingerprint = `78:b9:21:20:1a:ed:e6:10:05:35:47:da:d4:1f:b6:73`
 	configHookExpected       = `{"receive_user":"test","receive_repo":"example-go"}`
-	buildHookExpected        = `{"sha":"abc123","receive_user":"test","receive_repo":"example-go","image":"test:abc123","procfile":{"web":"./run"},"dockerfile":"true"}`
+	buildHookExpected        = `{"sha":"abc123","receive_user":"test","receive_repo":"example-go","image":"test:abc123","stack":"heroku-18","procfile":{"web":"./run"},"dockerfile":"true"}`
 	pushHookExpected         = `{"sha":"abc123","receive_user":"test","receive_repo":"example-go","fingerprint":"testing","ssh_connection":"1234","ssh_original_command":"foo"}`
 )
 
@@ -205,7 +205,7 @@ func TestBuildHook(t *testing.T) {
 
 	expected := 2
 
-	actual, err := CreateBuild(drycc, "test", "example-go", "test:abc123", "abc123", map[string]string{"web": "./run"}, true)
+	actual, err := CreateBuild(drycc, "test", "example-go", "test:abc123", "heroku-18", "abc123", map[string]string{"web": "./run"}, true)
 
 	if err != nil {
 		t.Error(err)