Fix CI formatting issues: import ordering and whitespace
Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
This commit is contained in:
parent
d914659c50
commit
5d8d1ead71
|
|
@ -3,9 +3,10 @@ package state
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/helmfile/helmfile/pkg/filesystem"
|
"github.com/helmfile/helmfile/pkg/filesystem"
|
||||||
"github.com/helmfile/helmfile/pkg/yaml"
|
"github.com/helmfile/helmfile/pkg/yaml"
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestExactIssueScenario tests the exact helmfile.yaml scenario described in issue #2182
|
// TestExactIssueScenario tests the exact helmfile.yaml scenario described in issue #2182
|
||||||
|
|
@ -105,8 +106,8 @@ func TestExactIssueScenario(t *testing.T) {
|
||||||
// For order ["foo", "bar"]: results[0][0] is foo, results[0][1] is bar
|
// For order ["foo", "bar"]: results[0][0] is foo, results[0][1] is bar
|
||||||
// For order ["bar", "foo"]: results[1][0] is bar, results[1][1] is foo
|
// For order ["bar", "foo"]: results[1][0] is bar, results[1][1] is foo
|
||||||
|
|
||||||
fooFromFirstOrder := results[0][0] // foo processed first
|
fooFromFirstOrder := results[0][0] // foo processed first
|
||||||
barFromFirstOrder := results[0][1] // bar processed second
|
barFromFirstOrder := results[0][1] // bar processed second
|
||||||
|
|
||||||
barFromSecondOrder := results[1][0] // bar processed first
|
barFromSecondOrder := results[1][0] // bar processed first
|
||||||
fooFromSecondOrder := results[1][1] // foo processed second
|
fooFromSecondOrder := results[1][1] // foo processed second
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,9 @@ package state
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/helmfile/helmfile/pkg/filesystem"
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
|
"github.com/helmfile/helmfile/pkg/filesystem"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestIssue2182_ValuesTemplatingBugFix is an integration test that reproduces
|
// TestIssue2182_ValuesTemplatingBugFix is an integration test that reproduces
|
||||||
|
|
@ -42,14 +43,14 @@ func TestIssue2182_ValuesTemplatingBugFix(t *testing.T) {
|
||||||
"global": "shared-config",
|
"global": "shared-config",
|
||||||
"commonKey": "commonValue",
|
"commonKey": "commonValue",
|
||||||
"foo": map[string]any{
|
"foo": map[string]any{
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"replicaCount": 2,
|
"replicaCount": 2,
|
||||||
"image": "foo:1.0.0",
|
"image": "foo:1.0.0",
|
||||||
},
|
},
|
||||||
"bar": map[string]any{
|
"bar": map[string]any{
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"replicaCount": 1,
|
"replicaCount": 1,
|
||||||
"image": "bar:2.0.0",
|
"image": "bar:2.0.0",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ func BenchmarkDeepCopyValues(b *testing.B) {
|
||||||
"tag": "v1.0.0",
|
"tag": "v1.0.0",
|
||||||
},
|
},
|
||||||
"app1": map[string]any{
|
"app1": map[string]any{
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"replicaCount": 3,
|
"replicaCount": 3,
|
||||||
"resources": map[string]any{
|
"resources": map[string]any{
|
||||||
"requests": map[string]any{
|
"requests": map[string]any{
|
||||||
|
|
@ -29,7 +29,7 @@ func BenchmarkDeepCopyValues(b *testing.B) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"app2": map[string]any{
|
"app2": map[string]any{
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"replicaCount": 2,
|
"replicaCount": 2,
|
||||||
"config": map[string]any{
|
"config": map[string]any{
|
||||||
"database": map[string]any{
|
"database": map[string]any{
|
||||||
|
|
@ -67,7 +67,7 @@ func BenchmarkCreateReleaseTemplateData(b *testing.B) {
|
||||||
"tag": "v1.0.0",
|
"tag": "v1.0.0",
|
||||||
},
|
},
|
||||||
"app1": map[string]any{
|
"app1": map[string]any{
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"replicaCount": 3,
|
"replicaCount": 3,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,9 @@ package state
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/helmfile/helmfile/pkg/filesystem"
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
|
"github.com/helmfile/helmfile/pkg/filesystem"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestValuesMutationFix reproduces and tests the fix for the issue described in
|
// TestValuesMutationFix reproduces and tests the fix for the issue described in
|
||||||
|
|
@ -36,7 +37,7 @@ func TestValuesMutationFix(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
release := &ReleaseSpec{
|
release := &ReleaseSpec{
|
||||||
Name: "test-release",
|
Name: "test-release",
|
||||||
Chart: "test/chart",
|
Chart: "test/chart",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,10 @@ package state
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/helmfile/helmfile/pkg/filesystem"
|
"github.com/helmfile/helmfile/pkg/filesystem"
|
||||||
"github.com/helmfile/helmfile/pkg/tmpl"
|
"github.com/helmfile/helmfile/pkg/tmpl"
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestValuesTemplateIsolation tests the fix for the helmfile values templating bug
|
// TestValuesTemplateIsolation tests the fix for the helmfile values templating bug
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue