Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: addl meta unmarshal deep obj #1245

Merged
merged 4 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false
- name: Setup Node.js
uses: actions/setup-node@v4
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false
- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false
- name: Setup Node.js
uses: actions/setup-node@v4
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false
- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false

- name: Install Atlas
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false

- name: Install Atlas
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false

- name: Install Atlas
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false

- name: Install Atlas
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false

- name: Install Atlas
Expand Down Expand Up @@ -380,7 +380,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.1.1
version: 9.15.4
run_install: false

- name: Install Atlas
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pnpm 9.1.1
pnpm 9.15.4
4 changes: 2 additions & 2 deletions build/package/dashboard.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ FROM node:18-alpine as frontend-build
WORKDIR /app

COPY ./frontend/app/package.json ./frontend/app/pnpm-lock.yaml ./
RUN corepack pnpm --version
RUN corepack pnpm install --frozen-lockfile && corepack pnpm store prune
RUN corepack pnpm@9.15.4 --version
RUN corepack pnpm@9.15.4 install --frozen-lockfile && corepack pnpm@9.15.4 store prune

COPY ./frontend/app ./
RUN npm run build
Expand Down
4 changes: 2 additions & 2 deletions build/package/frontend.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM node:18-alpine as build
WORKDIR /app

COPY ./frontend/app/package.json ./frontend/app/pnpm-lock.yaml ./
RUN corepack pnpm --version
RUN corepack pnpm install --frozen-lockfile && corepack pnpm store prune
RUN corepack pnpm@9.15.4 --version
RUN corepack pnpm@9.15.4 install --frozen-lockfile && corepack pnpm@9.15.4 store prune

COPY ./frontend/app ./
RUN npm run build
Expand Down
4 changes: 2 additions & 2 deletions build/package/lite.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ FROM node:18-alpine as frontend-build
WORKDIR /app

COPY ./frontend/app/package.json ./frontend/app/pnpm-lock.yaml ./
RUN corepack pnpm --version
RUN corepack pnpm install --frozen-lockfile && corepack pnpm store prune
RUN corepack pnpm@9.15.4 --version
RUN corepack pnpm@9.15.4 install --frozen-lockfile && corepack pnpm@9.15.4 store prune

COPY ./frontend/app ./
RUN npm run build
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"version": "0.0.0",
"type": "module",
"packageManager": "pnpm@9.1.1",
"packageManager": "pnpm@9.15.4",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
Expand Down
2 changes: 1 addition & 1 deletion frontend/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nextra-docs-template",
"version": "0.0.1",
"description": "Nextra docs template",
"packageManager": "pnpm@9.1.1",
"packageManager": "pnpm@9.15.4",
"scripts": {
"dev": "next dev",
"build": "next build",
Expand Down
15 changes: 12 additions & 3 deletions pkg/client/dispatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,20 @@ func (a *actionListenerImpl) Actions(ctx context.Context) (<-chan *Action, <-cha
var additionalMetadata map[string]string

if assignedAction.AdditionalMetadata != nil {
err := json.Unmarshal([]byte(*assignedAction.AdditionalMetadata), &additionalMetadata)

if err != nil {
// Try to unmarshal as map[string]string first
var rawMap map[string]interface{}
if err := json.Unmarshal([]byte(*assignedAction.AdditionalMetadata), &rawMap); err != nil {
// If that fails, try to unmarshal as a single string
a.l.Error().Err(err).Msgf("could not unmarshal additional metadata")
continue
} else {
// Only keep string values from the map
additionalMetadata = make(map[string]string)
for k, v := range rawMap {
if strVal, ok := v.(string); ok {
additionalMetadata[k] = strVal
}
}
}
}

Expand Down
Loading