Merge pull request #107 from Berops/feature/random-hash

Feature/random hash

K8s-dev-cluster/kustomization.yaml

@@ -17,14 +17,14 @@ images:
 - name: eu.gcr.io/platform-infrastructure-316112/platform/builder
   newTag: 7970bf38b2c4f59ab259eb32d00199a554ebbed3
 - name: eu.gcr.io/platform-infrastructure-316112/platform/context-box
-  newTag: 7970bf38b2c4f59ab259eb32d00199a554ebbed3
+  newTag: 79577d2f78f4c39153664bf832d6ae6620596f8b
 - name: eu.gcr.io/platform-infrastructure-316112/platform/kube-eleven
-  newTag: 7970bf38b2c4f59ab259eb32d00199a554ebbed3
+  newTag: 79577d2f78f4c39153664bf832d6ae6620596f8b
 - name: eu.gcr.io/platform-infrastructure-316112/platform/scheduler
-  newTag: 7970bf38b2c4f59ab259eb32d00199a554ebbed3
+  newTag: 79577d2f78f4c39153664bf832d6ae6620596f8b
 - name: eu.gcr.io/platform-infrastructure-316112/platform/terraformer
-  newTag: 7970bf38b2c4f59ab259eb32d00199a554ebbed3
+  newTag: 79577d2f78f4c39153664bf832d6ae6620596f8b
 - name: eu.gcr.io/platform-infrastructure-316112/platform/testing-framework
   newTag: 7970bf38b2c4f59ab259eb32d00199a554ebbed3
 - name: eu.gcr.io/platform-infrastructure-316112/platform/wireguardian
-  newTag: 7970bf38b2c4f59ab259eb32d00199a554ebbed3
+  newTag: 79577d2f78f4c39153664bf832d6ae6620596f8b

Makefile

@@ -2,7 +2,7 @@
 
 #Generate all .proto files
 gen:
-	protoc --proto_path=proto proto/*.proto --go_out=plugins=grpc:.
+	protoc  --go-grpc_out=. --go_out=. proto/*.proto
 
 contextbox:
 	go run services/context-box/server/server.go

go.mod

@@ -3,6 +3,9 @@ module github.com/Berops/platform
 go 1.16
 
 require (
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/posener/complete/v2 v2.0.1-alpha.13 // indirect
 	github.com/rs/zerolog v1.25.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0-beta.7
 	github.com/stretchr/testify v1.7.0

go.sum

@@ -71,6 +71,12 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -98,6 +104,11 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/posener/autogen v0.0.2/go.mod h1:23ND5WRzjjNM+lOMUvy4WudgDikSK3Sm0rmaXAfnIWo=
+github.com/posener/complete/v2 v2.0.1-alpha.13 h1:xmeDzuCWM0E+hSq6hv4gZQBmiw+uz0zvXvqI7yFMcsk=
+github.com/posener/complete/v2 v2.0.1-alpha.13/go.mod h1:+ndzg+QjkR+oKXdpgsPCdZTg67phWqV1atTotlxuyDg=
+github.com/posener/script v1.1.5 h1:su+9YHNlevT+Hlq2Xul5skh5kYDIBE+x4xu+5mLDT9o=
+github.com/posener/script v1.1.5/go.mod h1:Rg3ijooqulo05aGLyGsHoLmIOUzHUVK19WVgrYBPU/E=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -116,6 +127,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=

proto/config.proto

@@ -28,6 +28,7 @@ message Cluster {
   string kubeconfig = 4;
   string public_key = 5;
   string private_key = 6;
+  string hash = 7;
   repeated NodePool nodePools = 9;
   repeated NodeInfo nodeInfos = 10;
 }

proto/contextBox.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package platform;
 option go_package = "proto/pb";
-import "config.proto";
+import "proto/config.proto";
 
 // Save
 message SaveConfigRequest { Config config = 1; }

proto/kubeEleven.proto

@@ -2,7 +2,8 @@ syntax = "proto3";
 
 package platform;
 
-import "config.proto";
+import "proto/config.proto";
+
 
 option go_package = "proto/pb";