Fix dapr and environment variable injection (#510)

jkotalik · web-flow · commit fc4dc9281665 · 2020-05-28T15:23:42.000-07:00
diff --git a/src/Microsoft.Tye.Core/CombineStep.cs b/src/Microsoft.Tye.Core/CombineStep.cs
@@ -46,15 +46,18 @@ public override Task ExecuteAsync(OutputContext output, ApplicationBuilder appli
                 }
             }
 
+            var services = new List<string>() { service.Name };
+            services.AddRange(service.Dependencies);
+
             // Process bindings and turn them into environment variables and secrets. There's
             // some duplication with the code in m8s (Application.cs) for populating environments.
             //
             // service.Service.Bindings is the bindings OUT - this step computes bindings IN.
-            service.Outputs.Add(ComputeBindings(application, service.Dependencies));
+            service.Outputs.Add(ComputeBindings(application, services));
 
             foreach (var sidecar in project.Sidecars)
             {
-                sidecar.Outputs.Add(ComputeBindings(application, sidecar.Dependencies));
+                sidecar.Outputs.Add(ComputeBindings(application, services));
             }
 
             return Task.CompletedTask;
diff --git a/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs b/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
@@ -71,6 +71,14 @@ public override Task ProcessAsync(ExtensionContext context, ExtensionConfigurati
                         proxy.Args += $" -log-level {logLevel}";
                     }
 
+                    // Add dapr proxy as a service available to everyone.
+                    proxy.Dependencies.UnionWith(context.Application.Services.Select(s => s.Name));
+
+                    foreach (var s in context.Application.Services)
+                    {
+                        s.Dependencies.Add(proxy.Name);
+                    }
+
                     context.Application.Services.Add(proxy);
 
                     // Listen for grpc on an auto-assigned port
diff --git a/src/Microsoft.Tye.Hosting/Model/Application.cs b/src/Microsoft.Tye.Hosting/Model/Application.cs
@@ -132,33 +132,39 @@ private List<EffectiveBinding> ComputeBindings(Service service, string defaultHo
         {
             var bindings = new List<EffectiveBinding>();
 
+            var isDockerRunInfo = service.Description.RunInfo is DockerRunInfo;
+            GetEffectiveBindings(isDockerRunInfo, defaultHost, bindings, service);
+
             foreach (var serv in service.Description.Dependencies)
             {
-                var s = Services[serv];
+                GetEffectiveBindings(isDockerRunInfo, defaultHost, bindings, Services[serv]);
+            }
 
-                foreach (var b in s.Description.Bindings)
-                {
-                    var protocol = b.Protocol;
-                    var host = b.Host ?? (service.Description.RunInfo is DockerRunInfo ? s.Description.Name : defaultHost);
+            return bindings;
+        }
 
-                    var port = b.Port;
-                    if (b.Port is object && service.Description.RunInfo is DockerRunInfo)
-                    {
-                        port = b.ContainerPort ?? b.Port.Value;
-                    }
+        private static void GetEffectiveBindings(bool isDockerRunInfo, string defaultHost, List<EffectiveBinding> bindings, Service service)
+        {
+            foreach (var b in service.Description.Bindings)
+            {
+                var protocol = b.Protocol;
+                var host = b.Host ?? (isDockerRunInfo ? service.Description.Name : defaultHost);
 
-                    bindings.Add(new EffectiveBinding(
-                        s.Description.Name,
-                        b.Name,
-                        protocol,
-                        host,
-                        port,
-                        b.ConnectionString,
-                        s.Description.Configuration));
+                var port = b.Port;
+                if (b.Port is object && isDockerRunInfo)
+                {
+                    port = b.ContainerPort ?? b.Port.Value;
                 }
-            }
 
-            return bindings;
+                bindings.Add(new EffectiveBinding(
+                    service.Description.Name,
+                    b.Name,
+                    protocol,
+                    host,
+                    port,
+                    b.ConnectionString,
+                    service.Description.Configuration));
+            }
         }
     }
 }
diff --git a/test/E2ETest/ApplicationTests.cs b/test/E2ETest/ApplicationTests.cs
@@ -31,10 +31,11 @@ public async Task EnvironmentVariablesOnlySetForDirectDependencies()
             var dictionary = new Dictionary<string, string>();
             app.PopulateEnvironment(app.Services["results"], (s1, s2) => dictionary[s1] = s2);
 
-            // Just the WORKER is defined.
-            Assert.Equal(8, dictionary.Count);
+            // Just the worker and results are defined.
+            Assert.Equal(16, dictionary.Count);
 
             Assert.Equal("http", dictionary["SERVICE__WORKER__PROTOCOL"]);
+            Assert.Equal("http", dictionary["SERVICE__RESULTS__PROTOCOL"]);
             // No POSTGRES or REDIS
             Assert.False(dictionary.ContainsKey("SERVICE__POSTGRES__PROTOCOL"));
             Assert.False(dictionary.ContainsKey("SERVICE__REDIS__PROTOCOL"));
