fix(e2e): update tests to use new manifest file path and route (#665)

Author: efekarakus

e2e/init/front-end/Dockerfile

@@ -1,3 +1,6 @@
 FROM nginx
 
-COPY index.html /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
+
+RUN mkdir -p /www/data/front-end
+COPY index.html /www/data/front-end

e2e/init/front-end/nginx.conf

@@ -0,0 +1,17 @@
+events {
+  worker_connections 768;
+}
+
+http {
+  server {
+    root /www/data;
+    listen 80;
+
+    location / {
+        return 200 'healthcheck okay!';
+    }
+
+    location /front-end/ {
+    }
+  }
+}

e2e/init/init_suite_test.go

@@ -31,7 +31,7 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	_, err := cli.AppDelete("api")
+	_, err := cli.AppDelete("front-end")
 	Expect(err).NotTo(HaveOccurred())
 
 	_, err = cli.EnvDelete("test", "default")

e2e/init/init_test.go

@@ -17,7 +17,7 @@ var _ = Describe("init flow", func() {
 	)
 
 	BeforeAll(func() {
-		appName = "api"
+		appName = "front-end"
 		_, initErr = cli.Init(&client.InitRequest{
 			ProjectName: projectName,
 			AppName:     appName,
@@ -81,8 +81,8 @@ var _ = Describe("init flow", func() {
 		It("should return a valid route", func() {
 			Expect(len(app.Routes)).To(Equal(1))
 			Expect(app.Routes[0].Environment).To(Equal("test"))
-			Expect(app.Routes[0].Path).To(Equal("*"))
-			resp, fetchErr := http.Get(fmt.Sprintf("http://%s", app.Routes[0].URL))
+			Expect(app.Routes[0].Path).To(Equal(appName))
+			resp, fetchErr := http.Get(fmt.Sprintf("http://%s/%s/", app.Routes[0].URL, app.Routes[0].Path))
 			Expect(fetchErr).NotTo(HaveOccurred())
 			Expect(resp.StatusCode).To(Equal(200))
 		})

e2e/internal/client/cli.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/onsi/ginkgo"
@@ -69,7 +70,11 @@ type AppDeployInput struct {
 
 // NewCLI returns a wrapper around CLI
 func NewCLI() (*CLI, error) {
-	cliPath := "/bin/ecs-preview"
+	wd, err := os.Getwd()
+	if err != nil {
+		return nil, fmt.Errorf("get wd: %w", err)
+	}
+	cliPath := filepath.Join(wd, "..", "..", "bin", "local", "ecs-preview")
 	if _, err := os.Stat(cliPath); err != nil {
 		return nil, err
 	}

e2e/multi-app-project/back-end/Dockerfile

@@ -1,3 +1,6 @@
 FROM nginx
 
-COPY index.html /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
+
+RUN mkdir -p /www/data/back-end
+COPY index.html /www/data/back-end

e2e/multi-app-project/back-end/nginx.conf

@@ -0,0 +1,17 @@
+events {
+  worker_connections 768;
+}
+
+http {
+  server {
+    root /www/data;
+    listen 80;
+
+    location / {
+        return 200 'healthcheck okay!';
+    }
+
+    location /back-end/ {
+    }
+  }
+}

e2e/multi-app-project/front-end/Dockerfile

@@ -1,3 +1,6 @@
 FROM nginx
 
-COPY index.html /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
+
+RUN mkdir -p /www/data/front-end
+COPY index.html /www/data/front-end

e2e/multi-app-project/front-end/nginx.conf

@@ -0,0 +1,17 @@
+events {
+  worker_connections 768;
+}
+
+http {
+  server {
+    root /www/data;
+    listen 80;
+
+    location / {
+        return 200 'healthcheck okay!';
+    }
+
+    location /front-end/ {
+    }
+  }
+}

e2e/multi-app-project/multi_app_project_test.go

@@ -88,8 +88,8 @@ var _ = Describe("Multiple App Project", func() {
 		})
 
 		It("app init should create app manifests", func() {
-			Expect("./ecs-project/front-end-app.yml").Should(BeAnExistingFile())
-			Expect("./ecs-project/back-end-app.yml").Should(BeAnExistingFile())
+			Expect("./ecs-project/front-end/manifest.yml").Should(BeAnExistingFile())
+			Expect("./ecs-project/back-end/manifest.yml").Should(BeAnExistingFile())
 
 		})
 
@@ -150,8 +150,8 @@ var _ = Describe("Multiple App Project", func() {
 				// Call each environment's endpoint and ensure it returns a 200
 				route := app.Routes[0]
 				Expect(route.Environment).To(Equal("test"))
-				Expect(route.Path).To(Equal("*"))
-				resp, fetchErr := http.Get(fmt.Sprintf("http://%s", route.URL))
+				Expect(route.Path).To(Equal(appName))
+				resp, fetchErr := http.Get(fmt.Sprintf("http://%s/%s/", route.URL, route.Path))
 				Expect(fetchErr).NotTo(HaveOccurred())
 				Expect(resp.StatusCode).To(Equal(200))
 

e2e/multi-env-project/front-end/Dockerfile

@@ -1,3 +1,6 @@
 FROM nginx
 
-COPY index.html /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
+
+RUN mkdir -p /www/data/front-end
+COPY index.html /www/data/front-end

e2e/multi-env-project/front-end/nginx.conf

@@ -0,0 +1,17 @@
+events {
+  worker_connections 768;
+}
+
+http {
+  server {
+    root /www/data;
+    listen 80;
+
+    location / {
+        return 200 'healthcheck okay!';
+    }
+
+    location /front-end/ {
+    }
+  }
+}

e2e/multi-env-project/multi_env_test.go

@@ -103,7 +103,7 @@ var _ = Describe("Multiple Env Project", func() {
 			_, frontEndInitErr = cli.AppInit(&client.AppInitRequest{
 				AppName:    "front-end",
 				AppType:    "Load Balanced Web App",
-				Dockerfile: "./front-end/Dockerfile", //TODO FIX MEH
+				Dockerfile: "./front-end/Dockerfile",
 			})
 		})
 
@@ -112,7 +112,7 @@ var _ = Describe("Multiple Env Project", func() {
 		})
 
 		It("app init should create an app manifest", func() {
-			Expect("./ecs-project/front-end-app.yml").Should(BeAnExistingFile())
+			Expect("./ecs-project/front-end/manifest.yml").Should(BeAnExistingFile())
 		})
 
 		It("app ls should list the app", func() {
@@ -170,8 +170,8 @@ var _ = Describe("Multiple Env Project", func() {
 			for _, env := range []string{"test", "prod"} {
 				route := envRoutes[env]
 				Expect(route.Environment).To(Equal(env))
-				Expect(route.Path).To(Equal("*"))
-				resp, fetchErr := http.Get(fmt.Sprintf("http://%s", route.URL))
+				Expect(route.Path).To(Equal(appName))
+				resp, fetchErr := http.Get(fmt.Sprintf("http://%s/%s/", route.URL, route.Path))
 				Expect(fetchErr).NotTo(HaveOccurred())
 				Expect(resp.StatusCode).To(Equal(200))
 			}