upload file backend is implemented

Author: urcan

src/app/backend/apihandler.go

@@ -206,13 +206,12 @@ func (apiHandler *ApiHandler) handleDeployFromFile(request *restful.Request, res
 		handleInternalError(response, err)
 		return
 	}
-	if err := DeployAppFromFile(deploymentSpec, apiHandler.client); err != nil {
+	if err := DeployAppFromFile(deploymentSpec); err != nil {
 		handleInternalError(response, err)
 		return
 	}
 
 	response.WriteHeaderAndEntity(http.StatusCreated, deploymentSpec)
-
 }
 
 // Handles app name validation API call.

src/app/backend/deploy.go

@@ -16,16 +16,14 @@ package main
 
 import (
 	"fmt"
-	ioutil "io/ioutil"
 	"log"
-	"os"
 	"strings"
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
-	create "k8s.io/kubernetes/pkg/kubectl/cmd"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	kubectlResource "k8s.io/kubernetes/pkg/kubectl/resource"
 	"k8s.io/kubernetes/pkg/util/intstr"
 )
 
@@ -246,26 +244,36 @@ func getLabelsMap(labels []Label) map[string]string {
 }
 
 // Deploys an app based on the given yaml or json file.
-func DeployAppFromFile(spec *AppDeploymentFromFileSpec, client *client.Client) error {
-	// Creates temp file to use it in kubectl command
-	file, err := ioutil.TempFile("", spec.Name)
-	if err != nil {
-		return err
-	}
-	_,err = file.WriteString(spec.Content)
+func DeployAppFromFile(spec *AppDeploymentFromFileSpec) error {
+	const (
+		validate      = true
+		emptyCacheDir = ""
+	)
+
+	factory := cmdutil.NewFactory(nil)
+	schema, err := factory.Validator(validate, emptyCacheDir)
 	if err != nil {
 		return err
 	}
-	// Runs kubectl create command with the temp file
-	options := &create.CreateOptions{
-		Filenames: []string {file.Name()},
-	}
-	cmd := create.NewCmdCreate(cmdutil.NewFactory(nil), os.Stdout)
-	cmd.Flags().Set("filename", file.Name())
-	cmd.Flags().Set("output", "name")
-	err = create.RunCreate(cmdutil.NewFactory(nil), cmd, os.Stdout, options)
-
-	// Removes the created temp file after using it
-	os.Remove(file.Name())
-	return err
+
+	mapper, typer := factory.Object()
+	reader := strings.NewReader(spec.Content)
+
+	r := kubectlResource.NewBuilder(mapper, typer, factory.ClientMapperForCommand()).
+		Schema(schema).
+		NamespaceParam(api.NamespaceDefault).DefaultNamespace().
+		Stream(reader, spec.Name).
+		Flatten().
+		Do()
+
+	return r.Visit(func(info *kubectlResource.Info, err error) error {
+		// creates an object from input info
+		_, err = kubectlResource.NewHelper(info.Client, info.Mapping).Create(info.Namespace, true, info.Object)
+		if err != nil {
+			return err
+		}
+		log.Printf("%s is deployed", info.Name)
+		return nil
+	})
 }
+

src/app/frontend/common/errorhandling/errordialog_service.js

@@ -41,19 +41,4 @@ export default class ErrorDialog {
     alert.ok('Close');
     this.mdDialog_.show(alert);
   }
-
-  /**
-   * Opens a pop-up window that displays the error message with title
-   *
-   * @param {string} title
-   * @param {string} message
-   * @export
-   */
-  openWithDetail(title, message) {
-    let alert = this.mdDialog_.alert();
-    alert.title(title);
-    alert.textContent(message);
-    alert.ok('Close');
-    this.mdDialog_.show(alert);
-  }
 }

src/app/frontend/deploy/deployfromfile_controller.js

@@ -76,9 +76,9 @@ export default class DeployFromFileController {
     let defer = this.q_.defer();
 
     /** @type {!angular.Resource<!backendApi.AppDeploymentFromFileSpec>} */
-    let resource = this.resource_('/api/appdeploymentfromfile');
+    let resource = this.resource_('api/appdeploymentfromfile');
     resource.save(
-      deploymentSpec,
+        deploymentSpec,
         (savedConfig) => {
           defer.resolve(savedConfig);  // Progress ends
           this.log_.info('Successfully deployed application: ', savedConfig);
@@ -87,7 +87,7 @@ export default class DeployFromFileController {
         (err) => {
           defer.reject(err);  // Progress ends
           this.log_.error('Error deploying application:', err);
-          this.errorDialog_.openWithDetail('File upload failed' ,err.data);
+          this.errorDialog_.open('Deploying file has failed', err.data);
         });
     return defer.promise;
   }

src/test/backend/deploy_test.go

@@ -159,3 +159,35 @@ func TestGetAvailableProtocols(t *testing.T) {
 			expected, actual)
 	}
 }
+
+func TestDeployAppFromFileWithValidContent(t *testing.T) {
+	validContent := "{\"kind\": \"Namespace\"," +
+		"\"apiVersion\": \"v1\"," +
+		"\"metadata\": {" +
+		"\"name\": \"development\"," +
+		"\"labels\": {\"name\": \"development\"}}}"
+
+	spec := &AppDeploymentFromFileSpec{
+		Name:    "foo-name",
+		Content: validContent,
+	}
+
+	err := DeployAppFromFile(spec)
+
+	if err != nil {
+		t.Errorf("Expected return value to be %#v but got %#v", nil, err)
+	}
+}
+
+func TestDeployAppFromFileWithInvalidContent(t *testing.T) {
+	spec := &AppDeploymentFromFileSpec{
+		Name:    "foo-name",
+		Content: "foo-content-invalid",
+	}
+
+	err := DeployAppFromFile(spec)
+
+	if err == nil {
+		t.Errorf("Expected return value to be an error but got %#v", nil)
+	}
+}

src/test/frontend/deploy/deployfromfile_controller_test.js

@@ -0,0 +1,55 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import DeployFromFileController from 'deploy/deployfromfile_controller';
+import deployModule from 'deploy/deploy_module';
+
+describe('DeployFromFile controller', () => {
+  /** @type {!DeployFromFileController} */
+  let ctrl;
+  /** @type {!angular.$resource} */
+  let mockResource;
+  /** @type {!angular.FormController} */
+  let form;
+
+  beforeEach(() => {
+    angular.mock.module(deployModule.name);
+
+    angular.mock.inject(($controller) => {
+      mockResource = jasmine.createSpy('$resource');
+      ctrl = $controller(DeployFromFileController, {$resource: mockResource}, {form: form});
+    });
+  });
+
+  it('should deploy with file name and content', () => {
+    // given
+    let resourceObject = {
+      save: jasmine.createSpy('save'),
+    };
+    ctrl.file.name = "test.yaml";
+    ctrl.file.content = "test_content";
+    mockResource.and.returnValue(resourceObject);
+    resourceObject.save.and.callFake((spec) => {
+      // then
+      expect(spec.name).toBe("test.yaml");
+      expect(spec.content).toBe('test_content');
+    });
+    // when
+    ctrl.deploy();
+
+    // then
+    expect(resourceObject.save).toHaveBeenCalled();
+  });
+
+});