Merge pull request #66 from spotify/rugvip/scaffolder-build

backend/scaffolder: fix build

backend/scaffolder/app/server.go

@@ -2,8 +2,9 @@ package app
 
 import (
 	"context"
+
 	identity "github.com/spotify/backstage/backend/proto/identity/v1"
-	pb "github.com/spotify/backstage/proto/scaffolder/v1"
+	pb "github.com/spotify/backstage/backend/proto/scaffolder/v1"
 	"github.com/spotify/backstage/scaffolder/repository"
 )
 

backend/scaffolder/go.mod

@@ -2,13 +2,9 @@ module github.com/spotify/backstage/scaffolder
 
 go 1.13
 
-replace github.com/spotify/backstage/proto => ../proto
-
 replace github.com/spotify/backstage/backend/proto => ../proto
 
 require (
-	github.com/golang/protobuf v1.3.3
 	github.com/spotify/backstage/backend/proto v0.0.0-00010101000000-000000000000
-	github.com/spotify/backstage/proto v0.0.0-00010101000000-000000000000
 	google.golang.org/grpc v1.27.0
 )

backend/scaffolder/main.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"net"
 
-	pb "github.com/spotify/backstage/proto/scaffolder/v1"
+	pb "github.com/spotify/backstage/backend/proto/scaffolder/v1"
 	"github.com/spotify/backstage/scaffolder/app"
 
 	"google.golang.org/grpc"