Skip to content

fix: format and migration to sigs.k8s.io/yaml #549

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: format and migration to sigs.k8s.io/yaml #549

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
4 changes: 2 additions & 2 deletions projects/argo/diff_fuzzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers"

"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
"github.com/argoproj/argo-cd/v2/util/argo/normalizers"
appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"

"github.com/ghodss/yaml"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/yaml"
)

type diffConfigParams struct {
Expand Down
50 changes: 25 additions & 25 deletions projects/argo/events_controllers_sensor_fuzzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@
package sensor

import (
"github.com/ghodss/yaml"
eventbusv1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1"
"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
fuzz "github.com/AdaLogics/go-fuzz-headers"
fuzz "github.com/AdaLogics/go-fuzz-headers"
eventbusv1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1"
"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
"sigs.k8s.io/yaml"
)

func FuzzValidateSensor(data []byte) int {
f := fuzz.NewConsumer(data)
eventBus := &eventbusv1alpha1.EventBus{}
err := f.GenerateStruct(eventBus)
if err != nil {
return 0
}
content, err := f.GetBytes()
if err != nil {
return 0
}
sensor := &v1alpha1.Sensor{}
err = yaml.Unmarshal(content, &sensor)
if err != nil {
return 0
}
if sensor == nil {
return 0
}
ValidateSensor(sensor, eventBus)
return 1
}
f := fuzz.NewConsumer(data)
eventBus := &eventbusv1alpha1.EventBus{}
err := f.GenerateStruct(eventBus)
if err != nil {
return 0
}
content, err := f.GetBytes()
if err != nil {
return 0
}
sensor := &v1alpha1.Sensor{}
err = yaml.Unmarshal(content, &sensor)
if err != nil {
return 0
}
if sensor == nil {
return 0
}
ValidateSensor(sensor, eventBus)
return 1
}
156 changes: 78 additions & 78 deletions projects/cluster-api/fuzz_cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,100 @@
package cluster

import (
"context"
"fmt"
"testing"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cluster-api/internal/test/builder"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"github.com/ghodss/yaml"
fuzz "github.com/AdaLogics/go-fuzz-headers"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"context"
"fmt"
"testing"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
fuzz "github.com/AdaLogics/go-fuzz-headers"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/internal/test/builder"
"sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/yaml"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
)

var (
fuzzCtx = context.Background()
fakeSchemeForFuzzing = runtime.NewScheme()
fuzzCtx = context.Background()
fakeSchemeForFuzzing = runtime.NewScheme()
)

func init() {
_ = clientgoscheme.AddToScheme(fakeSchemeForFuzzing)
_ = clusterv1.AddToScheme(fakeSchemeForFuzzing)
_ = apiextensionsv1.AddToScheme(fakeSchemeForFuzzing)
_ = corev1.AddToScheme(fakeSchemeForFuzzing)
_ = clientgoscheme.AddToScheme(fakeSchemeForFuzzing)
_ = clusterv1.AddToScheme(fakeSchemeForFuzzing)
_ = apiextensionsv1.AddToScheme(fakeSchemeForFuzzing)
_ = corev1.AddToScheme(fakeSchemeForFuzzing)
}

// helper function to crate an unstructured object.
func GetUnstructured(f *fuzz.ConsumeFuzzer) (*unstructured.Unstructured, error) {
yamlStr, err := f.GetString()
if err != nil {
return nil, err
}
obj := make(map[string]interface{})
err = yaml.Unmarshal([]byte(yamlStr), &obj)
if err != nil {
return nil, err
}
return &unstructured.Unstructured{Object: obj}, nil
yamlStr, err := f.GetString()
if err != nil {
return nil, err
}
obj := make(map[string]interface{})
err = yaml.Unmarshal([]byte(yamlStr), &obj)
if err != nil {
return nil, err
}
return &unstructured.Unstructured{Object: obj}, nil
}


func validateUnstructured(unstr *unstructured.Unstructured) error {
if _, ok := unstr.Object["kind"]; !ok {
return fmt.Errorf("invalid unstr")
}
if _, ok := unstr.Object["apiVersion"]; !ok {
return fmt.Errorf("invalid unstr")
}
if _, ok := unstr.Object["spec"]; !ok {
return fmt.Errorf("invalid unstr")
}
if _, ok := unstr.Object["status"]; !ok {
return fmt.Errorf("invalid unstr")
}
return nil
if _, ok := unstr.Object["kind"]; !ok {
return fmt.Errorf("invalid unstr")
}
if _, ok := unstr.Object["apiVersion"]; !ok {
return fmt.Errorf("invalid unstr")
}
if _, ok := unstr.Object["spec"]; !ok {
return fmt.Errorf("invalid unstr")
}
if _, ok := unstr.Object["status"]; !ok {
return fmt.Errorf("invalid unstr")
}
return nil
}

func FuzzClusterReconcile(f *testing.F) {
f.Fuzz(func (t *testing.T, data []byte){
fdp := fuzz.NewConsumer(data)
unstr, err := GetUnstructured(fdp)
if err != nil {
return
}
err = validateUnstructured(unstr)
if err != nil {
return
}
cluster := &clusterv1.Cluster{}
err = fdp.GenerateStruct(cluster)
if err != nil {
return
}
node := &corev1.Node{}
err = fdp.GenerateStruct(node)
if err != nil {
return
}
clientFake := fake.NewClientBuilder().WithScheme(fakeSchemeForFuzzing).WithObjects(
cluster,
node,
unstr,
builder.GenericInfrastructureMachineCRD.DeepCopy(),
).Build()
r := &Reconciler{
Client: clientFake,
APIReader: clientFake,
}
f.Fuzz(func(t *testing.T, data []byte) {
fdp := fuzz.NewConsumer(data)
unstr, err := GetUnstructured(fdp)
if err != nil {
return
}
err = validateUnstructured(unstr)
if err != nil {
return
}
cluster := &clusterv1.Cluster{}
err = fdp.GenerateStruct(cluster)
if err != nil {
return
}
node := &corev1.Node{}
err = fdp.GenerateStruct(node)
if err != nil {
return
}
clientFake := fake.NewClientBuilder().WithScheme(fakeSchemeForFuzzing).WithObjects(
cluster,
node,
unstr,
builder.GenericInfrastructureMachineCRD.DeepCopy(),
).Build()
r := &Reconciler{
Client: clientFake,
APIReader: clientFake,
}

r.Reconcile(fuzzCtx, reconcile.Request{NamespacedName: util.ObjectKey(cluster)})

r.Reconcile(fuzzCtx, reconcile.Request{NamespacedName: util.ObjectKey(cluster)})

})
})
}
Loading