Remove definition type, add builder requirements param (#17)

Author: mikegray

client/build.go

@@ -16,13 +16,8 @@ import (
 
 // Submit sends a build job to the Build Service. The context controls the
 // lifetime of the request.
-func (c *Client) Submit(ctx context.Context, d Definition, libraryRef string, libraryURL string) (bi BuildInfo, err error) {
-
-	b, err := json.Marshal(BuildRequest{
-		Definition: d,
-		LibraryRef: libraryRef,
-		LibraryURL: libraryURL,
-	})
+func (c *Client) Submit(ctx context.Context, br BuildRequest) (bi BuildInfo, err error) {
+	b, err := json.Marshal(br)
 	if err != nil {
 		return
 	}

client/build_test.go

@@ -58,7 +58,11 @@ func TestSubmit(t *testing.T) {
 			m.buildResponseCode = tt.responseCode
 
 			// Call the handler
-			bi, err := c.Submit(tt.ctx, client.Definition{}, tt.libraryRef, "")
+			bi, err := c.Submit(tt.ctx, client.BuildRequest{
+				DefinitionRaw: []byte{},
+				LibraryRef:    tt.libraryRef,
+				LibraryURL:    "",
+			})
 
 			if tt.expectSuccess {
 				// Ensure the handler returned no error, and the response is as expected

client/client_test.go

@@ -47,7 +47,7 @@ const (
 	imagePath      = "/v1/image"
 )
 
-func newResponse(m *mockService, id string, d client.Definition, libraryRef string) client.BuildInfo {
+func newResponse(m *mockService, id string, def []byte, libraryRef string) client.BuildInfo {
 	libraryURL := url.URL{
 		Scheme: "http",
 		Host:   m.httpAddr,
@@ -57,12 +57,12 @@ func newResponse(m *mockService, id string, d client.Definition, libraryRef stri
 	}
 
 	return client.BuildInfo{
-		ID:         id,
-		Definition: d,
-		LibraryURL: libraryURL.String(),
-		LibraryRef: libraryRef,
-		IsComplete: true,
-		ImageSize:  1,
+		ID:            id,
+		DefinitionRaw: def,
+		LibraryURL:    libraryURL.String(),
+		LibraryRef:    libraryRef,
+		IsComplete:    true,
+		ImageSize:     1,
 	}
 }
 
@@ -76,7 +76,7 @@ func (m *mockService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 		if m.buildResponseCode == http.StatusCreated {
 			id := newObjectID()
-			if err := jsonresp.WriteResponse(w, newResponse(m, id, br.Definition, br.LibraryRef), m.buildResponseCode); err != nil {
+			if err := jsonresp.WriteResponse(w, newResponse(m, id, br.DefinitionRaw, br.LibraryRef), m.buildResponseCode); err != nil {
 				m.t.Fatal(err)
 			}
 		} else {
@@ -91,7 +91,7 @@ func (m *mockService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			m.t.Fatalf("failed to parse ID '%v'", id)
 		}
 		if m.statusResponseCode == http.StatusOK {
-			if err := jsonresp.WriteResponse(w, newResponse(m, id, client.Definition{}, ""), m.statusResponseCode); err != nil {
+			if err := jsonresp.WriteResponse(w, newResponse(m, id, []byte{}, ""), m.statusResponseCode); err != nil {
 				m.t.Fatal(err)
 			}
 		} else {
@@ -210,7 +210,11 @@ func TestBuild(t *testing.T) {
 			m.imageResponseCode = tt.imageResponseCode
 
 			// Do it!
-			bd, err := c.Submit(tt.ctx, client.Definition{}, tt.imagePath, url.String())
+			bd, err := c.Submit(tt.ctx, client.BuildRequest{
+				DefinitionRaw: []byte{},
+				LibraryRef:    tt.imagePath,
+				LibraryURL:    url.String(),
+			})
 			if !tt.expectSubmitSuccess {
 				// Ensure the handler returned an error
 				if err == nil {

client/definition.go

@@ -11,10 +11,11 @@ import (
 
 // BuildRequest contains the info necessary for submitting a build to build service
 type BuildRequest struct {
-	Definition  `json:"definition"`
-	LibraryRef  string `json:"libraryRef"`
-	LibraryURL  string `json:"libraryURL"`
-	CallbackURL string `json:"callbackURL"`
+	LibraryRef          string            `json:"libraryRef"`
+	LibraryURL          string            `json:"libraryURL"`
+	CallbackURL         string            `json:"callbackURL"`
+	DefinitionRaw       []byte            `json:"definitionRaw"`
+	BuilderRequirements map[string]string `json:"builderRequirements"`
 }
 
 // BuildInfo contains the details of an individual build
@@ -26,8 +27,8 @@ type BuildInfo struct {
 	CompleteTime  *time.Time `json:"completeTime,omitempty"`
 	ImageSize     int64      `json:"imageSize,omitempty"`
 	ImageChecksum string     `json:"imageChecksum,omitempty"`
-	Definition    Definition `json:"definition"`
 	LibraryRef    string     `json:"libraryRef"`
 	LibraryURL    string     `json:"libraryURL"`
 	CallbackURL   string     `json:"callbackURL"`
+	DefinitionRaw []byte     `json:"definitionRaw"`
 }