Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(datasource-controller): replace flaky e2e test for secureJsonData with a unit test #1544

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions controllers/datasource_controller_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package controllers

import (
"context"
"encoding/json"
"testing"

"github.com/grafana/grafana-operator/v5/api/v1beta1"
"github.com/stretchr/testify/assert"
ctrl "sigs.k8s.io/controller-runtime"
)

func TestGetDatasourceContent(t *testing.T) {
reconciler := &GrafanaDatasourceReconciler{
Client: k8sClient,
Log: ctrl.Log.WithName("TestDatasourceReconciler"),
}

t.Run("secureJsonData is preserved", func(t *testing.T) {
secureJsonData := []byte(`{"httpHeaderValue1": "Bearer ${PROMETHEUS_TOKEN}"}`)
secureJsonDataRaw := (*json.RawMessage)(&secureJsonData)
// Here, we only check if contents of secureJsonData is preserved, not secrets replacement
want := "Bearer ${PROMETHEUS_TOKEN}"

cr := &v1beta1.GrafanaDatasource{
Spec: v1beta1.GrafanaDatasourceSpec{
Datasource: &v1beta1.GrafanaDatasourceInternal{
SecureJSONData: *secureJsonDataRaw,
},
},
}

content, hash, err := reconciler.getDatasourceContent(context.TODO(), cr)
got := content.SecureJSONData["httpHeaderValue1"]

assert.Nil(t, err)
assert.NotEmpty(t, hash)
assert.Equal(t, want, got)
})
}
34 changes: 0 additions & 34 deletions tests/e2e/examples/secureJsonDatasource/00-assertions.yaml

This file was deleted.

103 changes: 0 additions & 103 deletions tests/e2e/examples/secureJsonDatasource/00-resources.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions tests/e2e/examples/secureJsonDatasource/01-assertions.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions tests/e2e/examples/secureJsonDatasource/01-resources.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions tests/e2e/examples/secureJsonDatasource/README.md

This file was deleted.

59 changes: 0 additions & 59 deletions tests/e2e/examples/secureJsonDatasource/chainsaw-test.yaml

This file was deleted.