Refactor smoke tests

.gitignore

@@ -4,6 +4,4 @@
 .idea/
 ~/.*
 *.test
-# Don't add zipped assets. Use the runtime zipping logic in the e2e suite instead.
-tests/e2e/assets/*.zip
-dorifi
+tests/assets/dorifi/dorifi

Makefile

@@ -37,7 +37,7 @@ generate-fakes:
 
 fmt: install-gofumpt install-shfmt
 	$(GOFUMPT) -w .
-	$(SHFMT) -f . | grep -v '^tests/vendor' | grep -v '^tests/e2e/assets/vendored' | xargs $(SHFMT) -w -i 2 -ci
+	$(SHFMT) -f . | grep -v '^tests/vendor' | xargs $(SHFMT) -w -i 2 -ci
 
 vet: ## Run go vet against code.
 	go vet ./...
@@ -62,8 +62,15 @@ test-tools:
 test-e2e: build-dorifi
 	./scripts/run-tests.sh tests/e2e
 
+test-crds: build-dorifi
+	./tests/crds/run-tests.sh
+
+test-smoke: build-dorifi
+	./tests/smoke/run-tests.sh
+
+
 build-dorifi:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ../dorifi/dorifi -C tests/e2e/assets/golang .
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ../dorifi/dorifi -C tests/assets/golang .
 
 GOFUMPT = $(shell go env GOPATH)/bin/gofumpt
 install-gofumpt:

tests/crds/crds_test.go

@@ -112,7 +112,7 @@ var _ = Describe("Using the k8s API directly", Ordered, func() {
 		Eventually(cf.Cf("target", "-o", orgDisplayName, "-s", spaceDisplayName)).Should(Exit(0))
 
 		Eventually(
-			cf.Cf("push", PrefixedGUID("crds-test-app"), "-p", "../smoke/assets/test-node-app", "--no-start"), // This could be any app
+			cf.Cf("push", PrefixedGUID("crds-test-app"), "-p", "../assets/dorifi", "--no-start"), // This could be any app
 			"20s",
 		).Should(Exit(0))
 	})

tests/crds/run-tests.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+export CRDS_TEST_API_ENDPOINT="${CRDS_TEST_API_ENDPOINT:-https://localhost}"
+export CRDS_TEST_SKIP_SSL="${CRDS_TEST_SKIP_SSL:-true}"
+export CRDS_TEST_CLI_USER="${CRDS_TEST_CLI_USER:-}"
+
+if [[ -z "${CRDS_TEST_CLI_USER:-}" ]]; then
+  export CRDS_TEST_CLI_USER="crd-cli-test-user"
+  "${SCRIPT_DIR}/../../scripts/create-new-user.sh" "$CRDS_TEST_CLI_USER"
+fi
+
+pushd "${SCRIPT_DIR}"
+{
+  go run github.com/onsi/ginkgo/v2/ginkgo
+}
+popd

tests/e2e/e2e_suite_test.go

@@ -302,8 +302,8 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 		// The DEFAULT_APP_BITS_PATH and DEFAULT_APP_RESPONSE environment variables are a workaround to allow e2e tests to run
 		// with a different app in these environments.
 		// See https://github.com/cloudfoundry/korifi/issues/2355 for refactoring ideas
-		DefaultAppBitsFile:      zipAsset(getEnv("DEFAULT_APP_BITS_PATH", "assets/dorifi")),
-		MultiProcessAppBitsFile: zipAsset("assets/multi-process"),
+		DefaultAppBitsFile:      zipAsset(getEnv("DEFAULT_APP_BITS_PATH", "../assets/dorifi")),
+		MultiProcessAppBitsFile: zipAsset("../assets/multi-process"),
 	}
 
 	bs, err := json.Marshal(sharedData)

tests/matchers/jsonpath.go

@@ -29,8 +29,13 @@ func MatchJSONPath(path string, expected any) *JSONPathMatcher {
 }
 
 func (m *JSONPathMatcher) Match(actual interface{}) (bool, error) {
-	bs, ok := actual.([]byte)
-	if !ok {
+	var bs []byte
+	switch a := actual.(type) {
+	case []byte:
+		bs = a
+	case string:
+		bs = []byte(a)
+	default:
 		return false, fmt.Errorf("found %T, expected []byte", actual)
 	}
 

tests/smoke/run-tests.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+export SMOKE_TEST_USER="${SMOKE_TEST_USER:-cf-admin}"
+export SMOKE_TEST_APPS_DOMAIN="${SMOKE_TEST_APPS_DOMAIN:-apps-127-0-0-1.nip.io}"
+export SMOKE_TEST_APP_ROUTE_PROTOCOL="${SMOKE_TEST_APP_ROUTE_PROTOCOL:-https}"
+export SMOKE_TEST_API_ENDPOINT="${SMOKE_TEST_API_ENDPOINT:-https://localhost}"
+export SMOKE_TEST_SKIP_SSL="${SMOKE_TEST_SKIP_SSL:-true}"
+
+pushd "${SCRIPT_DIR}"
+{
+  go run github.com/onsi/ginkgo/v2/ginkgo
+}
+popd

tests/smoke/smoke_suite_test.go

@@ -1,15 +1,82 @@
 package smoke_test
 
 import (
+	"os"
 	"testing"
 	"time"
 
+	"github.com/cloudfoundry/cf-test-helpers/cf"
+	"github.com/cloudfoundry/cf-test-helpers/generator"
 	. "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
+)
+
+const NamePrefix = "cf-on-k8s-smoke"
+
+var (
+	orgName          string
+	spaceName        string
+	appName          string
+	appsDomain       string
+	appRouteProtocol string
 )
 
 func TestSmoke(t *testing.T) {
 	RegisterFailHandler(Fail)
 	SetDefaultEventuallyTimeout(10 * time.Minute)
 	RunSpecs(t, "Smoke Tests Suite")
 }
+
+var _ = BeforeSuite(func() {
+	apiArguments := []string{"api", GetRequiredEnvVar("SMOKE_TEST_API_ENDPOINT")}
+	skipSSL := os.Getenv("SMOKE_TEST_SKIP_SSL") == "true"
+	if skipSSL {
+		apiArguments = append(apiArguments, "--skip-ssl-validation")
+	}
+
+	Eventually(cf.Cf(apiArguments...)).Should(Exit(0))
+
+	loginAs(GetRequiredEnvVar("SMOKE_TEST_USER"))
+
+	appRouteProtocol = GetDefaultedEnvVar("SMOKE_TEST_APP_ROUTE_PROTOCOL", "https")
+	appsDomain = GetRequiredEnvVar("SMOKE_TEST_APPS_DOMAIN")
+	orgName = generator.PrefixedRandomName(NamePrefix, "org")
+	spaceName = generator.PrefixedRandomName(NamePrefix, "space")
+	appName = generator.PrefixedRandomName(NamePrefix, "app")
+
+	Eventually(cf.Cf("create-org", orgName)).Should(Exit(0))
+	Eventually(cf.Cf("create-space", "-o", orgName, spaceName)).Should(Exit(0))
+	Eventually(cf.Cf("target", "-o", orgName, "-s", spaceName)).Should(Exit(0))
+
+	Eventually(
+		cf.Cf("push", appName, "-p", "../assets/dorifi"),
+	).Should(Exit(0))
+})
+
+var _ = AfterSuite(func() {
+	if CurrentSpecReport().State.Is(types.SpecStateFailed) {
+		printAppReport(appName)
+	}
+
+	if orgName != "" {
+		Eventually(func() *Session {
+			return cf.Cf("delete-org", orgName, "-f").Wait()
+		}, 2*time.Minute, 1*time.Second).Should(Exit(0))
+	}
+})
+
+func GetRequiredEnvVar(envVarName string) string {
+	value, ok := os.LookupEnv(envVarName)
+	Expect(ok).To(BeTrue(), envVarName+" environment variable is required, but was not provided.")
+	return value
+}
+
+func GetDefaultedEnvVar(envVarName, defaultValue string) string {
+	value, ok := os.LookupEnv(envVarName)
+	if !ok {
+		return defaultValue
+	}
+	return value
+}