Merge pull request #21 from mptsonev/master

Fix uninstall issue and a NPE

Author: Mihail Tsonev

clients/mtaclient/mta_rest_client.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"net/http"
 	"os"
-
 	"github.com/go-errors/errors"
 
 	baseclient "github.com/SAP/cf-mta-plugin/clients/baseclient"
@@ -187,7 +186,10 @@ func (c MtaRestClient) UploadMtaFile(file os.File) (*models.FileMetadata, error)
 		return c.client.Operations.UploadMtaFile(params, token)
 	})
 
-	return result.(*operations.UploadMtaFileCreated).Payload, baseclient.NewClientError(err)
+	if err != nil {
+		return nil, baseclient.NewClientError(err)
+	}
+	return result.(*operations.UploadMtaFileCreated).Payload, nil
 }
 
 func (c MtaRestClient) GetMtaOperationLogContent(operationID, logID string) (string, error) {

mta_plugin.go

@@ -34,6 +34,9 @@ var Commands = []commands.Command{
 // Run runs this plugin
 func (p *MtaPlugin) Run(cliConnection plugin.CliConnection, args []string) {
 	disableStdOut()
+	if args[0] == "CLI-MESSAGE-UNINSTALL" {
+		return
+	}
 	command, err := findCommand(args[0])
 	if err != nil {
 		log.Fatalln(err)