add app tests

Author: donchev7

app-tests/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+  
+set -m
+  
+npm start &
+./cache-offloader
+  
+fg %1

app-tests/vercel-commerce-cache-offloader.Dockerfile

@@ -0,0 +1,41 @@
+FROM node:16-bullseye-slim AS builder
+
+RUN apt update && apt install -y git wget \
+  && git clone https://github.com/vercel/commerce.git \
+  && cd commerce \
+  && npm install --save-prod \
+  && NODE_ENV="production" npm run build \
+  && wget https://github.com/neurocode-io/cache-offloader/releases/download/v0.1.4/cache-offloader_0.1.4_linux_amd64.tar.gz \
+  && tar -xvf cache-offloader_0.1.4_linux_amd64.tar.gz
+
+
+FROM node:16-bullseye-slim
+
+WORKDIR /app
+
+ENV NODE_ENV="production"
+ENV NEXT_TELEMETRY_DISABLED="1"
+
+COPY --from=builder /commerce/site/public ./public
+COPY --from=builder /commerce/site/.next ./.next
+COPY --from=builder /commerce/node_modules ./node_modules
+COPY --from=builder /commerce/site/package.json ./package.json
+COPY --from=builder /commerce/cache-offloader ./cache-offloader
+COPY entrypoint.sh .
+
+ENV DOWNSTREAM_HOST=http://localhost:3000
+ENV CACHE_SHOULD_HASH_QUERY="true"
+ENV CACHE_STRATEGY=LFU
+ENV CACHE_SIZE_MB=10
+ENV CACHE_STALE_WHILE_REVALIDATE_SEC=60
+ENV SERVER_PORT=8000
+ENV SERVER_STORAGE=memory
+ENV CACHE_IGNORE_ENDPOINTS="/probes/liveness"
+ENV CACHE_IGNORE_ENDPOINTS="/probes/readiness"
+
+RUN chown -R node:node /app
+
+USER node
+EXPOSE 8000
+
+ENTRYPOINT [ "./entrypoint.sh ]

app-tests/vercel-commerce-next-boost.Dockerfile

@@ -0,0 +1,32 @@
+FROM node:16-bullseye-slim AS builder
+
+RUN apt update && apt install -y git \
+  && git clone https://github.com/vercel/commerce.git \
+  && cd commerce \
+  && npm install --save-prod \
+  && npm install @next-boost/next-boost @next-boost/hybrid-disk-cache \
+  && NODE_ENV="production" npm run build \
+  && sed -i 's/next start/next-boost/g' site/package.json
+
+
+
+FROM node:16-bullseye-slim
+
+WORKDIR /app
+
+ENV NODE_ENV="production"
+ENV NEXT_TELEMETRY_DISABLED="1"
+
+COPY --from=builder /commerce/site/public ./public
+COPY --from=builder /commerce/site/.next ./.next
+COPY --from=builder /commerce/node_modules ./node_modules
+COPY --from=builder /commerce/site/package.json ./package.json
+
+RUN chown -R node:node /app
+
+USER node
+
+EXPOSE 3000
+
+
+ENTRYPOINT [ "npm", "start" ]

app-tests/vercel-commerce.Dockerfile

@@ -0,0 +1,29 @@
+FROM node:16-bullseye-slim AS builder
+
+RUN apt update && apt install -y git \
+  && git clone https://github.com/vercel/commerce.git \
+  && cd commerce \
+  && npm install --save-prod \
+  && NODE_ENV="production" npm run build
+
+
+FROM node:16-bullseye-slim
+
+WORKDIR /app
+
+ENV NODE_ENV="production"
+ENV NEXT_TELEMETRY_DISABLED="1"
+
+COPY --from=builder /commerce/site/public ./public
+COPY --from=builder /commerce/site/.next ./.next
+COPY --from=builder /commerce/node_modules ./node_modules
+COPY --from=builder /commerce/site/package.json ./package.json
+
+RUN chown -R node:node /app
+
+USER node
+
+EXPOSE 3000
+
+
+ENTRYPOINT [ "npm", "start" ]

config/config.go

@@ -58,7 +58,7 @@ func New() Config {
 		Size:            getEnvAsFloat("CACHE_SIZE_MB", "10"),
 		IgnorePaths:     getEnvAsSlice("CACHE_IGNORE_ENDPOINTS"),
 		StaleInSeconds:  getEnvAsInt("CACHE_STALE_WHILE_REVALIDATE_SEC", "5"),
-		ShouldHashQuery: getEnvAsBool("CACHE_SHOULD_HASH_QUERY", ""),
+		ShouldHashQuery: getEnvAsBool("CACHE_SHOULD_HASH_QUERY", "true"),
 		HashQueryIgnore: hashQueryIgnoreMap(getEnvAsSlice("CACHE_HASH_QUERY_IGNORE")),
 	}
 

config/helpers.go

@@ -53,7 +53,7 @@ func getEnvAsLogLevel(key string) zerolog.Level {
 func getEnvAsSlice(key string) []string {
 	strSlice, _ := os.LookupEnv(key)
 	if strSlice == "" {
-		log.Panic().Msgf("%s is not set", key)
+		return []string{}
 	}
 
 	return strings.Split(strSlice, ",")

dev.env

@@ -7,11 +7,11 @@ SHUTDOWN_GRACE_PERIOD=30
 
 # CacheConfig
 CACHE_SHOULD_HASH_QUERY="true"
-CACHE_HASH_QUERY_IGNORE=utm,live
+# CACHE_HASH_QUERY_IGNORE=utm,live
 CACHE_STRATEGY=LFU
 CACHE_SIZE_MB=10
 CACHE_STALE_WHILE_REVALIDATE_SEC=60
-CACHE_IGNORE_ENDPOINTS=/status,/health
+# CACHE_IGNORE_ENDPOINTS=/status,/health
 
 # if SERVER_STORAGE=redis
 REDIS_CONNECTION_STRING=redis://:development@localhost:6379/0

pkg/http/server.go

@@ -26,13 +26,15 @@ func RunServer(opts ServerOpts) {
 	mux.Handle("/", newCacheHandler(opts.Cacher, opts.MetricsCollector, opts.Worker, opts.Config.CacheConfig))
 	mux.Handle("/metrics/prometheus", metricsHandler())
 	mux.HandleFunc("/probes/liveness", livenessHandler)
+	mux.HandleFunc("/probes/readiness", readinessHandler(opts.ReadinessChecker))
 
 	for _, path := range opts.Config.CacheConfig.IgnorePaths {
+		if path == "/metrics/prometheus" || path == "/probes/liveness" || path == "/probes/readiness" {
+			continue
+		}
 		mux.HandleFunc(path, forwardHandler(opts.Config.CacheConfig.DownstreamHost))
 	}
 
-	mux.HandleFunc("/probes/readiness", readinessHandler(opts.ReadinessChecker))
-
 	server := &h.Server{
 		Addr:         fmt.Sprintf("0.0.0.0:%s", opts.Config.ServerConfig.Port),
 		Handler:      mux,