topo: fix proto path
diff --git a/go/svc/topo/config.proto b/go/svc/topo/config.proto
index f1054be..33aadbe 100644
--- a/go/svc/topo/config.proto
+++ b/go/svc/topo/config.proto
@@ -1,5 +1,7 @@
syntax = "proto3";
+package proto;
+
message Config {
repeated Switch switch = 1;
repeated Machine machine = 2;
diff --git a/go/svc/topo/graph/graph.go b/go/svc/topo/graph/graph.go
index e076797..72e69b2 100644
--- a/go/svc/topo/graph/graph.go
+++ b/go/svc/topo/graph/graph.go
@@ -10,7 +10,7 @@
"github.com/digitalocean/go-netbox/netbox/models"
"github.com/golang/glog"
- confpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
+ pb "code.hackerspace.pl/hscloud/go/svc/topo/proto"
)
type MachinePort struct {
@@ -60,7 +60,7 @@
glog.Infof("Removed switch %q", name)
}
-func (g *Graph) LoadConfig(conf *confpb.Config) error {
+func (g *Graph) LoadConfig(conf *pb.Config) error {
loadedMachines := make(map[string]bool)
loadedSwitches := make(map[string]bool)
diff --git a/go/svc/topo/main.go b/go/svc/topo/main.go
index 5cc73b4..4affd57 100644
--- a/go/svc/topo/main.go
+++ b/go/svc/topo/main.go
@@ -13,7 +13,7 @@
"github.com/golang/glog"
"github.com/golang/protobuf/proto"
- confpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
+ pb "code.hackerspace.pl/hscloud/go/svc/topo/proto"
"code.hackerspace.pl/hscloud/go/svc/topo/graph"
"code.hackerspace.pl/hscloud/go/svc/topo/state"
@@ -47,7 +47,7 @@
glog.Exitf("Could not read config: %v", err)
}
- config := confpb.Config{}
+ config := pb.Config{}
proto.UnmarshalText(string(data), &config)
stm := state.NewManager()
diff --git a/go/svc/topo/proto/.gitignore b/go/svc/topo/proto/.gitignore
index 04204c7..5608690 100644
--- a/go/svc/topo/proto/.gitignore
+++ b/go/svc/topo/proto/.gitignore
@@ -1 +1 @@
-config
+config.pb.go
diff --git a/go/svc/topo/proto/generate.go b/go/svc/topo/proto/generate.go
index 1a12b15..f760a61 100644
--- a/go/svc/topo/proto/generate.go
+++ b/go/svc/topo/proto/generate.go
@@ -1,3 +1,3 @@
-//go:generate protoc -I.. ../config.proto --go_out=plugins=grpc:config
+//go:generate protoc -I.. ../config.proto --go_out=plugins=grpc:.
package proto
diff --git a/go/svc/topo/state/state.go b/go/svc/topo/state/state.go
index 8a223ae..232f9b0 100644
--- a/go/svc/topo/state/state.go
+++ b/go/svc/topo/state/state.go
@@ -8,7 +8,7 @@
"google.golang.org/grpc"
ipb "code.hackerspace.pl/hscloud/go/proto/infra"
- confpb "code.hackerspace.pl/hscloud/go/svc/topo/proto/config"
+ pb "code.hackerspace.pl/hscloud/go/svc/topo/proto"
"code.hackerspace.pl/hscloud/go/pki"
)
@@ -49,7 +49,7 @@
}
}
-func (s *StateManager) FetchState(ctx context.Context, conf *confpb.Config) error {
+func (s *StateManager) FetchState(ctx context.Context, conf *pb.Config) error {
s.Mu.Lock()
defer s.Mu.Unlock()
for _, sw := range conf.Switch {