More workbench tweaks (#3491)

Author: michaeljguarino

Dockerfile

@@ -85,7 +85,7 @@ RUN mix do db.certs, agent.chart, sentry.package_source_code, release
 FROM alpine:3.21.3 as tools
 
 ARG TARGETARCH=amd64
-ENV CLI_VERSION=v0.12.46
+ENV CLI_VERSION=v0.12.48
 
 COPY AGENT_VERSION AGENT_VERSION
 

assets/src/components/workbenches/workbench/create-edit/WorkbenchCreateOrEdit.tsx

@@ -207,10 +207,7 @@ function WorkbenchForm({
     ({ label }) => label === curStep
   )
   const allowSubmit = validateForm(formState)
-  const numUnvisitedSteps = Object.values(stepStatuses).reduce(
-    (acc, status) => acc + (status === 'not-visited' ? 1 : 0),
-    0
-  )
+  const isLastStep = curStepIndex === workbenchFormSteps.length - 1
 
   const StepComponent = workbenchFormSteps[curStepIndex]?.component
 
@@ -299,7 +296,7 @@ function WorkbenchForm({
                       >
                         Cancel
                       </Button>
-                      {numUnvisitedSteps < 2 ? (
+                      {isLastStep ? (
                         <Button
                           disabled={!allowSubmit}
                           loading={mutationLoading}

assets/src/generated/graphql.ts

@@ -10621,6 +10621,7 @@ export type RootQueryType = {
   vulnerabilityReports?: Maybe<VulnerabilityReportConnection>;
   vulnerabilityStatistics?: Maybe<Array<Maybe<VulnerabilityStatistic>>>;
   workbench?: Maybe<Workbench>;
+  workbenchAggregates: WorkbenchAggregates;
   workbenchAlerts?: Maybe<AlertConnection>;
   workbenchIssues?: Maybe<IssueConnection>;
   workbenchJob?: Maybe<WorkbenchJob>;
@@ -14992,6 +14993,16 @@ export type WorkbenchWorkbenchSkillsArgs = {
   last?: InputMaybe<Scalars['Int']['input']>;
 };
 
+export type WorkbenchAggregates = {
+  __typename?: 'WorkbenchAggregates';
+  /** average eval grade across workbench eval results */
+  evalResults?: Maybe<Scalars['Float']['output']>;
+  /** fraction of those pull requests that are merged (0.0–1.0) */
+  pullRequestMergeRate?: Maybe<Scalars['Float']['output']>;
+  /** count of merged pull requests included in the aggregate */
+  pullRequests?: Maybe<Scalars['Int']['output']>;
+};
+
 export type WorkbenchAttributes = {
   /** the agent runtime for this workbench */
   agentRuntimeId?: InputMaybe<Scalars['ID']['input']>;

charts/console/templates/kas/deployment.yaml

@@ -160,9 +160,9 @@ spec:
                   - key: redis-password
                     path: redis_server_secret
             - secret:
-                name: console-env
+                name: {{ .Values.kas.jwtSecret.name }}
                 items:
-                  - key: JWT_SECRET
+                  - key: {{ .Values.kas.jwtSecret.key }}
                     path: jwt_secret
       {{- with .Values.kas.nodeSelector }}
       nodeSelector:

charts/console/templates/secrets.yaml

@@ -86,6 +86,9 @@ data:
 {{ if .Values.console.config.adminEmails }}
   CONSOLE_ADMIN_EMAILS: {{ .Values.console.config.adminEmails | join "," | b64enc | quote }}
 {{ end }}
+{{ if .Values.secrets.exaApiKey }}
+  EXA_API_KEY: {{ .Values.secrets.exaApiKey | b64enc | quote }}
+{{ end }}
 {{ if .Values.cloud.pgRootCert }}
 ---
 apiVersion: v1

charts/console/values.yaml

@@ -131,6 +131,8 @@ secrets:
   plural_client_id: ~
   # plural_client_secret is used to set PLURAL_CLIENT_SECRET if not null
   plural_client_secret: ~
+  # exaApiKey is used to set EXA_API_KEY if not null
+  exaApiKey: ~
 
 # image is used to configure the image for the console container as follows: "{{ .Values.global.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
 image:
@@ -641,6 +643,12 @@ kas:
     targetCPUAverageValue: 100m
     # targetCPUUtilizationPercentage: 75
     # targetMemoryUtilizationPercentage: 75
+
+  # jwtSecretName is used to set the name of the secret that contains the JWT secret, usually the default `console-env` secret
+  jwtSecret:
+    name: console-env
+    key: JWT_SECRET
+
   secrets:
     create: true
     api: ""

config/test.exs

@@ -49,7 +49,8 @@ config :console,
   multilevel_cache: Console.MultilevelCache,
   grafana_dns: "grafana.example.com",
   prom_plugins: [],
-  github_app_id: "1234567890"
+  github_app_id: "1234567890",
+  provider: :aws
   # github_app_pem: priv_string
 
 config :console, :login_link,

dockerfiles/Dockerfile.softserve

@@ -28,7 +28,7 @@ RUN apk add openssh-client
 # Reason that we manually install soft-serve instead of using the soft-serve docker image is that
 # the soft-serve image starts the server without allowing us to set admin ssh keys, thus preventing
 # us from importing repos
-RUN go install github.com/pluralsh/soft-serve/cmd/soft@latest
+RUN go install github.com/pluralsh/soft-serve/cmd/soft@v0.1.7
 RUN mv /go/bin/soft /usr/bin/
 
 # soft-serve data folder

go/client/models_gen.go

@@ -317,7 +317,9 @@ defmodule Console do
     try do
       fun.()
     catch
-      _, err -> fallback.(err)
+      _, err ->
+        Logger.error(Exception.format(:error, err, __STACKTRACE__))
+        fallback.(err)
     end
   end