This commit is contained in:
s871077
2026-09-11 10:11:09 +08:00
parent e25c995560
commit 58587d19a8
25 changed files with 1643 additions and 54 deletions
+4 -1
View File
@@ -28,7 +28,10 @@
"Bash(git fetch:*)", "Bash(git fetch:*)",
"Bash(command:*)", "Bash(command:*)",
"Bash(timeout:*)", "Bash(timeout:*)",
"Bash(git:*)" "Bash(git:*)",
"Bash(/tmp/windows-amd64/helm.exe template:*)",
"Bash(echo \"exit=$?\")",
"Read(//tmp/**)"
] ]
} }
} }
+38
View File
@@ -0,0 +1,38 @@
# Version control
.git
.gitignore
.github
# Dependencies / build output (rebuilt inside the image)
node_modules
.next
out
build
# Deployment tooling — not needed in the build context
helm
DEPLOY.md
README.md
# Local databases
prisma/dev.db
prisma/dev.db-journal
prisma/*.db
# Secrets: .env holds file:./dev.db, and .env.local / .env.production hold REAL
# Entra secrets and the RDS password. Baking these into a layer would push them
# to JFrog. All runtime env comes from the k8s Secret instead.
.env
.env.*
!.env.production.example
# Editor / tooling noise
.claude
.vscode
.idea
.DS_Store
*.tsbuildinfo
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
+237
View File
@@ -0,0 +1,237 @@
name: CI/CD (dev on branch, prod on tag)
on:
push:
branches:
- dev # build & deploy for dev only
tags:
- "*" # build & deploy for prod only when a tag is pushed
jobs:
setup:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.pick.outputs.matrix }}
steps:
- name: Pick matrix config from ref type
id: pick
shell: bash
run: |
if [[ "${{ github.ref_type }}" == "tag" ]]; then
echo 'matrix={"include":[{"env":"prod","image_name_server":"it-cost-dashboard-server-prod","image_name_db":"it-cost-dashboard-db-prod","latest_tag":"latest-prod","release":"it-cost-dashboard-prod","namespace":"it-cost-dashboard-prod","chart":"./helm","values_file":"./helm/values-prod.yaml"}]}' >> "$GITHUB_OUTPUT"
else
echo 'matrix={"include":[{"env":"dev","image_name_server":"it-cost-dashboard-server-dev","image_name_db":"it-cost-dashboard-db-dev","latest_tag":"latest-dev","release":"it-cost-dashboard-dev","namespace":"it-cost-dashboard-dev","chart":"./helm","values_file":"./helm/values-dev.yaml"}]}' >> "$GITHUB_OUTPUT"
fi
build-and-deploy:
needs: setup
runs-on: ubuntu-latest
strategy:
matrix: ${{ fromJSON(needs.setup.outputs.matrix) }}
# Per-environment group: a dev push must never cancel an in-flight prod
# deploy (the original used a hardcoded "prod" group for both refs).
concurrency:
group: deploy-${{ matrix.env }}
cancel-in-progress: true
env:
# host/repo, e.g. jfrog.trendmicro.com/ameait-it-cost-dashboard
JFROG_REGISTRY: ${{ secrets.JFROG_REGISTRY }}
DOCKER_BUILDKIT: "1"
COMPOSE_DOCKER_CLI_BUILD: "1"
steps:
- name: Checkout (with tags)
uses: actions/checkout@v4
with:
fetch-depth: 0 # IMPORTANT to access tags
- name: Verify tag is on prod branch (main)
id: guard
if: github.ref_type == 'tag'
shell: bash
run: |
git fetch origin main --quiet
if git merge-base --is-ancestor "${{ github.sha }}" origin/main; then
echo "Tag commit is on main. Proceeding with prod deploy."
else
echo "::error::Tag ${GITHUB_REF#refs/tags/} points at a commit not on main. Refusing prod deploy."
exit 1
fi
- name: Set up kubeconfig
run: |
echo "KUBECONFIG=${RUNNER_TEMP}/kubeconfig" >> "$GITHUB_ENV"
echo "${{ secrets.KUBE_CONFIG_DATA }}" | base64 -d > "${RUNNER_TEMP}/kubeconfig"
chmod 600 "${RUNNER_TEMP}/kubeconfig"
- name: Login to JFrog
run: |
# JFROG_REGISTRY is host/repo but `docker login` takes only the host.
JFROG_HOST=$(echo "${JFROG_REGISTRY}" | cut -d'/' -f1)
echo "Logging in to ${JFROG_HOST}"
echo "${{ secrets.JFROG_IDENTITY_TOKEN }}" | docker login "${JFROG_HOST}" \
-u "${{ secrets.JFROG_USERNAME }}" \
--password-stdin
- name: Determine ref type and release tag
id: refinfo
shell: bash
run: |
echo "GITHUB_REF=${GITHUB_REF}"
echo "GITHUB_REF_TYPE=${GITHUB_REF_TYPE:-${{ github.ref_type }}}"
if [[ "${{ github.ref_type }}" == "tag" ]]; then
echo "ref_type=tag" >> $GITHUB_OUTPUT
echo "release_tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_type }}" == "branch" ]]; then
echo "ref_type=branch" >> $GITHUB_OUTPUT
echo "release_tag=" >> $GITHUB_OUTPUT
else
echo "ref_type=unknown" >> $GITHUB_OUTPUT
echo "release_tag=" >> $GITHUB_OUTPUT
fi
- name: Pre-build diagnostics
run: |
echo "Ref: ${GITHUB_REF}"
echo "Ref type: ${{ steps.refinfo.outputs.ref_type }}"
echo "Release tag: ${{ steps.refinfo.outputs.release_tag }}"
echo "Environment: ${{ matrix.env }}"
echo "Server image: ${JFROG_REGISTRY}/${{ matrix.image_name_server }}"
echo "DB image: ${JFROG_REGISTRY}/${{ matrix.image_name_db }}"
docker version
helm version
kubectl version --client
- name: Build & Push server image
run: |
REF_TYPE="${{ steps.refinfo.outputs.ref_type }}"
RELEASE_TAG="${{ steps.refinfo.outputs.release_tag }}"
IMAGE="${JFROG_REGISTRY}/${{ matrix.image_name_server }}"
BUILD_TAG_ARGS=(
-t "${IMAGE}:${{ matrix.latest_tag }}"
-t "${IMAGE}:${{ github.sha }}"
)
if [[ "${REF_TYPE}" == "tag" && -n "${RELEASE_TAG}" ]]; then
BUILD_TAG_ARGS+=( -t "${IMAGE}:${RELEASE_TAG}" )
fi
# AUTH_SECRET is build-time only (Auth.js v5 initializes NextAuth() at
# module load during `next build`). The real secret comes from k8s.
docker build \
-f Dockerfile \
--build-arg AUTH_SECRET=build-placeholder-not-used-at-runtime \
"${BUILD_TAG_ARGS[@]}" \
.
docker push "${IMAGE}:${{ matrix.latest_tag }}"
docker push "${IMAGE}:${{ github.sha }}"
if [[ "${REF_TYPE}" == "tag" && -n "${RELEASE_TAG}" ]]; then
docker push "${IMAGE}:${RELEASE_TAG}"
fi
- name: Build & Push db image
run: |
REF_TYPE="${{ steps.refinfo.outputs.ref_type }}"
RELEASE_TAG="${{ steps.refinfo.outputs.release_tag }}"
IMAGE="${JFROG_REGISTRY}/${{ matrix.image_name_db }}"
BUILD_TAG_ARGS=(
-t "${IMAGE}:${{ matrix.latest_tag }}"
-t "${IMAGE}:${{ github.sha }}"
)
if [[ "${REF_TYPE}" == "tag" && -n "${RELEASE_TAG}" ]]; then
BUILD_TAG_ARGS+=( -t "${IMAGE}:${RELEASE_TAG}" )
fi
docker build \
-f Dockerfile.db \
"${BUILD_TAG_ARGS[@]}" \
.
docker push "${IMAGE}:${{ matrix.latest_tag }}"
docker push "${IMAGE}:${{ github.sha }}"
if [[ "${REF_TYPE}" == "tag" && -n "${RELEASE_TAG}" ]]; then
docker push "${IMAGE}:${RELEASE_TAG}"
fi
- name: Ensure namespace exists
run: |
# `helm --atomic` against a missing namespace fails outright.
kubectl create namespace "${{ matrix.namespace }}" \
--dry-run=client -o yaml | kubectl apply -f -
# ---- DEV DEPLOY (branch dev only) ----
# Deployed by commit SHA, not latest-dev: an immutable tag sidesteps the
# moving-tag + IfNotPresent stale-cache trap and makes `kubectl describe
# pod` show exactly which commit is live.
- name: Deploy DEV with Helm
if: github.ref_type == 'branch' && github.ref == 'refs/heads/dev'
run: |
kubectl get nodes
kubectl get ns
helm upgrade --install "${{ matrix.release }}" "${{ matrix.chart }}" \
-f "${{ matrix.values_file }}" \
--namespace "${{ matrix.namespace }}" \
--set server.image.repository="${JFROG_REGISTRY}/${{ matrix.image_name_server }}" \
--set server.image.tag="${{ github.sha }}" \
--set db.image.repository="${JFROG_REGISTRY}/${{ matrix.image_name_db }}" \
--set db.image.tag="${{ github.sha }}" \
--set-string secrets.authSecret="${{ secrets.AUTH_SECRET_DEV }}" \
--set-string secrets.dbRootPassword="${{ secrets.DB_ROOT_PASSWORD_DEV }}" \
--set-string secrets.localAdminPassword="${{ secrets.LOCAL_ADMIN_PASSWORD_DEV }}" \
--wait --timeout 10m --atomic --debug
# ---- PROD DEPLOY (tag push only) ----
- name: Deploy PROD with Helm
if: github.ref_type == 'tag'
run: |
kubectl get nodes
kubectl get ns
TAG="${GITHUB_REF#refs/tags/}"
if [[ -z "${TAG}" ]]; then
echo "No tag detected; aborting prod deploy."
exit 1
fi
helm upgrade --install "${{ matrix.release }}" "${{ matrix.chart }}" \
-f "${{ matrix.values_file }}" \
--namespace "${{ matrix.namespace }}" \
--set server.image.repository="${JFROG_REGISTRY}/${{ matrix.image_name_server }}" \
--set server.image.tag="${TAG}" \
--set db.image.repository="${JFROG_REGISTRY}/${{ matrix.image_name_db }}" \
--set db.image.tag="${TAG}" \
--set-string secrets.authSecret="${{ secrets.AUTH_SECRET_PROD }}" \
--set-string secrets.dbRootPassword="${{ secrets.DB_ROOT_PASSWORD_PROD }}" \
--set-string secrets.localAdminPassword="${{ secrets.LOCAL_ADMIN_PASSWORD_PROD }}" \
--wait --timeout 10m --atomic --debug
# Strictly redundant with immutable image tags: Helm already rolled the
# pods and --atomic already verified health. Retained as belt-and-braces.
# Scoped to component=server so it does not bounce MySQL every push.
- name: Rollout restart (server only)
if: success() && (github.ref_type == 'branch' || github.ref_type == 'tag')
run: |
kubectl rollout restart deployment \
-l "app.kubernetes.io/instance=${{ matrix.release }},app.kubernetes.io/component=server" \
-n "${{ matrix.namespace }}"
- name: Post-deploy diagnostics (if failure)
if: failure()
run: |
echo "----- Diagnostics -----"
kubectl get deploy,sts,po,svc,ing -n "${{ matrix.namespace }}" -o wide || true
echo "----- PVCs (a Pending PVC = missing gp3 StorageClass; invisible in pod logs) -----"
kubectl get pvc -n "${{ matrix.namespace }}" -o wide || true
echo "----- Events -----"
kubectl get events -n "${{ matrix.namespace }}" --sort-by=.lastTimestamp || true
for p in $(kubectl get po -n "${{ matrix.namespace }}" -o name); do
echo "### $p"
kubectl describe "$p" -n "${{ matrix.namespace }}" || true
kubectl logs "$p" -n "${{ matrix.namespace }}" --all-containers --tail=200 || true
done
+86
View File
@@ -0,0 +1,86 @@
# syntax=docker/dockerfile:1
#
# Next.js 15 (standalone) + Prisma server image for the IT Cost Dashboard.
#
# Debian slim, NOT Alpine: better-sqlite3 (a devDependency native addon) ships
# glibc prebuilds and would otherwise compile from source, and Prisma's query
# engine needs the musl-specific binaryTarget on Alpine. ~40 MB more for two
# fewer traps.
# ---------------------------------------------------------------------------
# Stage 1: deps — install node_modules once, including native addons.
# ---------------------------------------------------------------------------
FROM node:20-bookworm-slim AS deps
WORKDIR /app
# python3/make/g++ are the better-sqlite3 source-build fallback; openssl is what
# the Prisma postinstall links its query engine against. All discarded with this
# stage.
RUN apt-get update && apt-get install -y --no-install-recommends \
openssl ca-certificates python3 make g++ \
&& rm -rf /var/lib/apt/lists/*
COPY package.json package-lock.json ./
# No --ignore-scripts: Prisma's postinstall is what unpacks the query engine.
RUN npm ci
# ---------------------------------------------------------------------------
# Stage 2: builder — prisma generate (prod/mysql schema) + next build.
# ---------------------------------------------------------------------------
FROM node:20-bookworm-slim AS builder
WORKDIR /app
RUN apt-get update && apt-get install -y --no-install-recommends \
openssl ca-certificates \
&& rm -rf /var/lib/apt/lists/*
COPY --from=deps /app/node_modules ./node_modules
COPY . .
# Auth.js v5 constructs NextAuth() at module init (src/auth.ts), which can throw
# without a secret while pre-rendering. This placeholder is build-time only —
# the real AUTH_SECRET arrives at runtime from the k8s Secret.
ARG AUTH_SECRET=build-placeholder-not-used-at-runtime
ENV AUTH_SECRET=${AUTH_SECRET}
ENV NEXT_TELEMETRY_DISABLED=1
ENV NODE_ENV=production
# No DATABASE_URL needed: every page is "use client" and fetches /api/* at
# runtime, and `await auth()` in the layout returns null harmlessly.
# build:prod == prisma generate --schema=prisma/prod/schema.prisma && next build
RUN npm run build:prod
# ---------------------------------------------------------------------------
# Stage 3: runner — standalone output only, non-root.
# ---------------------------------------------------------------------------
FROM node:20-bookworm-slim AS runner
WORKDIR /app
# openssl is required at runtime: the Prisma query engine links against it.
RUN apt-get update && apt-get install -y --no-install-recommends \
openssl ca-certificates \
&& rm -rf /var/lib/apt/lists/*
RUN groupadd --system --gid 1001 nodejs \
&& useradd --system --uid 1001 --gid nodejs nextjs
# .next/standalone ships its own traced node_modules — do NOT copy the
# builder's. .next/static is NOT part of standalone and must come separately or
# every CSS/JS chunk 404s. config/ is read at runtime by lookupRole()
# (src/lib/authz.ts) via process.cwd() once SSO is re-enabled.
# NOTE: this repo has no public/ directory; adding a COPY for it would fail.
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
COPY --from=builder --chown=nextjs:nodejs /app/config ./config
USER nextjs
ENV HOSTNAME=0.0.0.0
ENV PORT=3000
ENV NODE_ENV=production
ENV NEXT_TELEMETRY_DISABLED=1
EXPOSE 3000
# Standalone replaces `next start`.
CMD ["node", "server.js"]
+16
View File
@@ -0,0 +1,16 @@
# MySQL 8 with the production schema + demo seed data baked in.
#
# TRAP: /docker-entrypoint-initdb.d/* runs ONLY when the datadir is empty. On a
# redeploy against an existing gp3 PVC these scripts are skipped — existing data
# survives (correct) but schema changes are NOT applied. Future schema changes
# need `npm run prod:migrate` run as a separate Job; 01-schema.sql bootstraps
# the _prisma_migrations table so that stays possible.
FROM mysql:8
ENV MYSQL_DATABASE=it_cost_dashboard
# MYSQL_ROOT_PASSWORD is deliberately NOT baked in — it arrives as a pod env var
# from the Helm-rendered k8s Secret.
COPY prisma/prod/01-schema.sql /docker-entrypoint-initdb.d/01-schema.sql
COPY prisma/seed.sql /docker-entrypoint-initdb.d/02-seed.sql
+6
View File
@@ -0,0 +1,6 @@
apiVersion: v2
name: it-cost-dashboard
description: Global IT Cost Dashboard — Next.js server + MySQL 8 on self-built k8s
type: application
version: 0.1.0
appVersion: "0.1.0"
+56
View File
@@ -0,0 +1,56 @@
{{/* Chart name, overridable. */}}
{{- define "it-cost-dashboard.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}
{{/*
Fully qualified app name. Kept short: it prefixes the StatefulSet name, which
in turn prefixes pod names and the generated PVC names.
*/}}
{{- define "it-cost-dashboard.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- end }}
{{- define "it-cost-dashboard.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}
{{/* Labels applied to every object. */}}
{{- define "it-cost-dashboard.labels" -}}
helm.sh/chart: {{ include "it-cost-dashboard.chart" . }}
{{ include "it-cost-dashboard.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}
{{- define "it-cost-dashboard.selectorLabels" -}}
app.kubernetes.io/name: {{ include "it-cost-dashboard.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{/*
Component-scoped labels. The workflow's rollout-restart selects on
app.kubernetes.io/component=server so it does not bounce MySQL.
Usage: {{ include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "server") }}
*/}}
{{- define "it-cost-dashboard.componentLabels" -}}
{{ include "it-cost-dashboard.labels" .ctx }}
app.kubernetes.io/component: {{ .component }}
{{- end }}
{{- define "it-cost-dashboard.componentSelectorLabels" -}}
{{ include "it-cost-dashboard.selectorLabels" .ctx }}
app.kubernetes.io/component: {{ .component }}
{{- end }}
{{/* ClusterIP Service name for MySQL — the DATABASE_URL host and the
wait-for-db initContainer target. */}}
{{- define "it-cost-dashboard.dbServiceName" -}}
{{- printf "%s-db" (include "it-cost-dashboard.fullname" .) }}
{{- end }}
+13
View File
@@ -0,0 +1,13 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ include "it-cost-dashboard.fullname" . }}-db-secret
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "db") | nindent 4 }}
type: Opaque
stringData:
# Supplied by the workflow: --set-string secrets.dbRootPassword=...
# Constrained to [A-Za-z0-9-]: it is interpolated verbatim into DATABASE_URL
# in server-secret.yaml and Helm cannot URL-encode.
MYSQL_ROOT_PASSWORD: {{ required "secrets.dbRootPassword is required" .Values.secrets.dbRootPassword | quote }}
MYSQL_DATABASE: {{ .Values.db.database | quote }}
+40
View File
@@ -0,0 +1,40 @@
{{/*
Headless service: stable per-pod DNS for the StatefulSet
(<fullname>-db-0.<fullname>-db-headless). Required by the StatefulSet spec.
*/}}
apiVersion: v1
kind: Service
metadata:
name: {{ include "it-cost-dashboard.fullname" . }}-db-headless
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "db") | nindent 4 }}
spec:
clusterIP: None
ports:
- name: mysql
port: {{ .Values.db.port }}
targetPort: mysql
protocol: TCP
selector:
{{- include "it-cost-dashboard.componentSelectorLabels" (dict "ctx" . "component" "db") | nindent 4 }}
---
{{/*
Normal ClusterIP service. This is what DATABASE_URL and the wait-for-db
initContainer target — simpler than per-pod DNS and sufficient for a
single-primary MySQL.
*/}}
apiVersion: v1
kind: Service
metadata:
name: {{ include "it-cost-dashboard.dbServiceName" . }}
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "db") | nindent 4 }}
spec:
type: ClusterIP
ports:
- name: mysql
port: {{ .Values.db.port }}
targetPort: mysql
protocol: TCP
selector:
{{- include "it-cost-dashboard.componentSelectorLabels" (dict "ctx" . "component" "db") | nindent 4 }}
+97
View File
@@ -0,0 +1,97 @@
{{/*
MySQL as a StatefulSet, not a Deployment: volumeClaimTemplates guarantees a
single writer on the gp3 volume, the pod name is stable, and the PVC survives
`helm uninstall` so an accidental teardown does not destroy data.
*/}}
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "it-cost-dashboard.fullname" . }}-db
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "db") | nindent 4 }}
spec:
# Single-primary MySQL. NEVER raise this without real clustering — two pods
# would fight over one RWO volume / diverge.
replicas: 1
serviceName: {{ include "it-cost-dashboard.fullname" . }}-db-headless
selector:
matchLabels:
{{- include "it-cost-dashboard.componentSelectorLabels" (dict "ctx" . "component" "db") | nindent 6 }}
template:
metadata:
labels:
{{- include "it-cost-dashboard.componentSelectorLabels" (dict "ctx" . "component" "db") | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: mysql
image: "{{ required "db.image.repository is required" .Values.db.image.repository }}:{{ required "db.image.tag is required" .Values.db.image.tag }}"
imagePullPolicy: {{ .Values.db.image.pullPolicy }}
ports:
- name: mysql
containerPort: {{ .Values.db.port }}
protocol: TCP
env:
- name: MYSQL_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "it-cost-dashboard.fullname" . }}-db-secret
key: MYSQL_ROOT_PASSWORD
- name: MYSQL_DATABASE
valueFrom:
secretKeyRef:
name: {{ include "it-cost-dashboard.fullname" . }}-db-secret
key: MYSQL_DATABASE
# Generous initialDelay: the first boot runs both
# /docker-entrypoint-initdb.d scripts (schema + 430 seed rows) before
# opening TCP for real.
readinessProbe:
exec:
command:
- bash
- -c
- 'mysqladmin ping -u root -p"${MYSQL_ROOT_PASSWORD}" --silent'
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 12
livenessProbe:
exec:
command:
- bash
- -c
- 'mysqladmin ping -u root -p"${MYSQL_ROOT_PASSWORD}" --silent'
initialDelaySeconds: 120
periodSeconds: 20
timeoutSeconds: 5
failureThreshold: 6
volumeMounts:
- name: mysql-data
mountPath: /var/lib/mysql
resources:
{{- toYaml .Values.db.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
volumeClaimTemplates:
- metadata:
name: mysql-data
spec:
accessModes:
- ReadWriteOnce
storageClassName: {{ .Values.db.storage.storageClassName }}
resources:
requests:
storage: {{ .Values.db.storage.size }}
+90
View File
@@ -0,0 +1,90 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "it-cost-dashboard.fullname" . }}-server
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "server") | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "it-cost-dashboard.componentSelectorLabels" (dict "ctx" . "component" "server") | nindent 6 }}
template:
metadata:
labels:
{{- include "it-cost-dashboard.componentSelectorLabels" (dict "ctx" . "component" "server") | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
initContainers:
# Without this the server starts before MySQL, Prisma throws, the pod
# CrashLoopBackOffs, and `helm --atomic --wait` rolls the whole release
# back.
- name: wait-for-db
image: busybox:1.36
command:
- sh
- -c
- |
until nc -z {{ include "it-cost-dashboard.dbServiceName" . }} {{ .Values.db.port }}; do
echo "waiting for {{ include "it-cost-dashboard.dbServiceName" . }}:{{ .Values.db.port }}..."
sleep 3
done
echo "database is accepting connections"
containers:
- name: server
image: "{{ required "server.image.repository is required" .Values.server.image.repository }}:{{ required "server.image.tag is required" .Values.server.image.tag }}"
imagePullPolicy: {{ .Values.server.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.server.service.port }}
protocol: TCP
env:
- name: NODE_ENV
value: "production"
- name: NEXT_TELEMETRY_DISABLED
value: "1"
envFrom:
- secretRef:
name: {{ include "it-cost-dashboard.fullname" . }}-server-secret
# Readiness hits a DB-backed route on purpose: a pod only takes
# traffic once MySQL is reachable AND the schema is right.
# NOTE (SSO restore): /api/years will 307 to /login once the
# middleware is back on, which is non-2xx — add a public /api/health
# route and probe that instead.
readinessProbe:
httpGet:
path: /api/years
port: http
initialDelaySeconds: 10
periodSeconds: 5
timeoutSeconds: 3
# 12 x 5s tolerates a slow first-boot seed.
failureThreshold: 12
# Liveness deliberately differs: /login needs no DB, so a transient
# MySQL blip makes pods unready (traffic stops) without kubelet
# killing them in a restart storm.
livenessProbe:
httpGet:
path: /login
port: http
initialDelaySeconds: 30
periodSeconds: 20
timeoutSeconds: 5
failureThreshold: 6
resources:
{{- toYaml .Values.server.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
+24
View File
@@ -0,0 +1,24 @@
{{- if .Values.ingress.enabled }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "it-cost-dashboard.fullname" . }}-server
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "server") | nindent 4 }}
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: "10m"
spec:
ingressClassName: {{ .Values.ingress.className }}
# HTTP only for now — no TLS block until certs are issued for these hosts.
rules:
- host: {{ required "ingress.host is required" .Values.ingress.host | quote }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "it-cost-dashboard.fullname" . }}-server
port:
name: http
{{- end }}
+28
View File
@@ -0,0 +1,28 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ include "it-cost-dashboard.fullname" . }}-server-secret
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "server") | nindent 4 }}
type: Opaque
stringData:
# Built in-template from the db root password + the db ClusterIP Service name.
# TRAP: Helm has no URL-encode function, so secrets.dbRootPassword must avoid
# URL-reserved characters (@ : / # ? % + & and space) — keep it [A-Za-z0-9-].
DATABASE_URL: "mysql://root:{{ required "secrets.dbRootPassword is required" .Values.secrets.dbRootPassword }}@{{ include "it-cost-dashboard.dbServiceName" . }}:{{ .Values.db.port }}/{{ .Values.db.database }}"
# Auth.js JWT signing key. Required at runtime even with SSO commented out.
AUTH_SECRET: {{ required "secrets.authSecret is required" .Values.secrets.authSecret | quote }}
AUTH_TRUST_HOST: "true"
# Break-glass local login. Empty disables it entirely (src/auth.ts fails closed).
LOCAL_ADMIN_PASSWORD: {{ .Values.secrets.localAdminPassword | default "" | quote }}
# --- SSO DISABLED FOR CICD TEST ---
# Kept present but optional. To restore SSO: supply these values from the
# per-env GitHub secrets and swap `| default ""` for `| required "..."`.
AUTH_MICROSOFT_ENTRA_ID_ID: {{ .Values.secrets.entraClientId | default "" | quote }}
AUTH_MICROSOFT_ENTRA_ID_SECRET: {{ .Values.secrets.entraClientSecret | default "" | quote }}
AUTH_MICROSOFT_ENTRA_ID_ISSUER: {{ .Values.secrets.entraIssuer | default "" | quote }}
AUTH_URL: {{ .Values.secrets.authUrl | default "" | quote }}
# --- END SSO DISABLED ---
+15
View File
@@ -0,0 +1,15 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "it-cost-dashboard.fullname" . }}-server
labels:
{{- include "it-cost-dashboard.componentLabels" (dict "ctx" . "component" "server") | nindent 4 }}
spec:
type: {{ .Values.server.service.type }}
ports:
- name: http
port: {{ .Values.server.service.port }}
targetPort: http
protocol: TCP
selector:
{{- include "it-cost-dashboard.componentSelectorLabels" (dict "ctx" . "component" "server") | nindent 4 }}
+34
View File
@@ -0,0 +1,34 @@
# dev overrides. Image tags come from the workflow (--set ...image.tag=<sha>).
replicaCount: 1
server:
image:
repository: jfrog.trendmicro.com/ameait-it-cost-dashboard/it-cost-dashboard-server-dev
resources:
requests:
cpu: 100m
memory: 256Mi
limits:
cpu: 500m
memory: 512Mi
db:
image:
repository: jfrog.trendmicro.com/ameait-it-cost-dashboard/it-cost-dashboard-db-dev
storage:
size: 5Gi
storageClassName: gp3
resources:
requests:
cpu: 100m
memory: 512Mi
limits:
cpu: 1
memory: 1Gi
ingress:
enabled: true
className: nginx
# TODO: point this at a hostname resolving to the ingress-nginx external IP.
host: it-cost-dashboard-dev.example.com
+34
View File
@@ -0,0 +1,34 @@
# prod overrides. Image tags come from the workflow (--set ...image.tag=<gitTag>).
replicaCount: 2
server:
image:
repository: jfrog.trendmicro.com/ameait-it-cost-dashboard/it-cost-dashboard-server-prod
resources:
requests:
cpu: 250m
memory: 512Mi
limits:
cpu: 1
memory: 1Gi
db:
image:
repository: jfrog.trendmicro.com/ameait-it-cost-dashboard/it-cost-dashboard-db-prod
storage:
size: 20Gi
storageClassName: gp3
resources:
requests:
cpu: 250m
memory: 1Gi
limits:
cpu: 2
memory: 2Gi
ingress:
enabled: true
className: nginx
# TODO: point this at a hostname resolving to the ingress-nginx external IP.
host: it-cost-dashboard.example.com
+67
View File
@@ -0,0 +1,67 @@
# Base defaults. Per-environment overrides live in values-dev.yaml /
# values-prod.yaml; image TAGS are always supplied by the CI workflow via --set
# (immutable: commit SHA on dev, git tag on prod) and are never pinned here.
replicaCount: 1
server:
image:
repository: ""
tag: ""
pullPolicy: IfNotPresent
service:
type: ClusterIP
port: 3000
resources:
requests:
cpu: 100m
memory: 256Mi
limits:
cpu: 500m
memory: 512Mi
db:
image:
repository: ""
tag: ""
pullPolicy: IfNotPresent
port: 3306
database: it_cost_dashboard
storage:
size: 5Gi
storageClassName: gp3
resources:
requests:
cpu: 100m
memory: 512Mi
limits:
cpu: 1
memory: 1Gi
ingress:
enabled: true
className: nginx
host: "" # required per-env
secrets:
authSecret: "" # from GitHub secret AUTH_SECRET_<ENV>
# MySQL root password. MUST be [A-Za-z0-9-] only — it is interpolated into
# DATABASE_URL and Helm has no URL-encode function.
dbRootPassword: "" # from GitHub secret DB_ROOT_PASSWORD_<ENV>
# Optional; empty disables local login entirely (src/auth.ts fails closed).
localAdminPassword: ""
# --- SSO restore: set these (and swap `default ""` for `required` in
# templates/server-secret.yaml) when Entra ID is re-enabled ---
# entraClientId: ""
# entraClientSecret: ""
# entraIssuer: ""
# authUrl: ""
# Pre-created manually, once per namespace (see the deploy notes). Not templated:
# the kubelet needs it independently of Helm.
imagePullSecrets:
- name: jfrog-registry-creds
nodeSelector: {}
tolerations: []
affinity: {}
+5 -1
View File
@@ -1,4 +1,8 @@
/** @type {import('next').NextConfig} */ /** @type {import('next').NextConfig} */
const nextConfig = {}; const nextConfig = {
// Emit .next/standalone (a self-contained server.js + traced node_modules) so
// the Docker runtime stage stays small and needs no `npm install`.
output: "standalone",
};
export default nextConfig; export default nextConfig;
+149
View File
@@ -0,0 +1,149 @@
// Emits prisma/seed.sql — the plain-SQL twin of prisma/seed.ts, for baking into
// the MySQL image (see Dockerfile.db). 275 SubCostItem rows are not hand-
// writable, and the container has no Node/Prisma to run seed.ts with.
//
// node prisma/generate-seed-sql.mjs > prisma/seed.sql
//
// The constants and arithmetic below mirror prisma/seed.ts verbatim. If seed.ts
// changes, change them here too and regenerate.
const REGIONS = ["AMEA IT", "EMEA IT", "NABU IT", "PH IT", "JP IT"];
const YEARS = [2022, 2023, 2024, 2025, 2026];
const ITEMS = [
{
name: "Cloud Hosting",
subs: [
{ name: "Compute (VMs)", base: 40000 },
{ name: "Storage", base: 18000 },
{ name: "Networking / Egress", base: 9000 },
],
},
{
name: "Software Licenses",
subs: [
{ name: "Productivity Suite", base: 22000 },
{ name: "Design Tools", base: 8000 },
],
},
{
name: "Security Tools",
subs: [
{ name: "Endpoint Protection", base: 15000 },
{ name: "SIEM", base: 20000 },
{ name: "Vulnerability Scanning", base: 6000 },
],
},
{
name: "Support & Maintenance",
subs: [{ name: "Vendor Support Contract", base: 30000 }],
},
{
name: "Network Infra",
subs: [
{ name: "Circuits / Bandwidth", base: 25000 },
{ name: "Hardware Refresh", base: 12000 },
],
},
];
const REGION_WEIGHT = {
"NABU IT": 1.4,
"EMEA IT": 1.2,
"AMEA IT": 1.0,
"JP IT": 0.9,
"PH IT": 0.7,
};
const REGION_AI = {
"NABU IT": { base: 12, step: 6 },
"EMEA IT": { base: 10, step: 5 },
"AMEA IT": { base: 8, step: 5 },
"JP IT": { base: 15, step: 4 },
"PH IT": { base: 6, step: 4 },
};
function yearFactor(year) {
return Math.pow(1.08, year - 2022);
}
// Fixed so regenerating yields a byte-identical file (empty diff).
const TS = "2026-01-01 00:00:00.000";
function q(s) {
return `'${String(s).replace(/\\/g, "\\\\").replace(/'/g, "''")}'`;
}
const yearRows = YEARS.map((y) => ` (${y})`);
const costRows = [];
const subRows = [];
const pctRows = [];
let costId = 0;
let subId = 0;
let pctId = 0;
for (const region of REGIONS) {
const weight = REGION_WEIGHT[region];
for (const year of YEARS) {
const yf = yearFactor(year);
for (const item of ITEMS) {
costId += 1;
costRows.push(
` (${costId},${q(item.name)},${q(region)},${year},${q(TS)},${q(TS)})`
);
for (const s of item.subs) {
subId += 1;
const subCost = Math.round((s.base * weight * yf) / 100) * 100;
subRows.push(` (${subId},${q(s.name)},${subCost},${costId})`);
}
}
}
}
for (const region of REGIONS) {
const ai = REGION_AI[region];
for (const year of YEARS) {
pctId += 1;
const pct = Math.min(60, ai.base + (year - 2022) * ai.step);
pctRows.push(` (${pctId},${q(region)},${year},${pct})`);
}
}
const out = [];
out.push("-- GENERATED FILE — do not edit by hand.");
out.push("-- Regenerate with: node prisma/generate-seed-sql.mjs > prisma/seed.sql");
out.push(
`-- Rows: CostItem=${costId}, SubCostItem=${subId}, TrendAiPercentage=${pctId}, Year=${YEARS.length}`
);
out.push("");
// Explicit IDs mean the FK targets are known up front; disabling the check lets
// the inserts run in any order and keeps the file order-independent.
out.push("SET FOREIGN_KEY_CHECKS=0;");
out.push("");
out.push("INSERT INTO `Year` (`year`) VALUES");
out.push(yearRows.join(",\n") + ";");
out.push("");
out.push(
"INSERT INTO `CostItem` (`id`,`name`,`region`,`year`,`createdAt`,`updatedAt`) VALUES"
);
out.push(costRows.join(",\n") + ";");
out.push("");
out.push("INSERT INTO `SubCostItem` (`id`,`name`,`subCost`,`costItemId`) VALUES");
out.push(subRows.join(",\n") + ";");
out.push("");
out.push(
"INSERT INTO `TrendAiPercentage` (`id`,`region`,`year`,`percentage`) VALUES"
);
out.push(pctRows.join(",\n") + ";");
out.push("");
// Explicit IDs leave AUTO_INCREMENT at 1 in some engines/versions; reset it or
// the first app-side insert collides with a seeded row.
out.push(`ALTER TABLE \`CostItem\` AUTO_INCREMENT = ${costId + 1};`);
out.push(`ALTER TABLE \`SubCostItem\` AUTO_INCREMENT = ${subId + 1};`);
out.push(`ALTER TABLE \`TrendAiPercentage\` AUTO_INCREMENT = ${pctId + 1};`);
out.push("");
out.push("SET FOREIGN_KEY_CHECKS=1;");
out.push("");
process.stdout.write(out.join("\n"));
+75
View File
@@ -0,0 +1,75 @@
-- Schema bootstrap for the containerized MySQL 8 pod (see Dockerfile.db).
-- Runs as /docker-entrypoint-initdb.d/01-schema.sql, i.e. ONLY on a first boot
-- against an empty datadir.
--
-- Body below is verbatim from:
-- prisma/prod/migrations/20260729000000_init/migration.sql
-- Do not edit that file — it stays the source of truth.
-- ---------------------------------------------------------------------------
-- Prisma migration bookkeeping.
-- The raw migration SQL creates no _prisma_migrations table, so a later
-- `npm run prod:migrate` would try to re-apply 20260729000000_init and fail
-- with "table already exists". Recording it as applied up front keeps future
-- migrations working against this volume.
-- ---------------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `_prisma_migrations` (
`id` VARCHAR(36) NOT NULL,
`checksum` VARCHAR(64) NOT NULL,
`finished_at` DATETIME(3) NULL,
`migration_name` VARCHAR(255) NOT NULL,
`logs` TEXT NULL,
`rolled_back_at` DATETIME(3) NULL,
`started_at` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
`applied_steps_count` INT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
INSERT INTO `_prisma_migrations`
(`id`,`checksum`,`finished_at`,`migration_name`,`started_at`,`applied_steps_count`)
VALUES (UUID(),'bootstrapped-by-dockerfile-db',NOW(3),'20260729000000_init',NOW(3),1);
-- CreateTable
CREATE TABLE `CostItem` (
`id` INTEGER NOT NULL AUTO_INCREMENT,
`name` VARCHAR(191) NOT NULL,
`region` VARCHAR(191) NOT NULL,
`year` INTEGER NOT NULL,
`createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
`updatedAt` DATETIME(3) NOT NULL,
INDEX `CostItem_region_year_idx`(`region`, `year`),
PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- CreateTable
CREATE TABLE `SubCostItem` (
`id` INTEGER NOT NULL AUTO_INCREMENT,
`name` VARCHAR(191) NOT NULL,
`subCost` DOUBLE NOT NULL,
`costItemId` INTEGER NOT NULL,
INDEX `SubCostItem_costItemId_idx`(`costItemId`),
PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- CreateTable
CREATE TABLE `TrendAiPercentage` (
`id` INTEGER NOT NULL AUTO_INCREMENT,
`region` VARCHAR(191) NOT NULL,
`year` INTEGER NOT NULL,
`percentage` DOUBLE NOT NULL,
UNIQUE INDEX `TrendAiPercentage_region_year_key`(`region`, `year`),
PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- CreateTable
CREATE TABLE `Year` (
`year` INTEGER NOT NULL,
PRIMARY KEY (`year`)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-- AddForeignKey
ALTER TABLE `SubCostItem` ADD CONSTRAINT `SubCostItem_costItemId_fkey` FOREIGN KEY (`costItemId`) REFERENCES `CostItem`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+449
View File
@@ -0,0 +1,449 @@
-- GENERATED FILE — do not edit by hand.
-- Regenerate with: node prisma/generate-seed-sql.mjs > prisma/seed.sql
-- Rows: CostItem=125, SubCostItem=275, TrendAiPercentage=25, Year=5
SET FOREIGN_KEY_CHECKS=0;
INSERT INTO `Year` (`year`) VALUES
(2022),
(2023),
(2024),
(2025),
(2026);
INSERT INTO `CostItem` (`id`,`name`,`region`,`year`,`createdAt`,`updatedAt`) VALUES
(1,'Cloud Hosting','AMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(2,'Software Licenses','AMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(3,'Security Tools','AMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(4,'Support & Maintenance','AMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(5,'Network Infra','AMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(6,'Cloud Hosting','AMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(7,'Software Licenses','AMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(8,'Security Tools','AMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(9,'Support & Maintenance','AMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(10,'Network Infra','AMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(11,'Cloud Hosting','AMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(12,'Software Licenses','AMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(13,'Security Tools','AMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(14,'Support & Maintenance','AMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(15,'Network Infra','AMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(16,'Cloud Hosting','AMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(17,'Software Licenses','AMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(18,'Security Tools','AMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(19,'Support & Maintenance','AMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(20,'Network Infra','AMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(21,'Cloud Hosting','AMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(22,'Software Licenses','AMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(23,'Security Tools','AMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(24,'Support & Maintenance','AMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(25,'Network Infra','AMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(26,'Cloud Hosting','EMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(27,'Software Licenses','EMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(28,'Security Tools','EMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(29,'Support & Maintenance','EMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(30,'Network Infra','EMEA IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(31,'Cloud Hosting','EMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(32,'Software Licenses','EMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(33,'Security Tools','EMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(34,'Support & Maintenance','EMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(35,'Network Infra','EMEA IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(36,'Cloud Hosting','EMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(37,'Software Licenses','EMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(38,'Security Tools','EMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(39,'Support & Maintenance','EMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(40,'Network Infra','EMEA IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(41,'Cloud Hosting','EMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(42,'Software Licenses','EMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(43,'Security Tools','EMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(44,'Support & Maintenance','EMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(45,'Network Infra','EMEA IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(46,'Cloud Hosting','EMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(47,'Software Licenses','EMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(48,'Security Tools','EMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(49,'Support & Maintenance','EMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(50,'Network Infra','EMEA IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(51,'Cloud Hosting','NABU IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(52,'Software Licenses','NABU IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(53,'Security Tools','NABU IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(54,'Support & Maintenance','NABU IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(55,'Network Infra','NABU IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(56,'Cloud Hosting','NABU IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(57,'Software Licenses','NABU IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(58,'Security Tools','NABU IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(59,'Support & Maintenance','NABU IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(60,'Network Infra','NABU IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(61,'Cloud Hosting','NABU IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(62,'Software Licenses','NABU IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(63,'Security Tools','NABU IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(64,'Support & Maintenance','NABU IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(65,'Network Infra','NABU IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(66,'Cloud Hosting','NABU IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(67,'Software Licenses','NABU IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(68,'Security Tools','NABU IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(69,'Support & Maintenance','NABU IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(70,'Network Infra','NABU IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(71,'Cloud Hosting','NABU IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(72,'Software Licenses','NABU IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(73,'Security Tools','NABU IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(74,'Support & Maintenance','NABU IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(75,'Network Infra','NABU IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(76,'Cloud Hosting','PH IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(77,'Software Licenses','PH IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(78,'Security Tools','PH IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(79,'Support & Maintenance','PH IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(80,'Network Infra','PH IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(81,'Cloud Hosting','PH IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(82,'Software Licenses','PH IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(83,'Security Tools','PH IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(84,'Support & Maintenance','PH IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(85,'Network Infra','PH IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(86,'Cloud Hosting','PH IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(87,'Software Licenses','PH IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(88,'Security Tools','PH IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(89,'Support & Maintenance','PH IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(90,'Network Infra','PH IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(91,'Cloud Hosting','PH IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(92,'Software Licenses','PH IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(93,'Security Tools','PH IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(94,'Support & Maintenance','PH IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(95,'Network Infra','PH IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(96,'Cloud Hosting','PH IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(97,'Software Licenses','PH IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(98,'Security Tools','PH IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(99,'Support & Maintenance','PH IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(100,'Network Infra','PH IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(101,'Cloud Hosting','JP IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(102,'Software Licenses','JP IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(103,'Security Tools','JP IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(104,'Support & Maintenance','JP IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(105,'Network Infra','JP IT',2022,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(106,'Cloud Hosting','JP IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(107,'Software Licenses','JP IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(108,'Security Tools','JP IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(109,'Support & Maintenance','JP IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(110,'Network Infra','JP IT',2023,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(111,'Cloud Hosting','JP IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(112,'Software Licenses','JP IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(113,'Security Tools','JP IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(114,'Support & Maintenance','JP IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(115,'Network Infra','JP IT',2024,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(116,'Cloud Hosting','JP IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(117,'Software Licenses','JP IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(118,'Security Tools','JP IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(119,'Support & Maintenance','JP IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(120,'Network Infra','JP IT',2025,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(121,'Cloud Hosting','JP IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(122,'Software Licenses','JP IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(123,'Security Tools','JP IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(124,'Support & Maintenance','JP IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000'),
(125,'Network Infra','JP IT',2026,'2026-01-01 00:00:00.000','2026-01-01 00:00:00.000');
INSERT INTO `SubCostItem` (`id`,`name`,`subCost`,`costItemId`) VALUES
(1,'Compute (VMs)',40000,1),
(2,'Storage',18000,1),
(3,'Networking / Egress',9000,1),
(4,'Productivity Suite',22000,2),
(5,'Design Tools',8000,2),
(6,'Endpoint Protection',15000,3),
(7,'SIEM',20000,3),
(8,'Vulnerability Scanning',6000,3),
(9,'Vendor Support Contract',30000,4),
(10,'Circuits / Bandwidth',25000,5),
(11,'Hardware Refresh',12000,5),
(12,'Compute (VMs)',43200,6),
(13,'Storage',19400,6),
(14,'Networking / Egress',9700,6),
(15,'Productivity Suite',23800,7),
(16,'Design Tools',8600,7),
(17,'Endpoint Protection',16200,8),
(18,'SIEM',21600,8),
(19,'Vulnerability Scanning',6500,8),
(20,'Vendor Support Contract',32400,9),
(21,'Circuits / Bandwidth',27000,10),
(22,'Hardware Refresh',13000,10),
(23,'Compute (VMs)',46700,11),
(24,'Storage',21000,11),
(25,'Networking / Egress',10500,11),
(26,'Productivity Suite',25700,12),
(27,'Design Tools',9300,12),
(28,'Endpoint Protection',17500,13),
(29,'SIEM',23300,13),
(30,'Vulnerability Scanning',7000,13),
(31,'Vendor Support Contract',35000,14),
(32,'Circuits / Bandwidth',29200,15),
(33,'Hardware Refresh',14000,15),
(34,'Compute (VMs)',50400,16),
(35,'Storage',22700,16),
(36,'Networking / Egress',11300,16),
(37,'Productivity Suite',27700,17),
(38,'Design Tools',10100,17),
(39,'Endpoint Protection',18900,18),
(40,'SIEM',25200,18),
(41,'Vulnerability Scanning',7600,18),
(42,'Vendor Support Contract',37800,19),
(43,'Circuits / Bandwidth',31500,20),
(44,'Hardware Refresh',15100,20),
(45,'Compute (VMs)',54400,21),
(46,'Storage',24500,21),
(47,'Networking / Egress',12200,21),
(48,'Productivity Suite',29900,22),
(49,'Design Tools',10900,22),
(50,'Endpoint Protection',20400,23),
(51,'SIEM',27200,23),
(52,'Vulnerability Scanning',8200,23),
(53,'Vendor Support Contract',40800,24),
(54,'Circuits / Bandwidth',34000,25),
(55,'Hardware Refresh',16300,25),
(56,'Compute (VMs)',48000,26),
(57,'Storage',21600,26),
(58,'Networking / Egress',10800,26),
(59,'Productivity Suite',26400,27),
(60,'Design Tools',9600,27),
(61,'Endpoint Protection',18000,28),
(62,'SIEM',24000,28),
(63,'Vulnerability Scanning',7200,28),
(64,'Vendor Support Contract',36000,29),
(65,'Circuits / Bandwidth',30000,30),
(66,'Hardware Refresh',14400,30),
(67,'Compute (VMs)',51800,31),
(68,'Storage',23300,31),
(69,'Networking / Egress',11700,31),
(70,'Productivity Suite',28500,32),
(71,'Design Tools',10400,32),
(72,'Endpoint Protection',19400,33),
(73,'SIEM',25900,33),
(74,'Vulnerability Scanning',7800,33),
(75,'Vendor Support Contract',38900,34),
(76,'Circuits / Bandwidth',32400,35),
(77,'Hardware Refresh',15600,35),
(78,'Compute (VMs)',56000,36),
(79,'Storage',25200,36),
(80,'Networking / Egress',12600,36),
(81,'Productivity Suite',30800,37),
(82,'Design Tools',11200,37),
(83,'Endpoint Protection',21000,38),
(84,'SIEM',28000,38),
(85,'Vulnerability Scanning',8400,38),
(86,'Vendor Support Contract',42000,39),
(87,'Circuits / Bandwidth',35000,40),
(88,'Hardware Refresh',16800,40),
(89,'Compute (VMs)',60500,41),
(90,'Storage',27200,41),
(91,'Networking / Egress',13600,41),
(92,'Productivity Suite',33300,42),
(93,'Design Tools',12100,42),
(94,'Endpoint Protection',22700,43),
(95,'SIEM',30200,43),
(96,'Vulnerability Scanning',9100,43),
(97,'Vendor Support Contract',45300,44),
(98,'Circuits / Bandwidth',37800,45),
(99,'Hardware Refresh',18100,45),
(100,'Compute (VMs)',65300,46),
(101,'Storage',29400,46),
(102,'Networking / Egress',14700,46),
(103,'Productivity Suite',35900,47),
(104,'Design Tools',13100,47),
(105,'Endpoint Protection',24500,48),
(106,'SIEM',32700,48),
(107,'Vulnerability Scanning',9800,48),
(108,'Vendor Support Contract',49000,49),
(109,'Circuits / Bandwidth',40800,50),
(110,'Hardware Refresh',19600,50),
(111,'Compute (VMs)',56000,51),
(112,'Storage',25200,51),
(113,'Networking / Egress',12600,51),
(114,'Productivity Suite',30800,52),
(115,'Design Tools',11200,52),
(116,'Endpoint Protection',21000,53),
(117,'SIEM',28000,53),
(118,'Vulnerability Scanning',8400,53),
(119,'Vendor Support Contract',42000,54),
(120,'Circuits / Bandwidth',35000,55),
(121,'Hardware Refresh',16800,55),
(122,'Compute (VMs)',60500,56),
(123,'Storage',27200,56),
(124,'Networking / Egress',13600,56),
(125,'Productivity Suite',33300,57),
(126,'Design Tools',12100,57),
(127,'Endpoint Protection',22700,58),
(128,'SIEM',30200,58),
(129,'Vulnerability Scanning',9100,58),
(130,'Vendor Support Contract',45400,59),
(131,'Circuits / Bandwidth',37800,60),
(132,'Hardware Refresh',18100,60),
(133,'Compute (VMs)',65300,61),
(134,'Storage',29400,61),
(135,'Networking / Egress',14700,61),
(136,'Productivity Suite',35900,62),
(137,'Design Tools',13100,62),
(138,'Endpoint Protection',24500,63),
(139,'SIEM',32700,63),
(140,'Vulnerability Scanning',9800,63),
(141,'Vendor Support Contract',49000,64),
(142,'Circuits / Bandwidth',40800,65),
(143,'Hardware Refresh',19600,65),
(144,'Compute (VMs)',70500,66),
(145,'Storage',31700,66),
(146,'Networking / Egress',15900,66),
(147,'Productivity Suite',38800,67),
(148,'Design Tools',14100,67),
(149,'Endpoint Protection',26500,68),
(150,'SIEM',35300,68),
(151,'Vulnerability Scanning',10600,68),
(152,'Vendor Support Contract',52900,69),
(153,'Circuits / Bandwidth',44100,70),
(154,'Hardware Refresh',21200,70),
(155,'Compute (VMs)',76200,71),
(156,'Storage',34300,71),
(157,'Networking / Egress',17100,71),
(158,'Productivity Suite',41900,72),
(159,'Design Tools',15200,72),
(160,'Endpoint Protection',28600,73),
(161,'SIEM',38100,73),
(162,'Vulnerability Scanning',11400,73),
(163,'Vendor Support Contract',57100,74),
(164,'Circuits / Bandwidth',47600,75),
(165,'Hardware Refresh',22900,75),
(166,'Compute (VMs)',28000,76),
(167,'Storage',12600,76),
(168,'Networking / Egress',6300,76),
(169,'Productivity Suite',15400,77),
(170,'Design Tools',5600,77),
(171,'Endpoint Protection',10500,78),
(172,'SIEM',14000,78),
(173,'Vulnerability Scanning',4200,78),
(174,'Vendor Support Contract',21000,79),
(175,'Circuits / Bandwidth',17500,80),
(176,'Hardware Refresh',8400,80),
(177,'Compute (VMs)',30200,81),
(178,'Storage',13600,81),
(179,'Networking / Egress',6800,81),
(180,'Productivity Suite',16600,82),
(181,'Design Tools',6000,82),
(182,'Endpoint Protection',11300,83),
(183,'SIEM',15100,83),
(184,'Vulnerability Scanning',4500,83),
(185,'Vendor Support Contract',22700,84),
(186,'Circuits / Bandwidth',18900,85),
(187,'Hardware Refresh',9100,85),
(188,'Compute (VMs)',32700,86),
(189,'Storage',14700,86),
(190,'Networking / Egress',7300,86),
(191,'Productivity Suite',18000,87),
(192,'Design Tools',6500,87),
(193,'Endpoint Protection',12200,88),
(194,'SIEM',16300,88),
(195,'Vulnerability Scanning',4900,88),
(196,'Vendor Support Contract',24500,89),
(197,'Circuits / Bandwidth',20400,90),
(198,'Hardware Refresh',9800,90),
(199,'Compute (VMs)',35300,91),
(200,'Storage',15900,91),
(201,'Networking / Egress',7900,91),
(202,'Productivity Suite',19400,92),
(203,'Design Tools',7100,92),
(204,'Endpoint Protection',13200,93),
(205,'SIEM',17600,93),
(206,'Vulnerability Scanning',5300,93),
(207,'Vendor Support Contract',26500,94),
(208,'Circuits / Bandwidth',22000,95),
(209,'Hardware Refresh',10600,95),
(210,'Compute (VMs)',38100,96),
(211,'Storage',17100,96),
(212,'Networking / Egress',8600,96),
(213,'Productivity Suite',21000,97),
(214,'Design Tools',7600,97),
(215,'Endpoint Protection',14300,98),
(216,'SIEM',19000,98),
(217,'Vulnerability Scanning',5700,98),
(218,'Vendor Support Contract',28600,99),
(219,'Circuits / Bandwidth',23800,100),
(220,'Hardware Refresh',11400,100),
(221,'Compute (VMs)',36000,101),
(222,'Storage',16200,101),
(223,'Networking / Egress',8100,101),
(224,'Productivity Suite',19800,102),
(225,'Design Tools',7200,102),
(226,'Endpoint Protection',13500,103),
(227,'SIEM',18000,103),
(228,'Vulnerability Scanning',5400,103),
(229,'Vendor Support Contract',27000,104),
(230,'Circuits / Bandwidth',22500,105),
(231,'Hardware Refresh',10800,105),
(232,'Compute (VMs)',38900,106),
(233,'Storage',17500,106),
(234,'Networking / Egress',8700,106),
(235,'Productivity Suite',21400,107),
(236,'Design Tools',7800,107),
(237,'Endpoint Protection',14600,108),
(238,'SIEM',19400,108),
(239,'Vulnerability Scanning',5800,108),
(240,'Vendor Support Contract',29200,109),
(241,'Circuits / Bandwidth',24300,110),
(242,'Hardware Refresh',11700,110),
(243,'Compute (VMs)',42000,111),
(244,'Storage',18900,111),
(245,'Networking / Egress',9400,111),
(246,'Productivity Suite',23100,112),
(247,'Design Tools',8400,112),
(248,'Endpoint Protection',15700,113),
(249,'SIEM',21000,113),
(250,'Vulnerability Scanning',6300,113),
(251,'Vendor Support Contract',31500,114),
(252,'Circuits / Bandwidth',26200,115),
(253,'Hardware Refresh',12600,115),
(254,'Compute (VMs)',45300,116),
(255,'Storage',20400,116),
(256,'Networking / Egress',10200,116),
(257,'Productivity Suite',24900,117),
(258,'Design Tools',9100,117),
(259,'Endpoint Protection',17000,118),
(260,'SIEM',22700,118),
(261,'Vulnerability Scanning',6800,118),
(262,'Vendor Support Contract',34000,119),
(263,'Circuits / Bandwidth',28300,120),
(264,'Hardware Refresh',13600,120),
(265,'Compute (VMs)',49000,121),
(266,'Storage',22000,121),
(267,'Networking / Egress',11000,121),
(268,'Productivity Suite',26900,122),
(269,'Design Tools',9800,122),
(270,'Endpoint Protection',18400,123),
(271,'SIEM',24500,123),
(272,'Vulnerability Scanning',7300,123),
(273,'Vendor Support Contract',36700,124),
(274,'Circuits / Bandwidth',30600,125),
(275,'Hardware Refresh',14700,125);
INSERT INTO `TrendAiPercentage` (`id`,`region`,`year`,`percentage`) VALUES
(1,'AMEA IT',2022,8),
(2,'AMEA IT',2023,13),
(3,'AMEA IT',2024,18),
(4,'AMEA IT',2025,23),
(5,'AMEA IT',2026,28),
(6,'EMEA IT',2022,10),
(7,'EMEA IT',2023,15),
(8,'EMEA IT',2024,20),
(9,'EMEA IT',2025,25),
(10,'EMEA IT',2026,30),
(11,'NABU IT',2022,12),
(12,'NABU IT',2023,18),
(13,'NABU IT',2024,24),
(14,'NABU IT',2025,30),
(15,'NABU IT',2026,36),
(16,'PH IT',2022,6),
(17,'PH IT',2023,10),
(18,'PH IT',2024,14),
(19,'PH IT',2025,18),
(20,'PH IT',2026,22),
(21,'JP IT',2022,15),
(22,'JP IT',2023,19),
(23,'JP IT',2024,23),
(24,'JP IT',2025,27),
(25,'JP IT',2026,31);
ALTER TABLE `CostItem` AUTO_INCREMENT = 126;
ALTER TABLE `SubCostItem` AUTO_INCREMENT = 276;
ALTER TABLE `TrendAiPercentage` AUTO_INCREMENT = 26;
SET FOREIGN_KEY_CHECKS=1;
+21 -13
View File
@@ -2,7 +2,9 @@ import type { Metadata } from "next";
import "./globals.css"; import "./globals.css";
import TopNav from "@/components/TopNav"; import TopNav from "@/components/TopNav";
import Sidebar from "@/components/Sidebar"; import Sidebar from "@/components/Sidebar";
import { auth } from "@/auth"; // --- SSO DISABLED FOR CICD TEST ---
// import { auth } from "@/auth";
// --- END SSO DISABLED ---
export const metadata: Metadata = { export const metadata: Metadata = {
title: "Global IT Cost Dashboard", title: "Global IT Cost Dashboard",
@@ -14,19 +16,25 @@ export default async function RootLayout({
}: { }: {
children: React.ReactNode; children: React.ReactNode;
}) { }) {
const session = await auth(); // --- SSO DISABLED FOR CICD TEST ---
// const session = await auth();
//
// // Unauthenticated (e.g. the /login page) -> render a bare shell with no
// // sidebar/topnav so the sign-in screen shows on its own.
// if (!session?.user) {
// return (
// <html lang="en">
// <body>{children}</body>
// </html>
// );
// }
//
// const isAdmin = session.user.role === "admin";
// Unauthenticated (e.g. the /login page) -> render a bare shell with no // Hardcoded so the sidebar/topnav still render — auth() would return null
// sidebar/topnav so the sign-in screen shows on its own. // with SSO off and the whole UI chrome would vanish.
if (!session?.user) { const isAdmin = true;
return ( // --- END SSO DISABLED ---
<html lang="en">
<body>{children}</body>
</html>
);
}
const isAdmin = session.user.role === "admin";
return ( return (
<html lang="en"> <html lang="en">
+9 -5
View File
@@ -14,11 +14,13 @@ function errorMessage(code: string | undefined): string | null {
} }
} }
// --- SSO DISABLED FOR CICD TEST ---
// Server action: kick off the Microsoft SSO flow. // Server action: kick off the Microsoft SSO flow.
async function microsoftLogin() { // async function microsoftLogin() {
"use server"; // "use server";
await signIn("microsoft-entra-id", { redirectTo: "/" }); // await signIn("microsoft-entra-id", { redirectTo: "/" });
} // }
// --- END SSO DISABLED ---
// Server action: local username/password login. // Server action: local username/password login.
async function credentialsLogin(formData: FormData) { async function credentialsLogin(formData: FormData) {
@@ -63,6 +65,7 @@ export default async function LoginPage({
</div> </div>
)} )}
{/* --- SSO DISABLED FOR CICD TEST ---
<form action={microsoftLogin} className="mt-6"> <form action={microsoftLogin} className="mt-6">
<button <button
type="submit" type="submit"
@@ -77,8 +80,9 @@ export default async function LoginPage({
OR OR
<span className="h-px flex-1 bg-[#E5E7EB]" /> <span className="h-px flex-1 bg-[#E5E7EB]" />
</div> </div>
--- END SSO DISABLED --- */}
<form action={credentialsLogin} className="flex flex-col gap-3"> <form action={credentialsLogin} className="mt-6 flex flex-col gap-3">
<label className="flex flex-col gap-1 text-sm text-[#374151]"> <label className="flex flex-col gap-1 text-sm text-[#374151]">
Username Username
<input <input
+18 -6
View File
@@ -1,13 +1,22 @@
import { auth, signIn, signOut } from "@/auth"; // --- SSO DISABLED FOR CICD TEST ---
// import { auth, signIn, signOut } from "@/auth";
// --- END SSO DISABLED ---
export default async function TopNav() { export default async function TopNav() {
const session = await auth(); // --- SSO DISABLED FOR CICD TEST ---
const user = session?.user; // const session = await auth();
// const user = session?.user;
const user = { name: "CI Test User" };
// --- END SSO DISABLED ---
return ( return (
<header className="flex h-14 items-center justify-between bg-[#111827] px-6 text-white"> <header className="flex h-14 items-center justify-between bg-[#111827] px-6 text-white">
<span className="text-lg font-semibold">Global IT Cost Dashboard</span> <span className="text-lg font-semibold">Global IT Cost Dashboard</span>
{user ? ( {/* --- SSO DISABLED FOR CICD TEST ---
Original: `{user ? (<logged-in block/>) : (<login form/>)}`. Both forms
are server actions calling signOut/signIn, which would throw without
the Entra env vars, so only the name is rendered below.
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<span className="text-sm text-white/80">{user.name ?? user.email}</span> <span className="text-sm text-white/80">{user.name ?? user.email}</span>
<form <form
@@ -24,7 +33,7 @@ export default async function TopNav() {
</button> </button>
</form> </form>
</div> </div>
) : (
<form <form
action={async () => { action={async () => {
"use server"; "use server";
@@ -38,7 +47,10 @@ export default async function TopNav() {
Login Login
</button> </button>
</form> </form>
)} --- END SSO DISABLED --- */}
<div className="flex items-center gap-3">
<span className="text-sm text-white/80">{user.name}</span>
</div>
</header> </header>
); );
} }
+14 -10
View File
@@ -1,14 +1,18 @@
import NextAuth from "next-auth"; // --- SSO DISABLED FOR CICD TEST ---
import { authConfig } from "@/auth.config"; // Original: protect the whole app with role-aware auth in the edge runtime.
// import NextAuth from "next-auth";
// import { authConfig } from "@/auth.config";
//
// export const { auth: middleware } = NextAuth(authConfig);
// Protect the whole app with role-aware auth. Runs in the edge runtime, so it // No-op replacement. The EMPTY MATCHER below is the actual kill switch — this
// uses the edge-safe authConfig (no node:fs / providers). The `authorized` // function is never invoked, and every route (including the three admin pages)
// callback there redirects unauthenticated users to /login and blocks normal // is open.
// users from admin pages / write APIs. export function middleware() {}
export const { auth: middleware } = NextAuth(authConfig);
export const config = { export const config = {
// Run on everything EXCEPT: the auth endpoints (must stay public so users can // Original matcher (restore with the lines above):
// sign in), Next.js internals, and static asset requests (files with a dot). // matcher: ["/((?!api/auth|_next/static|_next/image|favicon.ico|.*\\.).*)"],
matcher: ["/((?!api/auth|_next/static|_next/image|favicon.ico|.*\\.).*)"], matcher: [],
}; };
// --- END SSO DISABLED ---