From 3db63367ef110e7f4a245cde61471e232e86339c Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Mon, 12 Feb 2024 21:16:48 -0800 Subject: fix: fix up tests and linting --- internal/admin/service_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'internal/admin/service_test.go') diff --git a/internal/admin/service_test.go b/internal/admin/service_test.go index fdd3aa6..e13d28c 100644 --- a/internal/admin/service_test.go +++ b/internal/admin/service_test.go @@ -10,7 +10,7 @@ import ( ) var ( - updatedServerConfig []byte = []byte(` + updatedServerConfig = []byte(` --- name: "go-git-server" version: "v1alpha1" @@ -42,7 +42,6 @@ repos: ) func copyFile(t *testing.T, srcFilePath, destPath string) { - srcFile, err := os.Open(srcFilePath) if err != nil { t.Fatalf("Error opening base config %s", err) @@ -87,10 +86,11 @@ func TestInitServer(t *testing.T) { t.Run("test reload config success", func(t *testing.T) { svc := NewService(destModelFile, destPolicyFile, - "gitserver.yaml", + filepath.Join(tempRepoDir, "gitserver.yaml"), tempRepoDir, false) - err := os.WriteFile(destConfigFile, updatedServerConfig, 0755) + //nolint:gosec + err := os.WriteFile(destConfigFile, updatedServerConfig, 0500) if err != nil { t.Fatal(err) } @@ -104,16 +104,17 @@ func TestInitServer(t *testing.T) { if !strings.Contains(string(data), "thisismynewrepo") { t.Fatal("expected to find test new repo but didn't") } - }) t.Run("test reload config err", func(t *testing.T) { svc := NewService(destModelFile, destPolicyFile, - "gitserver.yaml", + // TODO set abs path + filepath.Join(tempRepoDir, "gitserver.yaml"), tempRepoDir, false) notAGoodConfig := []byte("this is not valid yaml") - err := os.WriteFile(destConfigFile, notAGoodConfig, 0755) + //nolint:gosec + err := os.WriteFile(destConfigFile, notAGoodConfig, 0500) if err != nil { t.Fatal(err) } @@ -127,6 +128,5 @@ func TestInitServer(t *testing.T) { if !strings.Contains(string(data), "mgmt") { log.Fatal("expected to mgmt repo but didn't in policy") } - }) } -- cgit v1.2.3