mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-29 17:41:13 +00:00
Merge pull request #4949 from koba1t/fix/add_check_kustomization_is_empty
add check that kustomization is empty
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"reflect"
|
||||
|
||||
"sigs.k8s.io/kustomize/kyaml/errors"
|
||||
"sigs.k8s.io/kustomize/kyaml/filesys"
|
||||
@@ -300,6 +301,20 @@ func (k *Kustomization) FixKustomizationPreMarshalling(fSys filesys.FileSystem)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (k *Kustomization) CheckEmpty() error {
|
||||
// generate empty Kustomization
|
||||
emptyKustomization := &Kustomization{}
|
||||
|
||||
// k.TypeMeta is metadata. It Isn't related to whether empty or not.
|
||||
emptyKustomization.TypeMeta = k.TypeMeta
|
||||
|
||||
if reflect.DeepEqual(k, emptyKustomization) {
|
||||
return fmt.Errorf("kustomization.yaml is empty")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (k *Kustomization) EnforceFields() []string {
|
||||
var errs []string
|
||||
if k.Kind != "" && k.Kind != KustomizationKind && k.Kind != ComponentKind {
|
||||
|
||||
@@ -284,14 +284,64 @@ unknown: foo`)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUnmarshal_InvalidYaml(t *testing.T) {
|
||||
y := []byte(`
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
func TestUnmarshal_Failed(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
kustomizationYamls []byte
|
||||
errMsg string
|
||||
}{
|
||||
{
|
||||
name: "invalid yaml",
|
||||
kustomizationYamls: []byte(`apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
unknown`)
|
||||
var k Kustomization
|
||||
err := k.Unmarshal(y)
|
||||
if err == nil {
|
||||
t.Fatalf("expect an error")
|
||||
unknown`),
|
||||
errMsg: "invalid Kustomization: yaml: line 4: could not find expected ':'",
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
var k Kustomization
|
||||
if err := k.Unmarshal(tt.kustomizationYamls); err == nil || err.Error() != tt.errMsg {
|
||||
t.Errorf("Kustomization.Unmarshal() error = %v, wantErr %v", err, tt.errMsg)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestKustomization_CheckEmpty(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
kustomization *Kustomization
|
||||
wantErr bool
|
||||
}{
|
||||
{
|
||||
name: "empty kustomization.yaml",
|
||||
kustomization: &Kustomization{},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "empty kustomization.yaml",
|
||||
kustomization: &Kustomization{
|
||||
TypeMeta: TypeMeta{
|
||||
Kind: KustomizationKind,
|
||||
APIVersion: KustomizationVersion,
|
||||
},
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "non empty kustomization.yaml",
|
||||
kustomization: &Kustomization{Resources: []string{"res"}},
|
||||
wantErr: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
k := tt.kustomization
|
||||
k.FixKustomization()
|
||||
if err := k.CheckEmpty(); (err != nil) != tt.wantErr {
|
||||
t.Errorf("Kustomization.CheckEmpty() error = %v, wantErr %v", err, tt.wantErr)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user