Revert "fix: properly resolve symlink paths (#86)"

This reverts commit beb88b3.
enix · May 17, 2023 · ce8187e · ce8187e
1 parent d7bd30c
commit ce8187e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/internal/certificate.go b/internal/certificate.go
@@ -255,11 +255,7 @@ func readFile(file string) ([]byte, error) {
 		return nil, err
 	}
 
-	if !filepath.IsAbs(realPath) {
-		realPath = path.Join(path.Dir(file), realPath)
-	}
-
-	return os.ReadFile(filepath.Clean(realPath))
+	return os.ReadFile(path.Join(path.Dir(file), path.Base(realPath)))
 }
 
 func parsePEM(data []byte) ([]*x509.Certificate, error) {

diff --git a/internal/exporter_test.go b/internal/exporter_test.go
@@ -140,13 +140,13 @@ func TestFolder(t *testing.T) {
 		Directories: []string{path.Join(filepath.Dir(filename), "../test")},
 	}, func(metrics []model.MetricFamily) {
 		foundMetrics := getMetricsForName(metrics, "x509_cert_expired")
-		assert.Len(t, foundMetrics, 4, "missing x509_cert_expired metric(s)")
+		assert.Len(t, foundMetrics, 5, "missing x509_cert_expired metric(s)")
 
 		foundNbMetrics := getMetricsForName(metrics, "x509_cert_not_before")
-		assert.Len(t, foundNbMetrics, 4, "missing x509_cert_not_before metric(s)")
+		assert.Len(t, foundNbMetrics, 5, "missing x509_cert_not_before metric(s)")
 
 		foundNaMetrics := getMetricsForName(metrics, "x509_cert_not_after")
-		assert.Len(t, foundNaMetrics, 4, "missing x509_cert_not_after metric(s)")
+		assert.Len(t, foundNaMetrics, 5, "missing x509_cert_not_after metric(s)")
 	})
 }