public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-21 11:48:10 +02:00
Code Issues Projects Releases Wiki Activity

Replace interface{} by any (#901)

Browse Source 
Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero
2023-06-16 10:49:05 +09:00
committed by GitHub
parent 94fe519ed5
commit c55fa0f765
46 changed files with 394 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/environment/environment.go
+8 -8
View File
@@ -10,8 +10,8 @@ import (
type Environment struct {
Name string
KubeContext string
Values map[string]interface{}
Defaults map[string]interface{}
Values map[string]any
Defaults map[string]any
}
var EmptyEnvironment Environment
@@ -21,8 +21,8 @@ func New(name string) *Environment {
return &Environment{
Name: name,
KubeContext: "",
Values: map[string]interface{}{},
Defaults: map[string]interface{}{},
Values: map[string]any{},
Defaults: map[string]any{},
}
}
@@ -31,7 +31,7 @@ func (e Environment) DeepCopy() Environment {
if err != nil {
panic(err)
}
var values map[string]interface{}
var values map[string]any
if err := yaml.Unmarshal(valuesBytes, &values); err != nil {
panic(err)
}
@@ -44,7 +44,7 @@ func (e Environment) DeepCopy() Environment {
if err != nil {
panic(err)
}
var defaults map[string]interface{}
var defaults map[string]any
if err := yaml.Unmarshal(defaultsBytes, &defaults); err != nil {
panic(err)
}
@@ -78,8 +78,8 @@ func (e *Environment) Merge(other *Environment) (*Environment, error) {
return &copy, nil
}
func (e *Environment) GetMergedValues() (map[string]interface{}, error) {
vals := map[string]interface{}{}
func (e *Environment) GetMergedValues() (map[string]any, error) {
vals := map[string]any{}
if err := mergo.Merge(&vals, e.Defaults, mergo.WithOverride); err != nil {
return nil, err
pkg/environment/environment_test.go
+17 -17
View File
@@ -11,8 +11,8 @@ import (
func TestMerge_OverwriteNilValue_Issue1150(t *testing.T) {
dst := &Environment{
Name: "dst",
Values: map[string]interface{}{
"components": map[string]interface{}{
Values: map[string]any{
"components": map[string]any{
"etcd-operator": nil,
},
},
@@ -21,9 +21,9 @@ func TestMerge_OverwriteNilValue_Issue1150(t *testing.T) {
src := &Environment{
Name: "src",
Values: map[string]interface{}{
"components": map[string]interface{}{
"etcd-operator": map[string]interface{}{
Values: map[string]any{
"components": map[string]any{
"etcd-operator": map[string]any{
"version": "0.10.3",
},
},
@@ -38,9 +38,9 @@ func TestMerge_OverwriteNilValue_Issue1150(t *testing.T) {
actual := merged.Values
expected := map[string]interface{}{
"components": map[string]interface{}{
"etcd-operator": map[string]interface{}{
expected := map[string]any{
"components": map[string]any{
"etcd-operator": map[string]any{
"version": "0.10.3",
},
},
@@ -55,9 +55,9 @@ func TestMerge_OverwriteNilValue_Issue1150(t *testing.T) {
func TestMerge_OverwriteWithNilValue_Issue1154(t *testing.T) {
dst := &Environment{
Name: "dst",
Values: map[string]interface{}{
"components": map[string]interface{}{
"etcd-operator": map[string]interface{}{
Values: map[string]any{
"components": map[string]any{
"etcd-operator": map[string]any{
"version": "0.10.0",
},
},
@@ -67,9 +67,9 @@ func TestMerge_OverwriteWithNilValue_Issue1154(t *testing.T) {
src := &Environment{
Name: "src",
Values: map[string]interface{}{
"components": map[string]interface{}{
"etcd-operator": map[string]interface{}{
Values: map[string]any{
"components": map[string]any{
"etcd-operator": map[string]any{
"version": "0.10.3",
},
"prometheus": nil,
@@ -85,9 +85,9 @@ func TestMerge_OverwriteWithNilValue_Issue1154(t *testing.T) {
actual := merged.Values
expected := map[string]interface{}{
"components": map[string]interface{}{
"etcd-operator": map[string]interface{}{
expected := map[string]any{
"components": map[string]any{
"etcd-operator": map[string]any{
"version": "0.10.3",
},
"prometheus": nil,