Skip to content

Commit

Permalink
fix: v1 to v1alpha1
Browse files Browse the repository at this point in the history
  • Loading branch information
wcrum committed Apr 6, 2024
1 parent c2b954c commit 7cf2316
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 11 deletions.
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ resources:
domain: spectrocloud.labs
group: validation
kind: KubescapeValidator
path: github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1
version: v1
path: github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1alpha1
version: v1alpha1
version: "3"
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
// Package v1 contains API Schema definitions for the validation v1 API group
// +kubebuilder:object:generate=true
// +groupName=validation.spectrocloud.labs
package v1
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1
package v1alpha1

import (
"fmt"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1"
validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1alpha1"
"github.com/spectrocloud-labs/validator-plugin-kubescape/internal/controller"
validatorv1alpha1 "github.com/spectrocloud-labs/validator/api/v1alpha1"
//+kubebuilder:scaffold:imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
singular: kubescapevalidator
scope: Namespaced
versions:
- name: v1
- name: v1alpha1
schema:
openAPIV3Schema:
description: KubescapeValidator is the Schema for the kubescapevalidators
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/kubescapevalidator_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (

"github.com/go-logr/logr"
kubevuln "github.com/kubescape/kubevuln/repositories"
kubescapevalidatorv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1"
validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1"
kubescapevalidatorv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1alpha1"
validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1alpha1"
"github.com/spectrocloud-labs/validator-plugin-kubescape/internal/constants"
"github.com/spectrocloud-labs/validator-plugin-kubescape/internal/validators"
vapi "github.com/spectrocloud-labs/validator/api/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1"
validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion internal/validators/kubescape.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/go-logr/logr"
kubevuln "github.com/kubescape/kubevuln/repositories"
kubescapev1 "github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1"
validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1alpha1"
"github.com/spectrocloud-labs/validator-plugin-kubescape/internal/constants"
vapi "github.com/spectrocloud-labs/validator/api/v1alpha1"
"github.com/spectrocloud-labs/validator/pkg/types"
Expand Down
51 changes: 51 additions & 0 deletions internal/validators/kubescape_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package validators

import (
"reflect"
"testing"

"github.com/go-logr/logr"
kubevuln "github.com/kubescape/kubevuln/repositories"
kubescapev1 "github.com/kubescape/storage/pkg/apis/softwarecomposition/v1beta1"
validationv1 "github.com/spectrocloud-labs/validator-plugin-kubescape/api/v1alpha1"
"github.com/spectrocloud-labs/validator/pkg/types"
ktypes "k8s.io/apimachinery/pkg/types"
)

func TestKubescapeService_ReconcileSeverityRule(t *testing.T) {
type fields struct {
Log logr.Logger
API *kubevuln.APIServerStore
}
type args struct {
nn ktypes.NamespacedName
rule validationv1.SeverityLimitRule
ignoredCVEs []string
manifests []kubescapev1.VulnerabilityManifest
}
tests := []struct {
name string
fields fields
args args
want *types.ValidationRuleResult
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
n := &KubescapeService{
Log: tt.fields.Log,
API: tt.fields.API,
}
got, err := n.ReconcileSeverityRule(tt.args.nn, tt.args.rule, tt.args.ignoredCVEs, tt.args.manifests)
if (err != nil) != tt.wantErr {
t.Errorf("KubescapeService.ReconcileSeverityRule() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("KubescapeService.ReconcileSeverityRule() = %v, want %v", got, tt.want)
}
})
}
}

0 comments on commit 7cf2316

Please sign in to comment.