feat: Vue 3 upgrade

README.md

@@ -5,7 +5,7 @@ Welcome to `phenix`!
 ## Building
 
 ### Local build
-To build locally, you will need Golang v1.18, Node v14.2, Yarn 1.22, and Protoc 3.14 installed.
+To build locally, you will need Golang v1.20, Node 22, and Protoc 3.14 installed.
 
 Once installed (if not already), simply run:
 ```bash

docker/Dockerfile

@@ -6,7 +6,7 @@ FROM ghcr.io/sandia-minimega/minimega:${MM_MIN_REV} AS minimega
 
 
 # ** jsbuilder **
-FROM node:14.21.3 AS jsbuilder
+FROM node:22 AS jsbuilder
 
 ARG INSTALL_CERTS=
 RUN ["/bin/bash", "-c", "if [ -n $INSTALL_CERTS ]; then \
@@ -15,10 +15,9 @@ RUN ["/bin/bash", "-c", "if [ -n $INSTALL_CERTS ]; then \
     wget ${arr[$i]} -e use_proxy=no \
       -O /usr/local/share/ca-certificates/custom$i.crt; \
   done && \
-  update-ca-certificates; \
-  yarn config set cafile /etc/ssl/certs/ca-certificates.crt; fi"]
+  update-ca-certificates; fi"]
 
-RUN npm install -g @vue/cli redoc-cli
+RUN npm install -g @redocly/cli
 
 COPY ./src/js /phenix/src/js
 
@@ -27,16 +26,16 @@ WORKDIR /phenix/src/js
 ARG PHENIX_WEB_AUTH=disabled
 ARG PHENIX_BASE_PATH=/
 
-ENV VUE_APP_AUTH ${PHENIX_WEB_AUTH}
-ENV VUE_BASE_PATH ${PHENIX_BASE_PATH}
+ENV VITE_AUTH ${PHENIX_WEB_AUTH}
+ENV VITE_BASE_PATH ${PHENIX_BASE_PATH}
 
 RUN make dist/index.html
 
 COPY ./src/go/web/public/docs/openapi.yml /phenix/src/go/web/public/docs/openapi.yml
 
 WORKDIR /phenix/src/go/web/public/docs
 
-RUN npx redoc-cli build openapi.yml -o index.html --title 'phenix API'
+RUN npx @redocly/cli build-docs openapi.yml -o index.html --title 'phenix API'
 
 
 # ** gobuilder **

docker/jit/Dockerfile

@@ -8,21 +8,20 @@ FROM $PHENIX_IMG
 ARG PHENIX_REPO
 ARG PHENIX_BRANCH
 
-ENV NODE_VERSION 14.21.3
+ENV NODE_VERSION 22.17.0
 
 RUN wget -O node.txz https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz \
   && tar -xJf node.txz -C /usr/local --strip-components=1 --no-same-owner && rm node.txz \
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-RUN npm install -g @vue/cli redoc-cli yarn
+RUN npm install -g @redocly/cli
 RUN git clone --branch ${PHENIX_BRANCH} https://github.com/${PHENIX_REPO}.git /usr/local/src/phenix \
   && mkdir -p /opt/phenix/web \
   && cp -a /usr/local/src/phenix/src/go/web/public /opt/phenix/web
 
 WORKDIR /usr/local/src/phenix/src/js
-RUN yarn install
 WORKDIR /opt/phenix/web/public
-RUN npx redoc-cli build docs/openapi.yml -o docs/index.html --title 'phenix API'
+RUN npx @redocly/cli build-docs docs/openapi.yml -o docs/index.html --title 'phenix API'
 
 COPY phenix-ui-entrypoint.sh /phenix-ui-entrypoint.sh
 RUN  chmod +x /phenix-ui-entrypoint.sh

docker/jit/phenix-ui-entrypoint.sh

@@ -14,7 +14,8 @@ echo "building phenix UI (this could take a while...)"
 start_time=$(date +%s)
 
 pushd /usr/local/src/phenix/src/js &> /dev/null
-VUE_BASE_PATH=$base VUE_APP_AUTH=$auth npm run build &> /tmp/phenix-ui-build.log
+npm install &> /tmp/phenix-ui-build.log
+VITE_BASE_PATH=$base VITE_AUTH=$auth npm run build &> /tmp/phenix-ui-build.log
 res=$?
 
 if [ $res -ne 0 ]; then

hack/build/docker-build.sh

@@ -66,15 +66,18 @@ fi
 
 
 docker build -t phenix:builder -f - . <<EOF
-FROM ubuntu:20.04
+
+FROM node:22
+
+SHELL ["/bin/bash", "-c"]
 
 RUN ["/bin/bash", "-c", "if (( $USER_UID != 0 )); then \
   groupadd --gid $USER_UID $USERNAME \
   && useradd -s /bin/bash --uid $USER_UID --gid $USER_UID -m $USERNAME; fi"]
 
-RUN apt update && apt install -y curl gnupg2 make protobuf-compiler wget xz-utils
+RUN apt update && apt install -y curl gnupg2 make protobuf-compiler wget xz-utils git
 
-ENV GOLANG_VERSION 1.18.5
+ENV GOLANG_VERSION 1.20.14
 
 RUN wget -O go.tgz https://golang.org/dl/go\${GOLANG_VERSION}.linux-amd64.tar.gz \
   && tar -C /usr/local -xzf go.tgz && rm go.tgz
@@ -85,17 +88,21 @@ ENV PATH \$GOPATH/bin:/usr/local/go/bin:\$PATH
 RUN mkdir -p \$GOPATH/src \$GOPATH/bin \
   && chmod -R 777 \$GOPATH
 
-ENV NODE_VERSION 12.18.3
+# use full version name here (e.g., 22.17.0 instead of 22)
+# ENV NVM_DIR /root/.nvm
+
+# RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+# RUN source \$NVM_DIR/nvm.sh \
+#     && nvm install \$NODE_VERSION \
+#     && nvm alias default \$NODE_VERSION \
+#     && nvm use default
 
-RUN wget -O node.txz https://nodejs.org/dist/v\${NODE_VERSION}/node-v\${NODE_VERSION}-linux-x64.tar.xz \
-  && tar -xJf node.txz -C /usr/local --strip-components=1 --no-same-owner && rm node.txz \
-  && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+# RUN chmod a+x \$NVM_DIR/nvm.sh
+RUN npm install -g @redocly/cli
+# ENTRYPOINT ["bash", "-c", "source \$NVM_DIR/nvm.sh && exec \"$@\"", "--"]
 
-RUN npm install -g @vue/cli redoc-cli
+# CMD []
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-  && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-  && apt update && apt install -y yarn
 EOF
 
 
@@ -111,8 +118,8 @@ docker run -it --rm \
   -v $ROOT_DIR:/phenix \
   -w /phenix \
   -u $USERNAME \
-  -e VUE_APP_AUTH=$auth \
-  -e VUE_BASE_PATH=$base \
+  -e VITE_AUTH=$auth \
+  -e VITE_BASE_PATH=$base \
   -e TAG=$tag \
   -e COMMIT=$commit \
   phenix:builder make bin/phenix

podman/Containerfile

@@ -1,6 +1,6 @@
-FROM docker.io/library/node:12.18.3 AS jsbuilder
+FROM docker.io/library/node:22 AS jsbuilder
 
-RUN npm install -g @vue/cli redoc-cli
+RUN npm install -g @redocly/cli
 
 COPY ./src/js /phenix/src/js
 
@@ -9,8 +9,8 @@ WORKDIR /phenix/src/js
 ARG PHENIX_WEB_AUTH=disabled
 ARG PHENIX_BASE_PATH=/
 
-ENV VUE_APP_AUTH ${PHENIX_WEB_AUTH}
-ENV VUE_BASE_PATH ${PHENIX_BASE_PATH}
+ENV VITE_AUTH ${PHENIX_WEB_AUTH}
+ENV VITE_BASE_PATH ${PHENIX_BASE_PATH}
 
 RUN npm install \
   && npm run build
@@ -19,10 +19,10 @@ COPY ./src/go/web/public/docs/openapi.yml /phenix/src/go/web/public/docs/openapi
 
 WORKDIR /phenix/src/go/web/public/docs
 
-RUN npx redoc-cli bundle openapi.yml -o index.html --title 'phenix API'
+RUN npx build-docs bundle openapi.yml -o index.html --title 'phenix API'
 
 
-FROM docker.io/library/golang:1.17.2 AS gobuilder
+FROM docker.io/library/golang:1.24.1 AS gobuilder
 
 RUN apt update \
   && apt install -y protobuf-compiler xz-utils

src/go/.gitignore

@@ -4,6 +4,6 @@ bindata.go
 mock.go
 
 web/public/assets
-web/public/favicon.ico
+web/public/favicon*.ico
 web/public/index.html
 web/public/docs/index.html

src/go/Makefile

@@ -35,7 +35,7 @@ clean:
 	$(RM) web/bindata.go
 	$(RM) web/proto/*.pb.go
 	$(RM) web/public/docs/index.html
-	$(RM) web/public/favicon.ico
+	$(RM) web/public/favicon*.ico
 	$(RM) web/public/index.html
 	$(RM) -r web/public/assets
 	$(RM) web/rbac/known_policy.go
@@ -68,7 +68,7 @@ tmpl/bindata.go: $(TEMPLATES) bin/go-bindata
 	$(GOBIN)/go-bindata -pkg tmpl -prefix tmpl/templates -o tmpl/bindata.go tmpl/templates/...
 
 web/public/docs/index.html: web/public/docs/openapi.yml
-	npx redoc-cli build web/public/docs/openapi.yml -o web/public/docs/index.html --title 'phenix API'
+	npx @redocly/cli build-docs web/public/docs/openapi.yml -o web/public/docs/index.html --title 'phenix API'
 
 web/bindata.go: web/public/docs/index.html web/public/index.html web/public/vnc.html bin/go-bindata
 	$(GOBIN)/go-bindata -pkg web -prefix web/public -o web/bindata.go web/public/...

src/go/api/disk/disk.go

@@ -3,6 +3,7 @@ package disk
 import (
 	"fmt"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -41,6 +42,12 @@ func (MMDiskFiles) RebaseDisk(src, dst string, unsafe bool) error {
 
 func (MMDiskFiles) ResizeDisk(src, size string) error {
 	cmd := mmcli.NewCommand()
+
+	re := regexp.MustCompile(`[+-]?\d+[KMGTPE]`)
+	if !re.MatchString(size) {
+		return fmt.Errorf("provided size does not match valid pattern")
+	}
+
 	cmd.Command = fmt.Sprintf("disk resize %s %s", src, size)
 	_, err := mmcli.SingleDataResponse(mmcli.Run(cmd))
 	return err
@@ -176,7 +183,7 @@ func resolveImage(path string) []Details {
 		}
 	}
 	if !knownFormat {
-		plog.Debug(plog.TypeSystem, "file didn't match know image extensions: %s", "path", path)
+		plog.Debug(plog.TypeSystem, "file didn't match known image extensions: %s", "path", path)
 		return imageDetails
 	}
 

src/go/api/settings/defaults.go

@@ -17,6 +17,10 @@ var DEFAULT_SETTINGS = []v2.Setting{
 	{Category: "Password", Name: "UppercaseReq", Type: v2.SettingValueBool, Value: strconv.FormatBool(false)},
 	{Category: "Password", Name: "MinLength", Type: v2.SettingValueInt, Value: formatInt(8)},
 
+	{Category: "Timeout", Name: "Enabled", Type: v2.SettingValueBool, Value: strconv.FormatBool(false)},
+	{Category: "Timeout", Name: "TimeoutMin", Type: v2.SettingValueFloat, Value: formatFloat(30)},
+	{Category: "Timeout", Name: "WarningMin", Type: v2.SettingValueFloat, Value: formatFloat(3)},
+
 	{Category: "Logging", Name: "MaxFileRotations", Type: v2.SettingValueInt, Value: formatInt(0)},
 	{Category: "Logging", Name: "MaxFileSize", Type: v2.SettingValueInt, Value: formatInt(100)},
 	{Category: "Logging", Name: "MaxFileAge", Type: v2.SettingValueInt, Value: formatInt(90)},

src/go/api/settings/settings.go

@@ -30,7 +30,7 @@ Adding a new setting:
 type Settings struct {
 	PasswordSettings PasswordSettings `json:"password_settings"`
 	LoggingSettings  LoggingSettings  `json:"logging_settings"`
-
+	TimeoutSettings  TimeoutSettings  `json:"timeout_settings"`
 }
 
 func GetSettings() (*Settings, error) {
@@ -52,6 +52,10 @@ func GetSettings() (*Settings, error) {
 		return nil, fmt.Errorf("Error getting logging settings: %v", err)
 	}
 
+	settings.TimeoutSettings, err = GetTimeoutSettingsFromList(settingList)
+	if err != nil {
+		return nil, fmt.Errorf("Error getting timeout settings: %v", err)
+	}
 
 	return settings, nil
 }
@@ -67,6 +71,9 @@ func UpdateAllSettings(newSettings Settings) error {
 		return fmt.Errorf("Error updating logging settings: %w", err)
 	}
 
+	if err := UpdateTimeoutSettings(newSettings.TimeoutSettings); err != nil {
+		return fmt.Errorf("Error updating timeout settings: %w", err)
+	}
 
 	return nil
 }

src/go/api/settings/timeout.go

@@ -0,0 +1,73 @@
+package settings
+
+import (
+	"fmt"
+	"phenix/types"
+	"strconv"
+)
+
+type TimeoutSettings struct {
+	Enabled    bool    `json:"enabled"`
+	TimeoutMin float64 `json:"timeout_min"`
+	WarningMin float64 `json:"warning_min"`
+}
+
+func GetTimeoutSettings() (TimeoutSettings, error) {
+	settings, err := List()
+	if err != nil {
+		return TimeoutSettings{}, fmt.Errorf("Error listing settings; %w", err)
+	}
+
+	return GetTimeoutSettingsFromList(settings)
+}
+
+func GetTimeoutSettingsFromList(settings []types.Setting) (TimeoutSettings, error) {
+	timeout := TimeoutSettings{}
+	var err error
+
+	for _, setting := range settings {
+		category := setting.Spec.Category
+		name := setting.Spec.Name
+		if category != "Timeout" {
+			continue
+		}
+
+		switch name {
+		case "Enabled":
+			timeout.Enabled, err = strconv.ParseBool(setting.Spec.Value)
+			if err != nil {
+				return timeout, fmt.Errorf("Error parsing %s.%s setting: %w", category, name, err)
+			}
+		case "TimeoutMin":
+			timeout.TimeoutMin, err = parseFloat(setting.Spec.Value)
+			if err != nil {
+				return timeout, fmt.Errorf("Error parsing %s.%s setting: %w", category, name, err)
+			}
+		case "WarningMin":
+			timeout.WarningMin, err = parseFloat(setting.Spec.Value)
+			if err != nil {
+				return timeout, fmt.Errorf("Error parsing %s.%s setting: %w", category, name, err)
+			}
+		}
+	}
+
+	return timeout, nil
+}
+
+func UpdateTimeoutSettings(newSettings TimeoutSettings) error {
+	var err error
+
+	_, err = Update("Timeout", "Enabled", strconv.FormatBool(newSettings.Enabled))
+	if err != nil {
+		return fmt.Errorf("Error updating Timeout.Enabled: %w", err)
+	}
+	_, err = Update("Timeout", "TimeoutMin", formatFloat(newSettings.TimeoutMin))
+	if err != nil {
+		return fmt.Errorf("Error updating Timeout.Delay: %w", err)
+	}
+	_, err = Update("Timeout", "WarningMin", formatFloat(newSettings.WarningMin))
+	if err != nil {
+		return fmt.Errorf("Error updating Timeout.Delay: %w", err)
+	}
+	return nil
+}

src/go/web/handlers.go

@@ -3090,3 +3090,24 @@ func GetPasswordRequirements(w http.ResponseWriter, r *http.Request) {
 	}
 	w.Write(body)
 }
+
+func GetTimeoutSettings(w http.ResponseWriter, r *http.Request) {
+	plog.Debug("HTTP handler called", "handler", "GetTimeoutSettings")
+	settings.SetDefaults()
+
+	timeoutReqs, err := settings.GetTimeoutSettings()
+	if err != nil {
+		plog.Error("Getting password settings:", "err", err)
+		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	body, err := json.Marshal(timeoutReqs)
+	if err != nil {
+		plog.Error(plog.TypeSystem, "Marshalling timeout reqs:", "err", err)
+		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+		return
+	}
+	w.Write(body)
+}

src/go/web/server.go

@@ -263,13 +263,13 @@ func Start(opts ...ServerOption) error {
 	api.HandleFunc("/settings", GetSettings).Methods("GET", "OPTIONS")
 	api.HandleFunc("/settings", SetSettings).Methods("POST", "OPTIONS")
 	api.HandleFunc("/settings/password", GetPasswordRequirements).Methods("GET", "OPTIONS")
+	api.HandleFunc("/settings/timeout", GetTimeoutSettings).Methods("GET", "OPTIONS")
 
 	workflowRoutes := []route{
 		{"/workflow/apply/{branch}", weberror.ErrorHandler(ApplyWorkflow), []string{"POST"}},
 		{"/workflow/configs/{branch}", weberror.ErrorHandler(WorkflowUpsertConfig), []string{"POST"}},
 	}
 
-
 	optionRoutes := []route{
 		{"/options", weberror.ErrorHandler(GetOptions), []string{"GET"}},
 	}