diff --git a/test/E2ETest/testassets/generate/apps-with-ingress.yaml b/test/E2ETest/testassets/generate/apps-with-ingress.yaml
@@ -25,6 +25,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__APPA__PROTOCOL
+          value: 'http'
+        - name: SERVICE__APPA__PORT
+          value: '80'
+        - name: SERVICE__APPA__HOST
+          value: 'appa'
         - name: SERVICE__APPB__PROTOCOL
           value: 'http'
         - name: SERVICE__APPB__PORT
@@ -80,6 +86,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__APPB__PROTOCOL
+          value: 'http'
+        - name: SERVICE__APPB__PORT
+          value: '80'
+        - name: SERVICE__APPB__HOST
+          value: 'appb'
         - name: SERVICE__APPA__PROTOCOL
           value: 'http'
         - name: SERVICE__APPA__PORT
@@ -143,4 +155,4 @@ spec:
           serviceName: appb
           servicePort: 80
         path: /()(.*)
-...
+...
diff --git a/test/E2ETest/testassets/generate/dapr.yaml b/test/E2ETest/testassets/generate/dapr.yaml
@@ -1,4 +1,4 @@
-﻿kind: Deployment
+kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: dapr-test-project
@@ -37,6 +37,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__DAPR-TEST-PROJECT__PROTOCOL
+          value: 'http'
+        - name: SERVICE__DAPR-TEST-PROJECT__PORT
+          value: '80'
+        - name: SERVICE__DAPR-TEST-PROJECT__HOST
+          value: 'dapr-test-project'
         ports:
         - containerPort: 80
 ...
diff --git a/test/E2ETest/testassets/generate/dockerfile.yaml b/test/E2ETest/testassets/generate/dockerfile.yaml
@@ -1,4 +1,4 @@
-﻿kind: Deployment
+kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: backend
@@ -25,6 +25,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__BACKEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__BACKEND__PORT
+          value: '80'
+        - name: SERVICE__BACKEND__HOST
+          value: 'backend'
         - name: SERVICE__FRONTEND__PROTOCOL
           value: 'http'
         - name: SERVICE__FRONTEND__PORT
@@ -80,6 +86,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__FRONTEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__FRONTEND__PORT
+          value: '80'
+        - name: SERVICE__FRONTEND__HOST
+          value: 'frontend'
         - name: SERVICE__BACKEND__PROTOCOL
           value: 'http'
         - name: SERVICE__BACKEND__PORT
diff --git a/test/E2ETest/testassets/generate/frontend-backend.yaml b/test/E2ETest/testassets/generate/frontend-backend.yaml
@@ -1,4 +1,4 @@
-﻿kind: Deployment
+kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: backend
@@ -25,6 +25,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__BACKEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__BACKEND__PORT
+          value: '80'
+        - name: SERVICE__BACKEND__HOST
+          value: 'backend'
         - name: SERVICE__FRONTEND__PROTOCOL
           value: 'http'
         - name: SERVICE__FRONTEND__PORT
@@ -80,6 +86,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__FRONTEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__FRONTEND__PORT
+          value: '80'
+        - name: SERVICE__FRONTEND__HOST
+          value: 'frontend'
         - name: SERVICE__BACKEND__PROTOCOL
           value: 'http'
         - name: SERVICE__BACKEND__PORT
diff --git a/test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml b/test/E2ETest/testassets/generate/generate-connectionstring-dependency.yaml
@@ -25,6 +25,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__FRONTEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__FRONTEND__PORT
+          value: '80'
+        - name: SERVICE__FRONTEND__HOST
+          value: 'frontend'
         - name: CONNECTIONSTRINGS__DEPENDENCY
           valueFrom:
             secretKeyRef:
diff --git a/test/E2ETest/testassets/generate/generate-named-binding.yaml b/test/E2ETest/testassets/generate/generate-named-binding.yaml
@@ -25,6 +25,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__FRONTEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__FRONTEND__PORT
+          value: '80'
+        - name: SERVICE__FRONTEND__HOST
+          value: 'frontend'
         - name: SERVICE__DEPENDENCY__MYBINDING__PROTOCOL
           valueFrom:
             secretKeyRef:
diff --git a/test/E2ETest/testassets/generate/generate-uri-dependency.yaml b/test/E2ETest/testassets/generate/generate-uri-dependency.yaml
@@ -25,6 +25,12 @@ spec:
           value: 'http://*'
         - name: PORT
           value: '80'
+        - name: SERVICE__FRONTEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__FRONTEND__PORT
+          value: '80'
+        - name: SERVICE__FRONTEND__HOST
+          value: 'frontend'
         - name: SERVICE__DEPENDENCY__PROTOCOL
           valueFrom:
             secretKeyRef:
diff --git a/test/E2ETest/testassets/generate/health-checks.yaml b/test/E2ETest/testassets/generate/health-checks.yaml
@@ -17,44 +17,50 @@ spec:
         app.kubernetes.io/part-of: 'health-checks'
     spec:
       containers:
