Merge pull request #81 from RSE-Cambridge/etcd-rework

Etcd rework

build/rebuild_mocks.sh

@@ -6,24 +6,32 @@ echo "Regenerate mocks:"
 
 mkdir -p internal/pkg/mocks
 
-items="pool volume"
+items="session session_action_handler"
 for i in $items; do
-    mockgen -source=internal/pkg/registry/${i}.go \
-        -package mocks >internal/pkg/mocks/${i}_mock.go
+    mockgen -source=internal/pkg/facade/${i}.go \
+        >internal/pkg/mock_facade/${i}.go
 done
 
-items="job"
+items="disk"
 for i in $items; do
-    mockgen -source=internal/pkg/dacctl/${i}.go \
-        -package mocks >internal/pkg/mocks/${i}_mock.go
+    mockgen -source=internal/pkg/fileio/${i}.go \
+        >internal/pkg/mock_fileio/${i}_mock.go
 done
 
-items="disk"
+items="provider ansible"
 for i in $items; do
-    mockgen -source=internal/pkg/fileio/${i}.go \
-        -package mocks >internal/pkg/mocks/${i}_mock.go
+    mockgen -source=internal/pkg/filesystem/${i}.go \
+        >internal/pkg/mock_filesystem/${i}.go
 done
 
-items="interface"
-mockgen -source=internal/pkg/pfsprovider/interface.go \
-    -package mocks >internal/pkg/mocks/pfsprovider_mock.go
+items="brick_allocation brick_host session session_actions"
+for i in $items; do
+    mockgen -source=internal/pkg/registry/${i}.go \
+        >internal/pkg/mock_registry/${i}.go
+done
+
+items="keystore"
+for i in $items; do
+    mockgen -source=internal/pkg/store/${i}.go \
+        >internal/pkg/mock_store/${i}.go
+done