From 1263f36bc8904fe8d6189b5699563800fa435e53 Mon Sep 17 00:00:00 2001 From: "Jonathan Leibiusky @xetorthio" Date: Fri, 11 Aug 2017 11:39:25 -0300 Subject: [PATCH] Send proxy_host in the new instance event --- pwd/instance.go | 2 +- pwd/instance_test.go | 6 +++--- pwd/session_test.go | 10 +++++----- www/assets/app.js | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pwd/instance.go b/pwd/instance.go index 9ab72c6..6ae186c 100644 --- a/pwd/instance.go +++ b/pwd/instance.go @@ -120,7 +120,7 @@ func (p *pwd) InstanceNew(session *types.Session, conf types.InstanceConfig) (*t return nil, err } - p.event.Emit(event.INSTANCE_NEW, session.Id, instance.Name, instance.IP, instance.Hostname) + p.event.Emit(event.INSTANCE_NEW, session.Id, instance.Name, instance.IP, instance.Hostname, instance.ProxyHost) p.setGauges() diff --git a/pwd/instance_test.go b/pwd/instance_test.go index a0edeea..521f789 100644 --- a/pwd/instance_test.go +++ b/pwd/instance_test.go @@ -87,7 +87,7 @@ func TestInstanceNew(t *testing.T) { } _d.On("CreateContainer", expectedContainerOpts).Return("10.0.0.1", nil) _s.On("InstanceCreate", "aaaabbbbcccc", mock.AnythingOfType("*types.Instance")).Return(nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_node1", "10.0.0.1", "node1"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_node1", "10.0.0.1", "node1", "ip10-0-0-1-aaaabbbbcccc"}).Return() instance, err := p.InstanceNew(session, types.InstanceConfig{Host: "something.play-with-docker.com"}) assert.Nil(t, err) @@ -151,7 +151,7 @@ func TestInstanceNew_WithNotAllowedImage(t *testing.T) { } _d.On("CreateContainer", expectedContainerOpts).Return("10.0.0.1", nil) _s.On("InstanceCreate", "aaaabbbbcccc", mock.AnythingOfType("*types.Instance")).Return(nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_node1", "10.0.0.1", "node1"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_node1", "10.0.0.1", "node1", "ip10-0-0-1-aaaabbbbcccc"}).Return() instance, err := p.InstanceNew(session, types.InstanceConfig{ImageName: "redis"}) assert.Nil(t, err) @@ -215,7 +215,7 @@ func TestInstanceNew_WithCustomHostname(t *testing.T) { _d.On("CreateContainer", expectedContainerOpts).Return("10.0.0.1", nil) _s.On("InstanceCreate", "aaaabbbbcccc", mock.AnythingOfType("*types.Instance")).Return(nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_redis-master", "10.0.0.1", "redis-master"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_redis-master", "10.0.0.1", "redis-master", "ip10-0-0-1-aaaabbbbcccc"}).Return() instance, err := p.InstanceNew(session, types.InstanceConfig{ImageName: "redis", Hostname: "redis-master"}) diff --git a/pwd/session_test.go b/pwd/session_test.go index 4feaa15..9bfe1b5 100644 --- a/pwd/session_test.go +++ b/pwd/session_test.go @@ -86,25 +86,25 @@ func TestSessionSetup(t *testing.T) { _d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_manager1", Hostname: "manager1", Privileged: true, HostFQDN: "localhost"}).Return("10.0.0.2", nil) _f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_manager1").Return(_d, nil) _d.On("SwarmInit").Return(&docker.SwarmTokens{Manager: "managerToken", Worker: "workerToken"}, nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager1", "10.0.0.2", "manager1"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager1", "10.0.0.2", "manager1", "ip10-0-0-2-aaaabbbbcccc"}).Return() _d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_manager2", Hostname: "manager2", Privileged: true}).Return("10.0.0.3", nil) _f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_manager2").Return(_d, nil) _d.On("SwarmJoin", "10.0.0.2:2377", "managerToken").Return(nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager2", "10.0.0.3", "manager2"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager2", "10.0.0.3", "manager2", "ip10-0-0-3-aaaabbbbcccc"}).Return() _d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind:overlay2-dev", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_manager3", Hostname: "manager3", Privileged: true}).Return("10.0.0.4", nil) _f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_manager3").Return(_d, nil) _d.On("SwarmJoin", "10.0.0.2:2377", "managerToken").Return(nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager3", "10.0.0.4", "manager3"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_manager3", "10.0.0.4", "manager3", "ip10-0-0-4-aaaabbbbcccc"}).Return() _d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_worker1", Hostname: "worker1", Privileged: true}).Return("10.0.0.5", nil) _f.On("GetForInstance", "aaaabbbbcccc", "aaaabbbb_worker1").Return(_d, nil) _d.On("SwarmJoin", "10.0.0.2:2377", "workerToken").Return(nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_worker1", "10.0.0.5", "worker1"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_worker1", "10.0.0.5", "worker1", "ip10-0-0-5-aaaabbbbcccc"}).Return() _d.On("CreateContainer", docker.CreateContainerOpts{Image: "franela/dind", SessionId: "aaaabbbbcccc", PwdIpAddress: "10.0.0.1", ContainerName: "aaaabbbb_other", Hostname: "other", Privileged: true}).Return("10.0.0.6", nil) - _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_other", "10.0.0.6", "other"}).Return() + _e.M.On("Emit", event.INSTANCE_NEW, "aaaabbbbcccc", []interface{}{"aaaabbbb_other", "10.0.0.6", "other", "ip10-0-0-6-aaaabbbbcccc"}).Return() var nilArgs []interface{} _e.M.On("Emit", event.SESSION_NEW, "aaaabbbbcccc", nilArgs).Return() diff --git a/www/assets/app.js b/www/assets/app.js index f0ca4ef..0e0f8bb 100644 --- a/www/assets/app.js +++ b/www/assets/app.js @@ -102,6 +102,7 @@ } else { $scope.idx[i.name].ip = i.ip; $scope.idx[i.name].hostname = i.hostname; + $scope.idx[i.name].proxy_host = i.proxy_host; } return $scope.idx[i.name]; @@ -185,8 +186,8 @@ $scope.isAlive = false; }); - socket.on('instance new', function(name, ip, hostname) { - $scope.upsertInstance({ name: name, ip: ip, hostname: hostname }); + socket.on('instance new', function(name, ip, hostname, proxyHost) { + $scope.upsertInstance({ name: name, ip: ip, hostname: hostname, proxy_host: proxyHost}); $scope.$apply(function() { if ($scope.instances.length == 1) { $scope.showInstance($scope.instances[0]);