kubescape / storage

Apache License 2.0
1 stars 6 forks source link

remove etcd #15

Closed matthyx closed 1 year ago

matthyx commented 1 year ago

Sorry, we do not accept changes directly against this repository. Please see CONTRIBUTING.md for information on where and how to contribute instead.

matthyx commented 1 year ago

rebased and now investigating the 2 issues on discovery and edits

matthyx commented 1 year ago

@vladklokun we can merge this one, rebase watches, and work on proper CI

vladklokun commented 1 year ago

We really need CI. Running tests with go test -v ./...nets me:

=== RUN   TestStorageImpl_Get/empty_object
W0606 10:13:36.255481 1794407 storage.go:210] Custom storage get: /spdx.softwarecomposition.kubescape.io/sbomspdxv2p3s/kubescape/toto
    storage_test.go:315:
                Error Trace:    /home/vklokun/github.com/kubescape/storage/pkg/registry/file/storage_test.go:315
                Error:          Not equal:
                                expected: &v1beta1.SBOMSPDXv2p3{TypeMeta:v1.TypeMeta{Kind:"SBOMSPDXv2p3", APIVersion:"spdx.softwarecomposition.kubescape.io/v1beta1"}, ObjectMeta:v1.ObjectMeta{Name:"", GenerateName:"", Namespace:"", SelfLink:"", UID:"", ResourceVersion:"", Generation:0, CreationTimestamp:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), DeletionTimestamp:<nil>, DeletionGracePeriodSeconds:(*int64)(nil), Labels:map[string]string(nil), Annotations:map[string]string(nil), OwnerReferences:[]v1.OwnerReference(nil), Finalizers:[]string(nil), ManagedFields:[]v1.ManagedFieldsEntry(nil)}, Spec:v1beta1.SBOMSPDXv2p3Spec{Metadata:v1beta1.SPDXMeta{Tool:v1beta1.ToolMeta{Name:"", Version:""}, Report:v1beta1.ReportMeta{CreatedAt:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)}}, SPDX:v1beta1.Document{DocumentDescribes:[]string(nil), SPDXVersion:"", DataLicense:"", SPDXIdentifier:"", DocumentName:"", DocumentNamespace:"", ExternalDocumentReferences:[]v1beta1.ExternalDocumentRef(nil), DocumentComment:"", CreationInfo:(*v1beta1.CreationInfo)(nil), Packages:[]*v1beta1.Package(nil), Files:[]*v1beta1.File(nil), OtherLicenses:[]*v1beta1.OtherLicense(nil), Relationships:[]*v1beta1.Relationship(nil), Annotations:[]v1beta1.Annotation(nil), Snippets:[]v1beta1.Snippet(nil), Reviews:[]*v1beta1.Review(nil)}}, Status:v1beta1.SBOMSPDXv2p3Status{}}
                                actual  : &v1beta1.SBOMSPDXv2p3{TypeMeta:v1.TypeMeta{Kind:"", APIVersion:""}, ObjectMeta:v1.ObjectMeta{Name:"", GenerateName:"", Namespace:"", SelfLink:"", UID:"", ResourceVersion:"", Generation:0, CreationTimestamp:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), DeletionTimestamp:<nil>, DeletionGracePeriodSeconds:(*int64)(nil), Labels:map[string]string(nil), Annotations:map[string]string(nil), OwnerReferences:[]v1.OwnerReference(nil), Finalizers:[]string(nil), ManagedFields:[]v1.ManagedFieldsEntry(nil)}, Spec:v1beta1.SBOMSPDXv2p3Spec{Metadata:v1beta1.SPDXMeta{Tool:v1beta1.ToolMeta{Name:"", Version:""}, Report:v1beta1.ReportMeta{CreatedAt:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)}}, SPDX:v1beta1.Document{DocumentDescribes:[]string(nil), SPDXVersion:"", DataLicense:"", SPDXIdentifier:"", DocumentName:"", DocumentNamespace:"", ExternalDocumentReferences:[]v1beta1.ExternalDocumentRef(nil), DocumentComment:"", CreationInfo:(*v1beta1.CreationInfo)(nil), Packages:[]*v1beta1.Package(nil), Files:[]*v1beta1.File(nil), OtherLicenses:[]*v1beta1.OtherLicense(nil), Relationships:[]*v1beta1.Relationship(nil), Annotations:[]v1beta1.Annotation(nil), Snippets:[]v1beta1.Snippet(nil), Reviews:[]*v1beta1.Review(nil)}}, Status:v1beta1.SBOMSPDXv2p3Status{}}

                                Diff:
                                --- Expected
                                +++ Actual
                                @@ -2,4 +2,4 @@
                                  TypeMeta: (v1.TypeMeta) {
                                -  Kind: (string) (len=12) "SBOMSPDXv2p3",
                                -  APIVersion: (string) (len=45) "spdx.softwarecomposition.kubescape.io/v1beta1"
                                +  Kind: (string) "",
                                +  APIVersion: (string) ""
                                  },
                Test:           TestStorageImpl_Get/empty_object
