From 6eacb85fc372a954d8fd5498a3422a56a102881b Mon Sep 17 00:00:00 2001
From: Marcos Lilljedahl <marcosnils@gmail.com>
Date: Tue, 12 Sep 2017 17:17:19 -0300
Subject: [PATCH] Add missing pieces due to rebase

---
 api.go                 | 2 +-
 provisioner/windows.go | 2 +-
 pwd/session_test.go    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api.go b/api.go
index 5d50b0c..be9eaa9 100644
--- a/api.go
+++ b/api.go
@@ -22,7 +22,7 @@ func main() {
 	s := initStorage()
 	f := initFactory(s)
 
-	ipf := provisioner.NewInstanceProvisionerFactory(provisioner.NewWindows(f, s), provisioner.NewDinD(f, s))
+	ipf := provisioner.NewInstanceProvisionerFactory(provisioner.NewWindowsASG(f, s), provisioner.NewDinD(f, s))
 	sp := provisioner.NewOverlaySessionProvisioner(f)
 
 	core := pwd.NewPWD(f, e, s, sp, ipf)
diff --git a/provisioner/windows.go b/provisioner/windows.go
index cd70ef3..636b9f8 100644
--- a/provisioner/windows.go
+++ b/provisioner/windows.go
@@ -46,7 +46,7 @@ type instanceInfo struct {
 	id        string
 }
 
-func NewWindows(f docker.FactoryApi, st storage.StorageApi) *windows {
+func NewWindowsASG(f docker.FactoryApi, st storage.StorageApi) *windows {
 	return &windows{factory: f, storage: st}
 }
 
diff --git a/pwd/session_test.go b/pwd/session_test.go
index a1d7db1..12fa507 100644
--- a/pwd/session_test.go
+++ b/pwd/session_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/play-with-docker/play-with-docker/docker"
 	"github.com/play-with-docker/play-with-docker/event"
 	"github.com/play-with-docker/play-with-docker/provisioner"
-	"github.com/play-with-docker/play-with-docker/pwd/types"
 	"github.com/play-with-docker/play-with-docker/storage"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -75,6 +74,7 @@ func TestSessionNew(t *testing.T) {
 
 ************************** Not sure how to test this as it can pick any manager as the first node in the swarm cluster.
 
+
 func TestSessionSetup(t *testing.T) {
 	_d := &docker.Mock{}
 	_f := &docker.FactoryMock{}
@@ -165,3 +165,4 @@ func TestSessionSetup(t *testing.T) {
 	_g.AssertExpectations(t)
 	_e.M.AssertExpectations(t)
 }
+*/