From 224101f108311b4d38b226eed75d0ec03fa14db1 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Thu, 18 Jun 2020 12:27:46 -0700
Subject: [PATCH] Fixing docker host default (#548)

* Prefer defaultHost

* no null

* fixing tests

* port as well
---
 src/Microsoft.Tye.Hosting/Model/Application.cs             | 7 +------
 .../testassets/projects/health-checks/tye-liveness.yaml    | 2 --
 .../testassets/projects/health-checks/tye-none.yaml        | 2 --
 .../testassets/projects/health-checks/tye-proxy.yaml       | 2 --
 .../testassets/projects/health-checks/tye-readiness.yaml   | 2 --
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Microsoft.Tye.Hosting/Model/Application.cs b/src/Microsoft.Tye.Hosting/Model/Application.cs
index 04713c19..ad8cf67b 100644
--- a/src/Microsoft.Tye.Hosting/Model/Application.cs
+++ b/src/Microsoft.Tye.Hosting/Model/Application.cs
@@ -148,13 +148,8 @@ namespace Microsoft.Tye.Hosting.Model
             foreach (var b in service.Description.Bindings)
             {
                 var protocol = b.Protocol;
-                var host = b.Host ?? (isDockerRunInfo ? service.Description.Name : defaultHost);
-
+                var host = b.Host ?? defaultHost ?? (isDockerRunInfo ? service.Description.Name : "");
                 var port = b.Port;
-                if (b.Port is object && isDockerRunInfo)
-                {
-                    port = b.ContainerPort ?? b.Port.Value;
-                }
 
                 bindings.Add(new EffectiveBinding(
                     service.Description.Name,
diff --git a/test/E2ETest/testassets/projects/health-checks/tye-liveness.yaml b/test/E2ETest/testassets/projects/health-checks/tye-liveness.yaml
index 0a4d43a9..f4b875d2 100644
--- a/test/E2ETest/testassets/projects/health-checks/tye-liveness.yaml
+++ b/test/E2ETest/testassets/projects/health-checks/tye-liveness.yaml
@@ -5,8 +5,6 @@ services:
   - name: health-liveness
     project: api/api.csproj
     replicas: 3
-    bindings:
-      - port: 8002
     liveness:
       http:
         path: /healthy
diff --git a/test/E2ETest/testassets/projects/health-checks/tye-none.yaml b/test/E2ETest/testassets/projects/health-checks/tye-none.yaml
index 44cb5f53..11e39496 100644
--- a/test/E2ETest/testassets/projects/health-checks/tye-none.yaml
+++ b/test/E2ETest/testassets/projects/health-checks/tye-none.yaml
@@ -5,6 +5,4 @@ services:
   - name: health-none
     project: api/api.csproj
     replicas: 3
-    bindings:
-      - port: 8001
   
\ No newline at end of file
diff --git a/test/E2ETest/testassets/projects/health-checks/tye-proxy.yaml b/test/E2ETest/testassets/projects/health-checks/tye-proxy.yaml
index 3469fb49..c6441b45 100644
--- a/test/E2ETest/testassets/projects/health-checks/tye-proxy.yaml
+++ b/test/E2ETest/testassets/projects/health-checks/tye-proxy.yaml
@@ -5,8 +5,6 @@ services:
   - name: health-proxy
     project: api/api.csproj
     replicas: 2
-    bindings:
-      - port: 8005
     liveness:
       http:
         path: /healthy
diff --git a/test/E2ETest/testassets/projects/health-checks/tye-readiness.yaml b/test/E2ETest/testassets/projects/health-checks/tye-readiness.yaml
index abe7fae0..5b4f6f2d 100644
--- a/test/E2ETest/testassets/projects/health-checks/tye-readiness.yaml
+++ b/test/E2ETest/testassets/projects/health-checks/tye-readiness.yaml
@@ -5,8 +5,6 @@ services:
   - name: health-readiness
     project: api/api.csproj
     replicas: 3
-    bindings:
-      - port: 8003
     readiness:
       http:
         path: /ready