From a13d2e61e5c4172d097e1fe31439d02bbefa2e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Ramon=20Ma=C3=B1es?= Date: Thu, 23 May 2024 09:43:18 +0200 Subject: [PATCH 1/5] fix(naming): update name in the instance test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jose Ramon Mañes --- e2e/basic/external_file_test.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/e2e/basic/external_file_test.go b/e2e/basic/external_file_test.go index feeb2e5..844563a 100644 --- a/e2e/basic/external_file_test.go +++ b/e2e/basic/external_file_test.go @@ -20,16 +20,16 @@ func TestExternalFile(t *testing.T) { t.Fatalf("Error creating executor: %v", err) } - web, err := knuu.NewInstance("web") + server, err := knuu.NewInstance("server") if err != nil { t.Fatalf("Error creating instance '%v':", err) } - err = web.SetImage("docker.io/nginx:latest") + err = server.SetImage("docker.io/nginx:latest") if err != nil { t.Fatalf("Error setting image '%v':", err) } - web.AddPortTCP(80) - _, err = web.ExecuteCommand("mkdir", "-p", "/usr/share/nginx/html") + server.AddPortTCP(80) + _, err = server.ExecuteCommand("mkdir", "-p", "/usr/share/nginx/html") if err != nil { t.Fatalf("Error executing command '%v':", err) } @@ -59,36 +59,36 @@ func TestExternalFile(t *testing.T) { t.Fatalf("Error syncing data to disk '%v':", err) } - err = web.AddFile("/tmp/index.html", "/usr/share/nginx/html/index.html", "0:0") + err = server.AddFile("/tmp/index.html", "/usr/share/nginx/html/index.html", "0:0") if err != nil { t.Fatalf("Error adding file '%v':", err) } - err = web.Commit() + err = server.Commit() if err != nil { t.Fatalf("Error committing instance: %v", err) } t.Cleanup(func() { - require.NoError(t, knuu.BatchDestroy(executor.Instance, web)) + require.NoError(t, knuu.BatchDestroy(executor.Instance, server)) }) // Test logic - webIP, err := web.GetIP() + serverIP, err := server.GetIP() if err != nil { t.Fatalf("Error getting IP '%v':", err) } - err = web.Start() + err = server.Start() if err != nil { t.Fatalf("Error starting instance: %v", err) } - err = web.WaitInstanceIsRunning() + err = server.WaitInstanceIsRunning() if err != nil { t.Fatalf("Error waiting for instance to be running: %v", err) } - wget, err := executor.ExecuteCommand("wget", "-q", "-O", "-", webIP) + wget, err := executor.ExecuteCommand("wget", "-q", "-O", "-", serverIP) if err != nil { t.Fatalf("Error executing command '%v':", err) } From 442f0510a6df44a71577ad560523da13c90f2a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Ramon=20Ma=C3=B1es?= Date: Thu, 23 May 2024 09:51:30 +0200 Subject: [PATCH 2/5] fix(naming): update name in the instance serverFile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jose Ramon Mañes --- e2e/basic/file_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/e2e/basic/file_test.go b/e2e/basic/file_test.go index e35f398..2534b4e 100644 --- a/e2e/basic/file_test.go +++ b/e2e/basic/file_test.go @@ -26,53 +26,53 @@ func TestFile(t *testing.T) { t.Fatalf("Error creating executor: %v", err) } - web, err := knuu.NewInstance("web") + serverFile, err := knuu.NewInstance("serverFile") if err != nil { t.Fatalf("Error creating instance '%v':", err) } - err = web.SetImage("docker.io/nginx:latest") + err = serverFile.SetImage("docker.io/nginx:latest") if err != nil { t.Fatalf("Error setting image '%v':", err) } - web.AddPortTCP(80) - _, err = web.ExecuteCommand("mkdir", "-p", "/usr/share/nginx/html") + serverFile.AddPortTCP(80) + _, err = serverFile.ExecuteCommand("mkdir", "-p", "/usr/share/nginx/html") if err != nil { t.Fatalf("Error executing command '%v':", err) } - err = web.AddFile("resources/html/index.html", "/usr/share/nginx/html/index.html", "0:0") + err = serverFile.AddFile("resources/html/index.html", "/usr/share/nginx/html/index.html", "0:0") if err != nil { t.Fatalf("Error adding file '%v':", err) } - err = web.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0) + err = serverFile.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0) if err != nil { t.Fatalf("Error adding volume: %v", err) } - err = web.Commit() + err = serverFile.Commit() if err != nil { t.Fatalf("Error committing instance: %v", err) } t.Cleanup(func() { - require.NoError(t, knuu.BatchDestroy(executor.Instance, web)) + require.NoError(t, knuu.BatchDestroy(executor.Instance, serverFile)) }) // Test logic - webIP, err := web.GetIP() + serverFileIP, err := serverFile.GetIP() if err != nil { t.Fatalf("Error getting IP '%v':", err) } - err = web.Start() + err = serverFile.Start() if err != nil { t.Fatalf("Error starting instance: %v", err) } - err = web.WaitInstanceIsRunning() + err = serverFile.WaitInstanceIsRunning() if err != nil { t.Fatalf("Error waiting for instance to be running: %v", err) } - wget, err := executor.ExecuteCommand("wget", "-q", "-O", "-", webIP) + wget, err := executor.ExecuteCommand("wget", "-q", "-O", "-", serverFileIP) if err != nil { t.Fatalf("Error executing command '%v':", err) } From 211f1bd9004569ec97046444097c00403a9d6fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Ramon=20Ma=C3=B1es?= Date: Thu, 23 May 2024 09:57:31 +0200 Subject: [PATCH 3/5] fix(naming): update name in the instance serverFile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jose Ramon Mañes --- e2e/basic/file_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/e2e/basic/file_test.go b/e2e/basic/file_test.go index 2534b4e..e54c6aa 100644 --- a/e2e/basic/file_test.go +++ b/e2e/basic/file_test.go @@ -26,53 +26,53 @@ func TestFile(t *testing.T) { t.Fatalf("Error creating executor: %v", err) } - serverFile, err := knuu.NewInstance("serverFile") + serverfile, err := knuu.NewInstance("serverfile") if err != nil { t.Fatalf("Error creating instance '%v':", err) } - err = serverFile.SetImage("docker.io/nginx:latest") + err = serverfile.SetImage("docker.io/nginx:latest") if err != nil { t.Fatalf("Error setting image '%v':", err) } - serverFile.AddPortTCP(80) - _, err = serverFile.ExecuteCommand("mkdir", "-p", "/usr/share/nginx/html") + serverfile.AddPortTCP(80) + _, err = serverfile.ExecuteCommand("mkdir", "-p", "/usr/share/nginx/html") if err != nil { t.Fatalf("Error executing command '%v':", err) } - err = serverFile.AddFile("resources/html/index.html", "/usr/share/nginx/html/index.html", "0:0") + err = serverfile.AddFile("resources/html/index.html", "/usr/share/nginx/html/index.html", "0:0") if err != nil { t.Fatalf("Error adding file '%v':", err) } - err = serverFile.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0) + err = serverfile.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0) if err != nil { t.Fatalf("Error adding volume: %v", err) } - err = serverFile.Commit() + err = serverfile.Commit() if err != nil { t.Fatalf("Error committing instance: %v", err) } t.Cleanup(func() { - require.NoError(t, knuu.BatchDestroy(executor.Instance, serverFile)) + require.NoError(t, knuu.BatchDestroy(executor.Instance, serverfile)) }) // Test logic - serverFileIP, err := serverFile.GetIP() + serverfileIP, err := serverfile.GetIP() if err != nil { t.Fatalf("Error getting IP '%v':", err) } - err = serverFile.Start() + err = serverfile.Start() if err != nil { t.Fatalf("Error starting instance: %v", err) } - err = serverFile.WaitInstanceIsRunning() + err = serverfile.WaitInstanceIsRunning() if err != nil { t.Fatalf("Error waiting for instance to be running: %v", err) } - wget, err := executor.ExecuteCommand("wget", "-q", "-O", "-", serverFileIP) + wget, err := executor.ExecuteCommand("wget", "-q", "-O", "-", serverfileIP) if err != nil { t.Fatalf("Error executing command '%v':", err) } From 8a3f627c50eb24a1b3fc4d33cda59bac38ee4c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Ramon=20Ma=C3=B1es?= Date: Thu, 23 May 2024 10:27:01 +0200 Subject: [PATCH 4/5] fix(naming): update name in the instance serverFile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jose Ramon Mañes --- e2e/basic/build_from_git_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/e2e/basic/build_from_git_test.go b/e2e/basic/build_from_git_test.go index 753b90b..bf3f7a2 100644 --- a/e2e/basic/build_from_git_test.go +++ b/e2e/basic/build_from_git_test.go @@ -52,7 +52,6 @@ func TestBuildFromGit(t *testing.T) { }) // Test logic - require.NoError(t, instance.Start(), "Error starting instance") data, err := instance.GetFileBytes("/home/hello.txt") From 7e65e3d3a56b47037f2360c36b5d840801143b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Ramon=20Ma=C3=B1es?= Date: Thu, 23 May 2024 10:34:23 +0200 Subject: [PATCH 5/5] fix(naming): update name in the instance serverFile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jose Ramon Mañes --- e2e/basic/files_to_volumes_cm_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/e2e/basic/files_to_volumes_cm_test.go b/e2e/basic/files_to_volumes_cm_test.go index 61924e5..77eb384 100644 --- a/e2e/basic/files_to_volumes_cm_test.go +++ b/e2e/basic/files_to_volumes_cm_test.go @@ -173,6 +173,10 @@ func TestNoVolumesOneFile(t *testing.T) { if err != nil { t.Fatalf("Error executing command for '%v': %v", instanceName, err) } + err = instance.AddVolumeWithOwner("/usr/share/nginx/html", "1Gi", 0) + if err != nil { + t.Fatalf("Error adding volume: %v", err) + } err = instance.Commit() if err != nil { t.Fatalf("Error committing instance '%v': %v", instanceName, err)