-        - name: health-all
-          image: health-all:1.0.0
-          imagePullPolicy: Always
-          env:
-            - name: ASPNETCORE_URLS
-              value: 'http://*:8004'
-            - name: PORT
-              value: '8004'
-          ports:
-            - containerPort: 8004
-          livenessProbe:
-            httpGet:
-              path: /healthy
-              port: 8004
-              scheme: HTTP
-              httpHeaders:
-                - name: name1
-                  value: value1
-                - name: name2
-                  value: value2
-            initialDelaySeconds: 5
-            periodSeconds: 1
-            successThreshold: 1
-            failureThreshold: 1
-          readinessProbe:
-            httpGet:
-              path: /ready
-              port: 8004
-              scheme: HTTP
-              httpHeaders:
-                - name: name3
-                  value: value3
-                - name: name4
-                  value: value4
-            initialDelaySeconds: 5
-            periodSeconds: 1
-            successThreshold: 1
-            failureThreshold: 1
+      - name: health-all
+        image: health-all:1.0.0
+        imagePullPolicy: Always
+        env:
+        - name: ASPNETCORE_URLS
+          value: 'http://*:8004'
+        - name: PORT
+          value: '8004'
+        - name: SERVICE__HEALTH-ALL__PROTOCOL
+          value: 'http'
+        - name: SERVICE__HEALTH-ALL__PORT
+          value: '8004'
+        - name: SERVICE__HEALTH-ALL__HOST
+          value: 'health-all'
+        ports:
+        - containerPort: 8004
+        livenessProbe:
+          httpGet:
+            path: /healthy
+            port: 8004
+            scheme: HTTP
+            httpHeaders:
+            - name: name1
+              value: value1
+            - name: name2
+              value: value2
+          initialDelaySeconds: 5
+          periodSeconds: 1
+          successThreshold: 1
+          failureThreshold: 1
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8004
+            scheme: HTTP
+            httpHeaders:
+            - name: name3
+              value: value3
+            - name: name4
+              value: value4
+          initialDelaySeconds: 5
+          periodSeconds: 1
+          successThreshold: 1
+          failureThreshold: 1
 ...
 ---
 kind: Service
@@ -69,8 +75,8 @@ spec:
     app.kubernetes.io/name: health-all
   type: ClusterIP
   ports:
-    - name: http
-      protocol: TCP
-      port: 8004
-      targetPort: 8004
+  - name: http
+    protocol: TCP
+    port: 8004
+    targetPort: 8004
 ...
diff --git a/test/E2ETest/testassets/generate/multi-project.yaml b/test/E2ETest/testassets/generate/multi-project.yaml
@@ -1,4 +1,4 @@
-﻿kind: Deployment
+kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: backend
@@ -25,6 +25,12 @@ spec:
           value: 'http://*:7000'
         - name: PORT
           value: '7000'
+        - name: SERVICE__BACKEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__BACKEND__PORT
+          value: '7000'
+        - name: SERVICE__BACKEND__HOST
+          value: 'backend'
         - name: SERVICE__FRONTEND__PROTOCOL
           value: 'http'
         - name: SERVICE__FRONTEND__PORT
@@ -95,6 +101,12 @@ spec:
           value: 'http://*:8000'
         - name: PORT
           value: '8000'
+        - name: SERVICE__FRONTEND__PROTOCOL
+          value: 'http'
+        - name: SERVICE__FRONTEND__PORT
+          value: '8000'
+        - name: SERVICE__FRONTEND__HOST
+          value: 'frontend'
         - name: SERVICE__BACKEND__PROTOCOL
           value: 'http'
         - name: SERVICE__BACKEND__PORT
diff --git a/test/E2ETest/testassets/generate/multirepo.yaml b/test/E2ETest/testassets/generate/multirepo.yaml
diff --git a/test/E2ETest/testassets/generate/single-project-noregistry.yaml b/test/E2ETest/testassets/generate/single-project-noregistry.yaml
diff --git a/test/E2ETest/testassets/generate/single-project.yaml b/test/E2ETest/testassets/generate/single-project.yaml

Original file line number	Diff line number	Diff line change
`@@ -46,15 +46,18 @@ public override Task ExecuteAsync(OutputContext output, ApplicationBuilder appli`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ var services = new List<string>() { service.Name };`
	`50`	`+ services.AddRange(service.Dependencies);`
	`51`	`+`
`49`	`52`	`// Process bindings and turn them into environment variables and secrets. There's`
`50`	`53`	`// some duplication with the code in m8s (Application.cs) for populating environments.`
`51`	`54`	`//`
`52`	`55`	`// service.Service.Bindings is the bindings OUT - this step computes bindings IN.`
`53`		`- service.Outputs.Add(ComputeBindings(application, service.Dependencies));`
	`56`	`+ service.Outputs.Add(ComputeBindings(application, services));`
`54`	`57`
`55`	`58`	`foreach (var sidecar in project.Sidecars)`
`56`	`59`	`{`
`57`		`- sidecar.Outputs.Add(ComputeBindings(application, sidecar.Dependencies));`
	`60`	`+ sidecar.Outputs.Add(ComputeBindings(application, services));`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`return Task.CompletedTask;`