=== RUN   TestStorageImpl_Get/real_object
W0606 10:13:36.257185 1794407 storage.go:210] Custom storage get: /spdx.softwarecomposition.kubescape.io/sbomspdxv2p3s/kubescape/toto
    storage_test.go:315:
                Error Trace:    /home/vklokun/github.com/kubescape/storage/pkg/registry/file/storage_test.go:315
                Error:          Not equal:
                                expected: &v1beta1.SBOMSPDXv2p3{TypeMeta:v1.TypeMeta{Kind:"SBOMSPDXv2p3", APIVersion:"spdx.softwarecomposition.kubescape.io/v1beta1"}, ObjectMeta:v1.ObjectMeta{Name:"toto", GenerateName:"", Namespace:"", SelfLink:"", UID:"", ResourceVersion:"", Generation:0, CreationTimestamp:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), DeletionTimestamp:<nil>, DeletionGracePeriodSeconds:(*int64)(nil), Labels:map[string]string(nil), Annotations:map[string]string(nil), OwnerReferences:[]v1.OwnerReference(nil), Finalizers:[]string(nil), ManagedFields:[]v1.ManagedFieldsEntry(nil)}, Spec:v1beta1.SBOMSPDXv2p3Spec{Metadata:v1beta1.SPDXMeta{Tool:v1beta1.ToolMeta{Name:"", Version:""}, Report:v1beta1.ReportMeta{CreatedAt:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)}}, SPDX:v1beta1.Document{DocumentDescribes:[]string(nil), SPDXVersion:"", DataLicense:"", SPDXIdentifier:"", DocumentName:"", DocumentNamespace:"", ExternalDocumentReferences:[]v1beta1.ExternalDocumentRef(nil), DocumentComment:"", CreationInfo:(*v1beta1.CreationInfo)(nil), Packages:[]*v1beta1.Package(nil), Files:[]*v1beta1.File(nil), OtherLicenses:[]*v1beta1.OtherLicense(nil), Relationships:[]*v1beta1.Relationship(nil), Annotations:[]v1beta1.Annotation(nil), Snippets:[]v1beta1.Snippet(nil), Reviews:[]*v1beta1.Review(nil)}}, Status:v1beta1.SBOMSPDXv2p3Status{}}
                                actual  : &v1beta1.SBOMSPDXv2p3{TypeMeta:v1.TypeMeta{Kind:"", APIVersion:""}, ObjectMeta:v1.ObjectMeta{Name:"toto", GenerateName:"", Namespace:"", SelfLink:"", UID:"", ResourceVersion:"", Generation:0, CreationTimestamp:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), DeletionTimestamp:<nil>, DeletionGracePeriodSeconds:(*int64)(nil), Labels:map[string]string(nil), Annotations:map[string]string(nil), OwnerReferences:[]v1.OwnerReference(nil), Finalizers:[]string(nil), ManagedFields:[]v1.ManagedFieldsEntry(nil)}, Spec:v1beta1.SBOMSPDXv2p3Spec{Metadata:v1beta1.SPDXMeta{Tool:v1beta1.ToolMeta{Name:"", Version:""}, Report:v1beta1.ReportMeta{CreatedAt:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)}}, SPDX:v1beta1.Document{DocumentDescribes:[]string(nil), SPDXVersion:"", DataLicense:"", SPDXIdentifier:"", DocumentName:"", DocumentNamespace:"", ExternalDocumentReferences:[]v1beta1.ExternalDocumentRef(nil), DocumentComment:"", CreationInfo:(*v1beta1.CreationInfo)(nil), Packages:[]*v1beta1.Package(nil), Files:[]*v1beta1.File(nil), OtherLicenses:[]*v1beta1.OtherLicense(nil), Relationships:[]*v1beta1.Relationship(nil), Annotations:[]v1beta1.Annotation(nil), Snippets:[]v1beta1.Snippet(nil), Reviews:[]*v1beta1.Review(nil)}}, Status:v1beta1.SBOMSPDXv2p3Status{}}

                                Diff:
                                --- Expected
                                +++ Actual
                                @@ -2,4 +2,4 @@
                                  TypeMeta: (v1.TypeMeta) {
                                -  Kind: (string) (len=12) "SBOMSPDXv2p3",
                                -  APIVersion: (string) (len=45) "spdx.softwarecomposition.kubescape.io/v1beta1"
                                +  Kind: (string) "",
                                +  APIVersion: (string) ""
                                  },
                Test:           TestStorageImpl_Get/real_object
--- FAIL: TestStorageImpl_Get (0.00s)
    --- PASS: TestStorageImpl_Get/not_found (0.00s)
    --- PASS: TestStorageImpl_Get/empty_string (0.00s)
    --- FAIL: TestStorageImpl_Get/empty_object (0.00s)
    --- FAIL: TestStorageImpl_Get/real_object (0.00s)