wip 2

.github/workflows/go-ci.yml

@@ -9,28 +9,34 @@ permissions:
   contents: read
 
 jobs:
-  lint:
-    name: Lint Code
+  lint-and-test:
+    name: Lint And Test Code
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
     - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
       with:
         go-version-file: go.mod
         cache: false
-    - name: Run GolangCI Linter
+    - name: Run GolangCI linter
       uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3
       with:
         version: v1.54
+    - name: Run Go test coverage
+      run: go test -race -coverprofile=coverage.out -covermode=atomic ./...
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   build:
     name: Build Artifacts
+    needs: ["lint-and-test"]
     permissions:
       id-token: write
       contents: write
       packages: write
       pull-requests: write
-    needs: ["lint"]
     uses: ./.github/workflows/tpl-packaging.yml
     secrets: inherit
     with:

pkg/merger/fn.go

@@ -26,7 +26,7 @@ func (m *Merger) Schema() (*spec.Schema, error) {
 func (m *Merger) Default() error {
 	for index := range m.Spec.Resources {
 		//
-		m.Spec.Resources[index].setInputFilesRoot()
+		m.Spec.Resources[index].Input.Files.setRoot()
 		// Defaults merge strategy.
 		m.Spec.Resources[index].Merge.setStrategy()
 		// Create empty map for staged data.

pkg/merger/merge.go

@@ -27,9 +27,9 @@ func (rm *resourceMerge) setStrategy() {
 	}
 }
 
-func (r *mergerResource) setInputFilesRoot() {
-	if r.Input.Files.Root != "" {
-		r.Input.Files.Root = strings.TrimSuffix(r.Input.Files.Root, "/") + "/"
+func (rif *resourceInputFiles) setRoot() {
+	if rif.Root != "" {
+		rif.Root = strings.TrimSuffix(rif.Root, "/") + "/"
 	}
 }
 

pkg/merger/merge_test.go

@@ -43,3 +43,35 @@ func TestSetMergeStrategy(t *testing.T) {
 			"Expected config to be %v, but got %v", tt.expected, tt.actual.config)
 	}
 }
+
+func TestSetRoot(t *testing.T) {
+	tests := []struct {
+		actual   resourceInputFiles
+		expected string
+	}{
+		{
+			actual: resourceInputFiles{
+				Root: "/mnt",
+			},
+			expected: "/mnt/",
+		},
+		{
+			actual: resourceInputFiles{
+				Root: "/mnt/",
+			},
+			expected: "/mnt/",
+		},
+		{
+			actual: resourceInputFiles{
+				Root: "my-dir",
+			},
+			expected: "my-dir/",
+		},
+	}
+
+	for _, tt := range tests {
+		tt.actual.setRoot()
+		assert.Equal(t, tt.expected, tt.actual.Root,
+			"Expected root to be %v, but got %v", tt.expected, tt.actual)
+	}
+}