NO-ISSUE: Sync UI types with monorepo protobufs

Regenerate the committed TypeScript protobuf bindings from the monorepo's local proto sources and update affected UI code for the new API shapes.

Add CI validation that regenerates the bindings when proto/** changes and fails if the generated UI types are out of sync.

Assisted-by: Codex <codex@openai.com>
Signed-off-by: Rastislav Wagner <rawagner@redhat.com>

Author: rawagner

.github/workflows/check-ui-types.yaml

@@ -0,0 +1,83 @@
+name: Check UI types
+
+on:
+  # Keep the check reporting on every PR so it can be made a required status
+  # without leaving non-proto PRs pending. The job itself runs only when the
+  # shared proto module changes.
+  pull_request:
+    branches:
+      - main
+  merge_group:
+
+permissions:
+  contents: read
+
+jobs:
+  changes:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+    outputs:
+      proto: ${{ steps.filter.outputs.proto }}
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
+        if: github.event_name == 'merge_group'
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d  # v4.0.3
+        id: filter
+        with:
+          filters: |
+            proto:
+              - 'proto/**'
+
+  check-ui-types:
+    name: Check UI types (proto)
+    needs: changes
+    # A skipped job reports success, which is intentional for PRs without a
+    # proto change; failures in the filter job must still fail this check.
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Fail if path filter failed
+        if: needs.changes.result != 'success'
+        run: exit 1
+      - id: should-run
+        if: needs.changes.outputs.proto == 'true'
+        run: echo "run=true" >> "$GITHUB_OUTPUT"
+      - if: steps.should-run.outputs.run
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
+        with:
+          persist-credentials: false
+      - if: steps.should-run.outputs.run
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1  # v4.3.0
+        with:
+          run_install: false
+          package_json_file: osac-ui/package.json
+      - if: steps.should-run.outputs.run
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020  # v7.0.0
+        with:
+          node-version-file: osac-ui/package.json
+          cache: pnpm
+          cache-dependency-path: osac-ui/pnpm-lock.yaml
+      - if: steps.should-run.outputs.run
+        name: Install UI dependencies
+        working-directory: osac-ui
+        run: pnpm install --frozen-lockfile
+      - if: steps.should-run.outputs.run
+        name: Regenerate UI types from local proto
+        working-directory: osac-ui
+        run: pnpm gen-types
+      - if: steps.should-run.outputs.run
+        name: Check for uncommitted UI type changes
+        run: |
+          if ! git diff --exit-code -- osac-ui/libs/types/src/ || \
+            [ -n "$(git ls-files --others --exclude-standard -- osac-ui/libs/types/src/)" ]; then
+            echo "::error::UI types are out of date. Run 'pnpm gen-types' in osac-ui and commit the generated files."
+            git status --short -- osac-ui/libs/types/src/
+            exit 1
+          fi

osac-ui/libs/i18n/locales/en/translation.json

@@ -610,7 +610,6 @@
   "Projects": "Projects",
   "Protocol": "Protocol",
   "Protocol is required": "Protocol is required",
-  "Provide either an SSH public key or user data containing access credentials.": "Provide either an SSH public key or user data containing access credentials.",
   "Provider": "Provider",
   "Provider is required": "Provider is required",
   "Provides outbound internet access for workloads in this virtual network.": "Provides outbound internet access for workloads in this virtual network.",
@@ -822,6 +821,7 @@
   "Value": "Value",
   "Value type": "Value type",
   "VAST": "VAST",
+  "vCPUs": "vCPUs",
   "Vendor": "Vendor",
   "Version": "Version",
   "Version is required": "Version is required",
@@ -831,6 +831,7 @@
   "View password": "View password",
   "View the virtual network configuration and related resources.": "View the virtual network configuration and related resources.",
   "Viewer": "Viewer",
+  "Virtual CPUs": "Virtual CPUs",
   "Virtual Machine": "Virtual Machine",
   "Virtual machine conditions": "Virtual machine conditions",
   "Virtual machine summary": "Virtual machine summary",

osac-ui/libs/types/buf.gen.yaml

@@ -7,9 +7,5 @@ plugins:
     include_imports: true
     include_wkt: true
 inputs:
-  - git_repo: https://github.com/osac-project/osac.git
-    branch: main
-    subdir: fulfillment-service/proto/public
-  - git_repo: https://github.com/osac-project/osac.git
-    branch: main
-    subdir: fulfillment-service/proto/private
+  - directory: ../../../proto/public
+  - directory: ../../../proto/private

osac-ui/libs/types/scripts/gen-types.mjs

@@ -1,64 +1,11 @@
 import { spawnSync } from 'node:child_process';
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { dirname, join } from 'node:path';
+import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const typesDirectory = dirname(dirname(fileURLToPath(import.meta.url)));
-const templatePath = join(typesDirectory, 'buf.gen.yaml');
-const args = process.argv.slice(2);
-
-const getCommit = (providedArgs) => {
-  if (providedArgs.length === 0) {
-    return undefined;
-  }
-
-  if (providedArgs.length === 1 && !providedArgs[0].startsWith('--')) {
-    return providedArgs[0];
-  }
-
-  if (providedArgs.length === 2 && providedArgs[0] === '--commit') {
-    return providedArgs[1];
-  }
-
-  if (providedArgs.length === 1 && providedArgs[0].startsWith('--commit=')) {
-    return providedArgs[0].slice('--commit='.length);
-  }
-
-  throw new Error('Usage: pnpm gen-types [commit] or pnpm gen-types --commit <commit>');
-};
-
-let temporaryDirectory;
 
 try {
-  const commit = getCommit(args);
-  let bufArgs = ['generate'];
-
-  if (commit !== undefined) {
-    if (commit.length === 0 || /\s/.test(commit)) {
-      throw new Error('The commit must not contain whitespace.');
-    }
-
-    const template = readFileSync(templatePath, 'utf8');
-    const branchPattern = /^(\s*)branch: main$/gm;
-    const branchMatches = template.match(branchPattern);
-
-    if (branchMatches?.length !== 2) {
-      throw new Error('Expected both protobuf inputs to use branch: main.');
-    }
-
-    const customTemplate = template.replace(
-      branchPattern,
-      (_, indentation) => `${indentation}ref: ${JSON.stringify(commit)}`,
-    );
-
-    temporaryDirectory = mkdtempSync(join(tmpdir(), 'osac-gen-types-'));
-    const temporaryTemplatePath = join(temporaryDirectory, 'buf.gen.yaml');
-    writeFileSync(temporaryTemplatePath, customTemplate);
-    bufArgs = ['generate', '--template', temporaryTemplatePath];
-  }
-
-  const result = spawnSync('buf', bufArgs, {
+  const result = spawnSync('buf', ['generate'], {
     cwd: typesDirectory,
     stdio: 'inherit',
   });
@@ -71,8 +18,4 @@ try {
 } catch (error) {
   process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
   process.exitCode = 1;
-} finally {
-  if (temporaryDirectory) {
-    rmSync(temporaryDirectory, { force: true, recursive: true });
-  }
 }

osac-ui/libs/types/src/buf/validate/validate_pb.ts

@@ -5037,3 +5037,4 @@ export const field: GenExtension<FieldOptions, FieldRules> = /*@__PURE__*/
  */
 export const predefined: GenExtension<FieldOptions, PredefinedRules> = /*@__PURE__*/
   extDesc(file_buf_validate_validate, 3);
