update schema and embetter tests

defenseunicorns · Oct 29, 2024 · 2b1875c · 2b1875c
1 parent 7ed06c9
commit 2b1875c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 9 deletions.
diff --git a/src/pkg/common/schemas/validation.json b/src/pkg/common/schemas/validation.json
@@ -384,16 +384,14 @@
             "type": "object",
             "properties": {
                 "timeout": {
-                    "type": "integer"
+                    "type": "string"
                 },
                 "proxy": {
                     "type": "string"
                 },
                 "headers": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
+                    "type": "object",
+                    "additionalProperties": { "type": "string"}
                 }
             }
         },

diff --git a/src/pkg/domains/api/spec_test.go b/src/pkg/domains/api/spec_test.go
@@ -12,6 +12,7 @@ import (
 func TestValidateAndMutateOptions(t *testing.T) {
 	var testTimeout = 10 * time.Second
 	var zeroTimeout = 0 * time.Second
+
 	tests := map[string]struct {
 		input, want *ApiOpts
 		expectErrs  int
@@ -32,10 +33,12 @@ func TestValidateAndMutateOptions(t *testing.T) {
 			&ApiOpts{
 				Timeout: "10s",
 				Proxy:   "https://my.proxy",
+				Headers: map[string]string{"cache": "no-cache"},
 			},
 			&ApiOpts{
 				Timeout: "10s",
 				Proxy:   "https://my.proxy",
+				Headers: map[string]string{"cache": "no-cache"},
 				timeout: &testTimeout,
 				proxyURL: &url.URL{
 					Scheme: "https",
@@ -86,6 +89,11 @@ func TestValidateAndMutateOptions(t *testing.T) {
 }
 
 func TestValidateAndMutateSpec(t *testing.T) {
+	healthcheckUrl, err := url.Parse("http://example.com/health")
+	require.NoError(t, err)
+	testParams := url.Values{}
+	testParams.Add("key", "value")
+
 	tests := map[string]struct {
 		input, want *ApiSpec
 		expectErrs  int
@@ -100,6 +108,45 @@ func TestValidateAndMutateSpec(t *testing.T) {
 			},
 			1,
 		},
+		"success": {
+			&ApiSpec{
+				Requests: []Request{
+					{
+						Name: "healthcheck",
+						URL:  "http://example.com/health",
+						Params: map[string]string{
+							"key": "value",
+						},
+						Options: &ApiOpts{
+							Headers: map[string]string{
+								"cache-control": "no-hit",
+							},
+						},
+					},
+				},
+			},
+			&ApiSpec{
+				Requests: []Request{
+					{
+						Name: "healthcheck",
+						URL:  "http://example.com/health",
+						Params: map[string]string{
+							"key": "value",
+						},
+						reqURL:        healthcheckUrl,
+						reqParameters: testParams,
+						Options: &ApiOpts{
+							Headers: map[string]string{
+								"cache-control": "no-hit",
+							},
+							timeout: &defaultTimeout,
+						},
+					},
+				},
+				Options: &ApiOpts{timeout: &defaultTimeout},
+			},
+			0,
+		},
 	}
 
 	for name, test := range tests {
@@ -122,7 +169,7 @@ func TestValidateAndMutateSpec(t *testing.T) {
 				}
 			}
 
-			if diff := cmp.Diff(test.want, test.input, cmp.AllowUnexported(ApiSpec{}, ApiOpts{})); diff != "" {
+			if diff := cmp.Diff(test.want, test.input, cmp.AllowUnexported(ApiSpec{}, ApiOpts{}, Request{})); diff != "" {
 				t.Fatalf("wrong result(-got +want):\n%s\n", diff)
 			}
 		})

diff --git a/src/test/e2e/api_validation_test.go b/src/test/e2e/api_validation_test.go
@@ -5,14 +5,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/defenseunicorns/lula/src/pkg/common/validation"
-	"github.com/defenseunicorns/lula/src/pkg/message"
-	"github.com/defenseunicorns/lula/src/test/util"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/e2e-framework/klient/wait"
 	"sigs.k8s.io/e2e-framework/klient/wait/conditions"
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/pkg/features"
+
+	"github.com/defenseunicorns/lula/src/pkg/common/validation"
+	"github.com/defenseunicorns/lula/src/pkg/message"
+	"github.com/defenseunicorns/lula/src/test/util"
 )
 
 func TestApiValidation(t *testing.T) {