fix: use kube namespace instead of full path

enix · Feb 17, 2021 · be144ad · be144ad
1 parent 381f3dc
commit be144ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/collector.go b/internal/collector.go
@@ -79,7 +79,7 @@ func (collector *collector) getMetricsForCertificate(certData *parsedCertificate
  trimmedFilePath = path.Join(prefix, path.Join(pathComponents[trimComponentsCount:]...))
  baseLabels = append(baseLabels, "filename", "filepath")
  } else {
- trimmedFilePath = ref.path
+ trimmedFilePath = strings.Split(ref.path, "/")[1]
  baseLabels = append(baseLabels, "secret_name", "secret_namespace")
  }
 

diff --git a/internal/exporter_test.go b/internal/exporter_test.go
@@ -451,16 +451,18 @@ func testSinglePEM(t *testing.T, expired float64, notBefore time.Time) {
 func checkLabels(t *testing.T, labels []*model.LabelPair, path string, isKube bool) {
  assert.Len(t, labels, 15, "Missing labels")
 
+ pathOrNamespace := path
  baseLabels := []string{"serial_number", "filepath", "filename"}
  if isKube {
  baseLabels = []string{"serial_number", "secret_namespace", "secret_name"}
+ pathOrNamespace = strings.Split(path, "/")[1]
  }
 
  for _, label := range labels {
  if label.GetName() == baseLabels[2] {
  assert.Equal(t, filepath.Base(path), label.GetValue(), "Invalid label value for %s", label.GetName())
  } else if label.GetName() == baseLabels[1] {
- assert.Equal(t, path, label.GetValue(), "Invalid label value for %s", label.GetName())
+ assert.Equal(t, pathOrNamespace, label.GetValue(), "Invalid label value for %s", label.GetName())
  } else if label.GetName() == baseLabels[0] {
  assert.Equal(t, "1", label.GetValue(), "Invalid label value for %s", label.GetName())
  } else {