From 5112090173802080d52718fcba89ad694e0540a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Wed, 8 May 2024 11:29:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91go=E4=BB=A3=E7=A0=81clean=20co?= =?UTF-8?q?de?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hook/main_test.go | 7 ++++++- mindxcheckutils/mindxcheckutils_test.go | 10 ++++++++- runtime/main.go | 4 ++-- runtime/main_test.go | 28 +++++++++++++++++++------ 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/hook/main_test.go b/hook/main_test.go index 4211c28..8f52ca5 100644 --- a/hook/main_test.go +++ b/hook/main_test.go @@ -23,7 +23,8 @@ import ( ) const ( - pidSample = 123 + pidSample = 123 + fileMode0600 os.FileMode = 0600 ) func TestDoPrestartHookCase1(t *testing.T) { @@ -148,6 +149,10 @@ func TestParseOciSpecFileCase2(t *testing.T) { if err != nil { t.Log("create file failed") } + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) + } _, err = parseOciSpecFile(file) if err == nil { t.Fail() diff --git a/mindxcheckutils/mindxcheckutils_test.go b/mindxcheckutils/mindxcheckutils_test.go index 1d19a29..036a39b 100644 --- a/mindxcheckutils/mindxcheckutils_test.go +++ b/mindxcheckutils/mindxcheckutils_test.go @@ -21,6 +21,10 @@ import ( "testing" ) +const ( + fileMode0600 os.FileMode = 0600 +) + func TestNormalFileCheckRegularFile(t *testing.T) { tmpDir, filePath, err := createTestFile(t, "test_file.txt") defer removeTmpDir(t, tmpDir) @@ -155,10 +159,14 @@ func createTestFile(t *testing.T, fileName string) (string, string, error) { if os.MkdirAll(tmpDir+"/__test__", permission) != nil { t.Fatalf("MkdirAll failed %q", tmpDir+"/__test__") } - _, err := os.Create(tmpDir + "/__test__" + fileName) + f, err := os.Create(tmpDir + "/__test__" + fileName) if err != nil { t.Fatalf("create file failed %q: %s", tmpDir+"/__test__", err) } + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) + } return tmpDir + "/__test__", tmpDir + "/__test__" + fileName, err } diff --git a/runtime/main.go b/runtime/main.go index 9802adb..5ec3e76 100644 --- a/runtime/main.go +++ b/runtime/main.go @@ -403,8 +403,8 @@ func addDeviceToSpec(spec *specs.Spec, dPath string, deviceType string) error { device.Path = devicePath + davinciName + vDeviceNumber[0] case davinciManagerDocker: device.Path = devicePath + davinciManager - default: - // do nothing + default: // do nothing + } spec.Linux.Devices = append(spec.Linux.Devices, *device) diff --git a/runtime/main_test.go b/runtime/main_test.go index 64fb485..a396e9e 100644 --- a/runtime/main_test.go +++ b/runtime/main_test.go @@ -34,7 +34,10 @@ const ( // strKubeDNSPort53UDPPort represents the string of the environment variable KUBE_DNS_PORT_53_UDP_PORT strKubeDNSPort53UDPPort = "KUBE_DNS_PORT_53_UDP_PORT=53" // strKubeDNSPort53UDPProto represents the string of the environment variable KUBE_DNS_PORT_53_UDP_PROTO - strKubeDNSPort53UDPProto = "KUBE_DNS_PORT_53_UDP_PROTO=udp" + strKubeDNSPort53UDPProto = "KUBE_DNS_PORT_53_UDP_PROTO=udp" + fileMode0400 os.FileMode = 0400 + fileMode0600 os.FileMode = 0600 + fileMode0655 os.FileMode = 0655 ) func TestArgsIsCreate(t *testing.T) { @@ -88,11 +91,16 @@ func TestArgsIsCreateCase2(t *testing.T) { func TestArgsIsCreateCase3(t *testing.T) { t.Log("进入测试用例") - if err := os.Mkdir("./test", 0655); err != nil { + if err := os.Mkdir("./test", fileMode0655); err != nil { } f, err := os.Create("./test/config.json") defer f.Close() if err != nil { + t.Logf("create file error: %v", err) + } + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) } testArgs := []string{"create", "--bundle", "./test"} stub := gomonkey.ApplyGlobalVar(&os.Args, testArgs) @@ -110,11 +118,16 @@ func TestArgsIsCreateCase3(t *testing.T) { func TestArgsIsCreateCase4(t *testing.T) { t.Log("进入测试用例") - if err := os.Mkdir("./test", 0655); err != nil { + if err := os.Mkdir("./test", fileMode0655); err != nil { } f, err := os.Create("./test/config.json") defer f.Close() if err != nil { + t.Logf("create file failed, error: %v", err) + } + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file failed, error: %v", err) } testArgs := []string{"spec", "--bundle", "./test"} stub := gomonkey.ApplyGlobalVar(&os.Args, testArgs) @@ -136,8 +149,8 @@ func TestModifySpecFile(t *testing.T) { func TestModifySpecFileCase1(t *testing.T) { file := "./test" - if err := os.Mkdir("./test", 0400); err != nil { - + if err := os.Mkdir(file, fileMode0400); err != nil { + t.Logf("mkdir error: %v", err) } err := modifySpecFile(file) @@ -154,7 +167,10 @@ func TestModifySpecFileCase2(t *testing.T) { if err != nil { t.Log("create file error") } - + err = f.Chmod(fileMode0600) + if err != nil { + t.Logf("chmod file error: %v", err) + } if err := modifySpecFile(file); err != nil { t.Log("run modifySpecFile failed") } -- Gitee From 65b9779713342f4e719977c43438ce0986d869f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Thu, 9 May 2024 09:08:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91go=E4=BB=A3=E7=A0=81clean=20co?= =?UTF-8?q?de?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime/main_test.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/runtime/main_test.go b/runtime/main_test.go index a396e9e..fd4c108 100644 --- a/runtime/main_test.go +++ b/runtime/main_test.go @@ -38,6 +38,7 @@ const ( fileMode0400 os.FileMode = 0400 fileMode0600 os.FileMode = 0600 fileMode0655 os.FileMode = 0655 + needToMkdir = "./test" ) func TestArgsIsCreate(t *testing.T) { @@ -91,7 +92,8 @@ func TestArgsIsCreateCase2(t *testing.T) { func TestArgsIsCreateCase3(t *testing.T) { t.Log("进入测试用例") - if err := os.Mkdir("./test", fileMode0655); err != nil { + if err := os.Mkdir(needToMkdir, fileMode0655); err != nil { + t.Fatalf("failed to create file, error: %v", err) } f, err := os.Create("./test/config.json") defer f.Close() @@ -102,7 +104,7 @@ func TestArgsIsCreateCase3(t *testing.T) { if err != nil { t.Logf("chmod file error: %v", err) } - testArgs := []string{"create", "--bundle", "./test"} + testArgs := []string{"create", "--bundle", needToMkdir} stub := gomonkey.ApplyGlobalVar(&os.Args, testArgs) defer stub.Reset() @@ -118,7 +120,8 @@ func TestArgsIsCreateCase3(t *testing.T) { func TestArgsIsCreateCase4(t *testing.T) { t.Log("进入测试用例") - if err := os.Mkdir("./test", fileMode0655); err != nil { + if err := os.Mkdir(needToMkdir, fileMode0655); err != nil { + t.Fatalf("failed to create file, error: %v", err) } f, err := os.Create("./test/config.json") defer f.Close() @@ -129,7 +132,7 @@ func TestArgsIsCreateCase4(t *testing.T) { if err != nil { t.Logf("chmod file failed, error: %v", err) } - testArgs := []string{"spec", "--bundle", "./test"} + testArgs := []string{"spec", "--bundle", needToMkdir} stub := gomonkey.ApplyGlobalVar(&os.Args, testArgs) defer stub.Reset() @@ -148,14 +151,13 @@ func TestModifySpecFile(t *testing.T) { } func TestModifySpecFileCase1(t *testing.T) { - file := "./test" - if err := os.Mkdir(file, fileMode0400); err != nil { + if err := os.Mkdir(needToMkdir, fileMode0400); err != nil { t.Logf("mkdir error: %v", err) } - err := modifySpecFile(file) + err := modifySpecFile(needToMkdir) assert.NotNil(t, err) - if err := os.Remove(file); err != nil { + if err := os.Remove(needToMkdir); err != nil { } } -- Gitee From 59bdfe773399ee1ef7e9b632f3d3d49443752dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B8=A3=E6=B2=BC?= Date: Thu, 9 May 2024 09:24:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=20Modification=E3=80=91go=E4=BB=A3=E7=A0=81clean=20co?= =?UTF-8?q?de?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime/main_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/main_test.go b/runtime/main_test.go index fd4c108..ed4dfd9 100644 --- a/runtime/main_test.go +++ b/runtime/main_test.go @@ -158,7 +158,7 @@ func TestModifySpecFileCase1(t *testing.T) { err := modifySpecFile(needToMkdir) assert.NotNil(t, err) if err := os.Remove(needToMkdir); err != nil { - + t.Logf("failed to remove dir, error: %v", err) } } -- Gitee