Ginkgo tests

api/v1alpha1/maasvalidator_types.go

@@ -44,7 +44,7 @@ type MaasInstanceRules struct {
  OSImages []OSImage `json:"bootable-images,omitempty" yaml:"bootable-images,omitempty"`
 
  // Auth provides authentication information for the MaaS Instance
- Auth Auth `json:"auth,omitempty" yaml:"auth,omitempty"`
+ Auth Auth `json:"auth" yaml:"auth"`
 }
 
 type OSImage struct {

chart/validator-plugin-maas/crds/maasvalidator-crd.yaml

@@ -81,6 +81,7 @@ spec:
  description: Unique rule name
  type: string
  required:
+ - auth
  - name
  type: object
  required:

config/crd/bases/validation.spectrocloud.labs_maasvalidators.yaml

@@ -81,6 +81,7 @@ spec:
  description: Unique rule name
  type: string
  required:
+ - auth
  - name
  type: object
  required:

internal/controller/maasvalidator_controller.go

@@ -74,12 +74,12 @@ func (r *MaasValidatorReconciler) Reconcile(ctx context.Context, req ctrl.Reques
  maasUrl := validator.Spec.MaasInstance.Host
  maasclient, err := maasclient.GetClient(maasUrl, maasToken, "2.0")
 
- apiclient := val.MaaSAPI{Client: maasclient}
-
  if err != nil {
  r.Log.Error(err, "failed to initialize MaaS client")
  }
 
+ apiclient := val.MaaSAPI{Client: maasclient}
+
  // Get the active validator's validation result
  vr := &vapi.ValidationResult{}
  nn := ktypes.NamespacedName{

internal/controller/maasvalidator_controller_test.go

@@ -1,9 +1,18 @@
 package controller
 
 import (
+ "context"
+
  . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
+
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/types"
+
  // . "github.com/onsi/gomega"
  //+kubebuilder:scaffold:imports
+ "github.com/spectrocloud-labs/validator-plugin-maas/api/v1alpha1"
+ vapi "github.com/spectrocloud-labs/validator/api/v1alpha1"
 )
 
 const MaasValidatorName = "maas-validator"
@@ -16,4 +25,47 @@ var _ = Describe("MaaSValidator controller", Ordered, func() {
  Skip("skipping")
  }
  })
+
+ val := &v1alpha1.MaasValidator{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: MaasValidatorName,
+ Namespace: validatorNamespace,
+ },
+ Spec: v1alpha1.MaasValidatorSpec{
+ MaasInstance: v1alpha1.MaasInstance{
+ Host: "maas.sc",
+ Auth: v1alpha1.Auth{
+ SecretName: "maas-api-token",
+ },
+ },
+ MaasInstanceRules: v1alpha1.MaasInstanceRules{
+ Name: "validate ubuntu images",
+ OSImages: []v1alpha1.OSImage{
+ {Name: "Ubuntu", Architecture: "amd64/ga-20.04"},
+ },
+ },
+ },
+ }
+
+ //secret := &corev1.Secret{}
+
+ vr := &vapi.ValidationResult{}
+ vrKey := types.NamespacedName{Name: validationResultName(val), Namespace: validatorNamespace}
+
+ It("Should create a ValidationResult and update its Status with a failed condition", func() {
+ By("By creating a new MaasValidator")
+ ctx := context.Background()
+
+ Expect(k8sClient.Create(ctx, val)).Should(Succeed())
+
+ // Wait for the ValidationResult's Status to be updated
+ Eventually(func() bool {
+ if err := k8sClient.Get(ctx, vrKey, vr); err != nil {
+ return false
+ }
+
+ stateOk := vr.Status.State == vapi.ValidationFailed
+ return stateOk
+ }, timeout, interval).Should(BeTrue(), "failed to create a ValidationResult")
+ })
 })

internal/validators/maas_validator.go

@@ -32,13 +32,25 @@
 }
 
 func (m *MaaSAPI) ListOSImages() ([]entity.BootResource, error) {
- images, _ := m.Client.BootResources.Get(&entity.BootResourcesReadParams{})
- return images, nil
+ if m.Client != nil {
+ images, err := m.Client.BootResources.Get(&entity.BootResourcesReadParams{})
+ if err != nil {
+ return make([]entity.BootResource, 0), err
+ }
+ return images, nil
+ }
+ return make([]entity.BootResource, 0), nil
 }
 
 func (m *MaaSAPI) ListDNSServers() ([]entity.DNSResource, error) {
- dnsresources, _ := m.Client.DNSResources.Get()
- return dnsresources, nil
+ if m.Client != nil {
+ dnsresources, err := m.Client.DNSResources.Get()
+ if err != nil {
+ return make([]entity.DNSResource, 0), err
+ }
+ return dnsresources, nil
+ }
+ return make([]entity.DNSResource, 0), nil
 }
 
 func NewMaasRuleService(apiclient MaaSAPIClient) *MaasRuleService {