From f44fa8f5562e50a9ccb4609d038ec96de703cfae Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 7 Feb 2020 15:06:11 +0100
Subject: [PATCH] feat(scaffolder): uipdating scaffolder

---
 backend/scaffolder/app/server.go                    | 13 ++++++++++++-
 backend/scaffolder/lib/git.go                       |  1 +
 .../template-info.json                              |  6 ++++++
 .../ios-swift-app-template/template-info.json       |  6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 backend/scaffolder/templates/android-kotlin-module-template/template-info.json
 create mode 100644 backend/scaffolder/templates/ios-swift-app-template/template-info.json

diff --git a/backend/scaffolder/app/server.go b/backend/scaffolder/app/server.go
index 9678a3fe79..3be05cfc4a 100644
--- a/backend/scaffolder/app/server.go
+++ b/backend/scaffolder/app/server.go
@@ -6,6 +6,9 @@ import (
 	"github.com/golang/protobuf/jsonpb"
 	identity "github.com/spotify/backstage/backend/proto/identity/v1"
 	pb "github.com/spotify/backstage/backend/proto/scaffolder/v1"
+
+	// "google.golang.org/grpc"
+	inventory "github.com/spotify/backstage/backend/proto/inventory/v1"
 	"github.com/spotify/backstage/scaffolder/fs"
 	"github.com/spotify/backstage/scaffolder/lib"
 	"github.com/spotify/backstage/scaffolder/repository"
@@ -21,10 +24,18 @@ type Server struct {
 	fs         *fs.Filesystem
 	cookie     *lib.Cutter
 	git        *lib.Git
+	inventory  inventory.InventoryClient
 }
 
 // NewServer creates a new server for with all the things
 func NewServer() *Server {
+	// conn, errc := grpc.Dial("http://inventory:50051")
+
+	// if err != nil {
+	// 	log.Fatal("Cannot connect to inventory service")
+	// }
+
+	//inventory: inventory.NewInventoryClient(conn),
 	return &Server{
 		github: lib.NewGithubClient(),
 	}
@@ -87,7 +98,7 @@ func (s *Server) Create(ctx context.Context, req *pb.CreateRequest) (*pb.CreateR
 	}
 
 	if err := s.git.Push(pushOptions); err != nil {
-		return nil, status.Error(codes.Internal, fmt.Sprinf("Failed to push the repository to Github %s", err))
+		return nil, status.Error(codes.Internal, fmt.Sprintf("Failed to push the repository to Github %s", err))
 	}
 
 	return &pb.CreateReply{
diff --git a/backend/scaffolder/lib/git.go b/backend/scaffolder/lib/git.go
index 4ccf818445..455fae5850 100644
--- a/backend/scaffolder/lib/git.go
+++ b/backend/scaffolder/lib/git.go
@@ -27,6 +27,7 @@ func (g *Git) Push(options PushRepositoryOptions) error {
 		fmt.Sprintf("%s/%s", options.TempFolder, options.ComponentID),
 		false,
 	)
+
 	if err != nil {
 		log.Printf("Failed to init the git repository")
 		return err
diff --git a/backend/scaffolder/templates/android-kotlin-module-template/template-info.json b/backend/scaffolder/templates/android-kotlin-module-template/template-info.json
new file mode 100644
index 0000000000..b7c4e51790
--- /dev/null
+++ b/backend/scaffolder/templates/android-kotlin-module-template/template-info.json
@@ -0,0 +1,6 @@
+{
+	"id": "android-kotlin-module",
+	"name": "Kotlin Module",
+	"description": "Kotlin module sample",
+	"ownerId": "ownerId"
+}
\ No newline at end of file
diff --git a/backend/scaffolder/templates/ios-swift-app-template/template-info.json b/backend/scaffolder/templates/ios-swift-app-template/template-info.json
new file mode 100644
index 0000000000..4e29396ce6
--- /dev/null
+++ b/backend/scaffolder/templates/ios-swift-app-template/template-info.json
@@ -0,0 +1,6 @@
+{
+	"id": "ios-swift-app-template",
+	"name": "Swift App",
+	"description": "The a sample swift app",
+	"ownerId": "ownerId"
+}
\ No newline at end of file