mirror of
https://github.com/hatchet-dev/hatchet.git
synced 2025-12-30 05:09:44 -06:00
fix: addl meta unmarshal deep obj (#1245)
* fix: addl meta unmarshal * fix: ci * fix: ci * fix: ci
This commit is contained in:
4
.github/workflows/app.yml
vendored
4
.github/workflows/app.yml
vendored
@@ -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
|
||||
@@ -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
|
||||
|
||||
4
.github/workflows/docs.yml
vendored
4
.github/workflows/docs.yml
vendored
@@ -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
|
||||
@@ -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
|
||||
|
||||
12
.github/workflows/test.yml
vendored
12
.github/workflows/test.yml
vendored
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -1 +1 @@
|
||||
pnpm 9.1.1
|
||||
pnpm 9.15.4
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user