modifying tests, not blocking reconcile on computing generate or do n…

…ot generate VAP Signed-off-by: Jaydip Gabani <[email protected]>
open-policy-agent · Jul 22, 2024 · d02332f · d02332f
1 parent a0e4bb9
commit d02332f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/pkg/controller/constrainttemplate/constrainttemplate_controller.go b/pkg/controller/constrainttemplate/constrainttemplate_controller.go
@@ -383,7 +383,7 @@ func (r *ReconcileConstraintTemplate) Reconcile(ctx context.Context, request rec
 	}
 	generateVap, err := shouldGenerateVAP(unversionedCT, *defaultGenerateVAP)
 	if err != nil {
-		return reconcile.Result{}, err
+		logger.Error(err, "generateVap error")
 	}
 	logger.Info("generateVap", "r.generateVap", generateVap)
 
@@ -740,6 +740,9 @@ func makeGvk(kind string) schema.GroupVersionKind {
 
 func shouldGenerateVAP(ct *templates.ConstraintTemplate, generateVAPDefault bool) (bool, error) {
 	source, err := pSchema.GetSourceFromTemplate(ct)
+	if errors.Is(err, pSchema.ErrCodeNotDefined) {
+		return false, nil
+	}
 	if err != nil {
 		return false, err
 	}

diff --git a/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go b/pkg/controller/constrainttemplate/constrainttemplate_controller_test.go
@@ -1024,6 +1024,7 @@ func TestShouldGenerateVAP(t *testing.T) {
 		template   *templates.ConstraintTemplate
 		vapDefault bool
 		expected   bool
+		wantErr    bool
 	}{
 		{
 			name: "missing K8sNative driver",
@@ -1059,50 +1060,60 @@ func TestShouldGenerateVAP(t *testing.T) {
 			},
 			vapDefault: true,
 			expected:   false,
+			wantErr:    false,
 		},
 		{
 			name:       "Enabled, default 'no'",
 			template:   makeTemplate(ptr.To[bool](true)),
 			vapDefault: false,
 			expected:   true,
+			wantErr:    false,
 		},
 		{
 			name:       "Enabled, default 'yes'",
 			template:   makeTemplate(ptr.To[bool](true)),
 			vapDefault: true,
 			expected:   true,
+			wantErr:    false,
 		},
 		{
 			name:       "Disabled, default 'yes'",
 			template:   makeTemplate(ptr.To[bool](false)),
 			vapDefault: true,
 			expected:   false,
+			wantErr:    false,
 		},
 		{
 			name:       "Disabled, default 'no'",
 			template:   makeTemplate(ptr.To[bool](false)),
 			vapDefault: false,
 			expected:   false,
+			wantErr:    false,
 		},
 		{
 			name:       "missing, default 'yes'",
 			template:   makeTemplate(nil),
 			vapDefault: true,
 			expected:   true,
+			wantErr:    false,
 		},
 		{
 			name:       "missing, default 'no'",
 			template:   makeTemplate(nil),
 			vapDefault: false,
 			expected:   false,
+			wantErr:    false,
 		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			generateVAP, _ := shouldGenerateVAP(test.template, test.vapDefault)
+			generateVAP, err := shouldGenerateVAP(test.template, test.vapDefault)
 			if generateVAP != test.expected {
 				t.Errorf("wanted assumeVAP to be %v; got %v", test.expected, generateVAP)
 			}
+			if test.wantErr != (err != nil) {
+				t.Errorf("wanted error %v; got %v", test.wantErr, err)
+			}
 		})
 	}
 }