Skip to content

chore: fix pre-existing gofmt drift across chart test suites and scripts #6311

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.

Sign up for GitHub

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

Open
eamonnmoloney wants to merge 1 commit into from
+685 −705
Open

chore: fix pre-existing gofmt drift across chart test suites and scripts #6311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion charts/camunda-platform-8.10/test/unit/common/constraints_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@ func (s *ConstraintTemplateTest) TestLegacyJksTruststoreFieldsRenderWithoutCrash
testhelpers.RunTestCasesE(s.T(), s.chartPath, s.release, s.namespace, s.templates, testCases)
}


func (s *ConstraintTemplateTest) TestGatewayConstraints() {
testCases := []testhelpers.TestCase{
{
Expand Down
80 changes: 40 additions & 40 deletions charts/camunda-platform-8.10/test/unit/console/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
{
Name: "TestContainerSetPodLabels",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.podLabels.foo": "bar",
},
Verifier: func(t *testing.T, output string, err error) {
Expand All @@ -70,8 +70,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestContainerSetPodAnnotations",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.podAnnotations.foo": "bar",
"camundaHub.console.podAnnotations.foz": "baz",
},
Expand Down Expand Up @@ -111,9 +111,9 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestContainerSetImageNameSubChart",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"global.image.registry": "global.custom.registry.io",
"identity.enabled": "true",
"console.enabled": "true",
"global.image.registry": "global.custom.registry.io",
"camundaHub.console.image.registry": "subchart.custom.registry.io",
"camundaHub.console.image.repository": "camunda/console-test",
"camundaHub.console.image.tag": "snapshot",
Expand Down Expand Up @@ -143,9 +143,9 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestContainerSetImagePullSecretsSubChart",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"global.image.pullSecrets[0].name": "SecretName",
"identity.enabled": "true",
"console.enabled": "true",
"global.image.pullSecrets[0].name": "SecretName",
"camundaHub.console.image.pullSecrets[0].name": "SecretNameSubChart",
},
Verifier: func(t *testing.T, output string, err error) {
Expand All @@ -158,8 +158,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestContainerOverwriteImageTag",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.image.tag": "a.b.c",
},
Verifier: func(t *testing.T, output string, err error) {
Expand All @@ -175,8 +175,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerOverwriteImageTagWithChartDirectSetting",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.image.tag": "a.b.c",
},
Verifier: func(t *testing.T, output string, err error) {
Expand All @@ -193,8 +193,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerSetContainerCommand",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.command[0]": "printenv",
},
Verifier: func(t *testing.T, output string, err error) {
Expand All @@ -211,8 +211,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerSetExtraVolumes",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.extraVolumes[0].name": "extraVolume",
"camundaHub.console.extraVolumes[0].configMap.name": "otherConfigMap",
"camundaHub.console.extraVolumes[0].configMap.defaultMode": "744",
Expand Down Expand Up @@ -249,8 +249,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerSetExtraVolumeMounts",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.extraVolumeMounts[0].name": "otherConfigMap",
"camundaHub.console.extraVolumeMounts[0].mountPath": "/usr/local/config",
},
Expand Down Expand Up @@ -286,8 +286,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerSetExtraVolumesAndMounts",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.extraVolumeMounts[0].name": "otherConfigMap",
"camundaHub.console.extraVolumeMounts[0].mountPath": "/usr/local/config",
"camundaHub.console.extraVolumes[0].name": "extraVolume",
Expand Down Expand Up @@ -337,8 +337,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerSetServiceAccountName",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.serviceAccount.name": "accName",
},
Verifier: func(t *testing.T, output string, err error) {
Expand All @@ -352,8 +352,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestPodSetSecurityContext",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.podSecurityContext.runAsUser": "1000",
},
Verifier: func(t *testing.T, output string, err error) {
Expand Down Expand Up @@ -383,8 +383,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
// https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
Name: "TestContainerSetNodeSelector",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.nodeSelector.disktype": "ssd",
"camundaHub.console.nodeSelector.cputype": "arm",
},
Expand Down Expand Up @@ -463,8 +463,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
// effect: "NoSchedule"
Name: "TestContainerSetTolerations",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.tolerations[0].key": "key1",
"camundaHub.console.tolerations[0].operator": "Equal",
"camundaHub.console.tolerations[0].value": "Value1",
Expand Down Expand Up @@ -507,8 +507,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerStartupProbe",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.startupProbe.enabled": "true",
"camundaHub.console.startupProbe.probePath": "/healthz",
"camundaHub.console.startupProbe.initialDelaySeconds": "5",
Expand All @@ -535,8 +535,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerLivenessProbe",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.livenessProbe.enabled": "true",
"camundaHub.console.livenessProbe.probePath": "/healthz",
"camundaHub.console.livenessProbe.initialDelaySeconds": "5",
Expand All @@ -562,8 +562,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestContainerSetSidecar",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.sidecars[0].name": "nginx",
"camundaHub.console.sidecars[0].image": "nginx:latest",
"camundaHub.console.sidecars[0].ports[0].containerPort": "80",
Expand All @@ -589,8 +589,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestInitContainers",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.initContainers[0].name": "nginx",
"camundaHub.console.initContainers[0].image": "nginx:latest",
"camundaHub.console.initContainers[0].ports[0].containerPort": "80",
Expand All @@ -616,8 +616,8 @@ func (s *DeploymentTemplateTest) TestDifferentValuesInputs() {
}, {
Name: "TestSetDnsPolicyAndDnsConfig",
Values: map[string]string{
"identity.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"console.enabled": "true",
"camundaHub.console.dnsPolicy": "ClusterFirst",
"camundaHub.console.dnsConfig.nameservers[0]": "8.8.8.8",
"camundaHub.console.dnsConfig.searches[0]": "example.com",
Expand Down
18 changes: 9 additions & 9 deletions charts/camunda-platform-8.10/test/unit/console/goldenfiles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ func TestGoldenDefaultsTemplateConsole(t *testing.T) {
GoldenFileName: name,
Templates: []string{"templates/console/" + name + ".yaml"},
SetValues: map[string]string{
"console.enabled": "true",
"identity.enabled": "true",
"console.serviceAccount.enabled": "true",
"global.identity.auth.enabled": "true",
"global.identity.keycloak.url.protocol": "https",
"global.identity.keycloak.url.host": "keycloak.example.com",
"global.identity.keycloak.url.port": "8443",
"global.identity.keycloak.auth.adminUser": "admin",
"global.identity.keycloak.auth.secret.existingSecret": "kc-secret",
"console.enabled": "true",
"identity.enabled": "true",
"console.serviceAccount.enabled": "true",
"global.identity.auth.enabled": "true",
"global.identity.keycloak.url.protocol": "https",
"global.identity.keycloak.url.host": "keycloak.example.com",
"global.identity.keycloak.url.port": "8443",
"global.identity.keycloak.auth.adminUser": "admin",
"global.identity.keycloak.auth.secret.existingSecret": "kc-secret",
"global.identity.keycloak.auth.secret.existingSecretKey": "password",
},
IgnoredLines: []string{
Expand Down
10 changes: 5 additions & 5 deletions charts/camunda-platform-8.10/test/unit/console/httproute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ func (s *HTTPRouteTemplateTest) TestDifferentValuesInputs() {
{
Name: "TestHTTPRouteWithContextPath",
Values: map[string]string{
"global.gateway.enabled": "true",
"global.host": "camunda.example.com",
"console.enabled": "true",
"identity.enabled": "true",
"camundaHub.console.contextPath": "/console",
"global.gateway.enabled": "true",
"global.host": "camunda.example.com",
"console.enabled": "true",
"identity.enabled": "true",
"camundaHub.console.contextPath": "/console",
},
Verifier: func(t *testing.T, output string, err error) {
require.NoError(t, err)
Expand Down
12 changes: 6 additions & 6 deletions charts/camunda-platform-8.10/test/unit/console/resources_cpu_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ func (s *ResourcesCPUTemplateTest) TestCPUResourcesAsString() {
// given
options := &helm.Options{
SetValues: map[string]string{
"console.enabled": "true",
"identity.enabled": "true",
"global.elasticsearch.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"global.elasticsearch.enabled": "true",
"camundaHub.console.resources.requests.cpu": "200m",
"camundaHub.console.resources.limits.cpu": "1.5",
"camundaHub.console.resources.requests.memory": "256Mi",
Expand Down Expand Up @@ -94,9 +94,9 @@ func (s *ResourcesCPUTemplateTest) TestCPUResourcesAsMillicores() {
// given
options := &helm.Options{
SetValues: map[string]string{
"console.enabled": "true",
"identity.enabled": "true",
"global.elasticsearch.enabled": "true",
"console.enabled": "true",
"identity.enabled": "true",
"global.elasticsearch.enabled": "true",
"camundaHub.console.resources.requests.cpu": "600m",
"camundaHub.console.resources.limits.cpu": "2000m",
"camundaHub.console.resources.requests.memory": "400Mi",
Expand Down
4 changes: 2 additions & 2 deletions charts/camunda-platform-8.10/test/unit/identity/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@ func (s *deploymentTemplateTest) TestDifferentValuesInputs() {
Name: "TestContainerShouldSetCorrectSecret",
HelmOptionsExtraArgs: map[string][]string{"install": {"--debug"}},
Values: map[string]string{
"global.identity.auth.enabled": "true",
"identity.enabled": "true",
"global.identity.auth.enabled": "true",
"identity.enabled": "true",
},
Verifier: func(t *testing.T, output string, err error) {
var deployment appsv1.Deployment
Expand Down
14 changes: 7 additions & 7 deletions charts/camunda-platform-8.10/test/unit/identity/goldenfiles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ func TestGoldenDefaultsTemplateIdentity(t *testing.T) {
`\s+checksum/.+?:\s+.*`, // ignore configmap checksum.
},
SetValues: map[string]string{
"global.identity.auth.enabled": "true",
"identity.enabled": "true",
"global.identity.keycloak.url.protocol": "https",
"global.identity.keycloak.url.host": "keycloak.example.com",
"global.identity.keycloak.url.port": "8443",
"global.identity.keycloak.auth.adminUser": "admin",
"global.identity.keycloak.auth.secret.existingSecret": "kc-secret",
"global.identity.auth.enabled": "true",
"identity.enabled": "true",
"global.identity.keycloak.url.protocol": "https",
"global.identity.keycloak.url.host": "keycloak.example.com",
"global.identity.keycloak.url.port": "8443",
"global.identity.keycloak.auth.adminUser": "admin",
"global.identity.keycloak.auth.secret.existingSecret": "kc-secret",
"global.identity.keycloak.auth.secret.existingSecretKey": "password",
},
})
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.10/test/unit/orchestration/configmap_unified_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ func (s *ConfigmapTemplateTest) TestHasLegacyElasticsearchExporter() {
"orchestration.data.secondaryStorage.rdbms.url": "jdbc:postgresql://localhost:5432/camunda",
"orchestration.data.secondaryStorage.rdbms.username": "camunda",
"orchestration.data.secondaryStorage.rdbms.secret.inlineSecret": "my-password",
"optimize.enabled": "true",
"optimize.enabled": "true",
},
Verifier: func(t *testing.T, output string, err error) {
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion charts/camunda-platform-8.10/test/unit/orchestration/statefulset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ func (s *StatefulSetTest) TestDifferentValuesInputs() {
"dnsPolicy should default to ClusterFirstWithHostNet when hostNetwork is enabled")
},
}, {
Name: "TestHostNetworkDisabledByDefault",
Name: "TestHostNetworkDisabledByDefault",
Values: map[string]string{},
Verifier: func(t *testing.T, output string, err error) {
var statefulSet appsv1.StatefulSet
Expand Down
Loading
Loading