+

osac-ui/libs/types/src/cleanapi/cleanapi_pb.ts

@@ -223,3 +223,4 @@ export const service: GenExtension<ServiceOptions$1, ServiceOptions> = /*@__PURE
  */
 export const method: GenExtension<MethodOptions$1, MethodOptions> = /*@__PURE__*/
   extDesc(file_cleanapi_cleanapi, 6);
+

osac-ui/libs/types/src/google/api/annotations_pb.ts

@@ -36,3 +36,4 @@ export const file_google_api_annotations: GenFile = /*@__PURE__*/
  */
 export const http: GenExtension<MethodOptions, HttpRule> = /*@__PURE__*/
   extDesc(file_google_api_annotations, 0);
+

osac-ui/libs/types/src/google/api/field_behavior_pb.ts

@@ -154,3 +154,4 @@ export const FieldBehaviorSchema: GenEnum<FieldBehavior> = /*@__PURE__*/
  */
 export const field_behavior: GenExtension<FieldOptions, FieldBehavior[]> = /*@__PURE__*/
   extDesc(file_google_api_field_behavior, 0);
+

osac-ui/libs/types/src/google/api/http_pb.ts

@@ -471,3 +471,4 @@ export type CustomHttpPattern = Message<"google.api.CustomHttpPattern"> & {
  */
 export const CustomHttpPatternSchema: GenMessage<CustomHttpPattern> = /*@__PURE__*/
   messageDesc(file_google_api_http, 2);
+

osac-ui/libs/types/src/google/api/httpbody_pb.ts

@@ -105,3 +105,4 @@ export type HttpBody = Message<"google.api.HttpBody"> & {
  */
 export const HttpBodySchema: GenMessage<HttpBody> = /*@__PURE__*/
   messageDesc(file_google_api_httpbody, 0);
+