diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 6fa6f9a1..ecd87b9e 100644 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -1213,10 +1213,10 @@ class AppBase: return basejson, False if isinstance(basejson, list): - print("VALUE IN ISINSTANCE IS NOT TO BE USED (list): %s" % value) + print("[WARNING] VALUE IN ISINSTANCE IS NOT TO BE USED (list): %s" % value) return basejson, False elif isinstance(basejson[value], str): - print(f"LOADING STRING '%s' AS JSON" % basejson[value]) + print(f"[INFO] LOADING STRING '%s' AS JSON" % basejson[value]) try: basejson = json.loads(basejson[value]) except json.decoder.JSONDecodeError as e: diff --git a/backend/app_sdk/build.sh b/backend/app_sdk/build.sh index f760beee..5f810cd4 100644 --- a/backend/app_sdk/build.sh +++ b/backend/app_sdk/build.sh @@ -1,6 +1,6 @@ #!/bin/bash NAME=shuffle-app_sdk -VERSION=0.8.73 +VERSION=0.8.75 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force docker build . -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 93e0b67b..3ac40e66 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -2,7 +2,7 @@ module shuffle go 1.13 -replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared +//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi @@ -13,6 +13,7 @@ require ( cloud.google.com/go/storage v1.12.0 github.com/Masterminds/semver v1.5.0 // indirect github.com/Microsoft/go-winio v0.4.14 // indirect + github.com/algolia/algoliasearch-client-go/v3 v3.18.1 // indirect github.com/basgys/goxml2json v1.1.0 github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 // indirect github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82 @@ -21,7 +22,7 @@ require ( github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 // indirect github.com/frikky/kin-openapi v0.38.0 - github.com/frikky/shuffle-shared v0.0.32 + github.com/frikky/shuffle-shared v0.0.37 github.com/ghodss/yaml v1.0.0 github.com/go-git/go-billy/v5 v5.0.0 github.com/go-git/go-git/v5 v5.0.0 diff --git a/backend/go-app/go.sum b/backend/go-app/go.sum index b2034158..ac20c7f5 100644 --- a/backend/go-app/go.sum +++ b/backend/go-app/go.sum @@ -53,6 +53,9 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0 github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/algolia/algoliasearch-client-go v2.25.0+incompatible h1:FGQr9l++u4uQPDXrW8jM5kNJm3Iw5SxEJJtYXSFmPRY= +github.com/algolia/algoliasearch-client-go/v3 v3.18.1 h1:FP2Xtqqs/sefR5Qluygp+jVV+juXzEdJaPrZTCDLhDQ= +github.com/algolia/algoliasearch-client-go/v3 v3.18.1/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUKVw= diff --git a/backend/go-app/main.go b/backend/go-app/main.go index 793110a2..7e523337 100644 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -2471,9 +2471,8 @@ func handleWebhookCallback(resp http.ResponseWriter, request *http.Request) { // Scared whether it may stop other things though, but that's a future problem // (famous last words) - parsedBody = shuffle.GetExecutiobody(body) - //log.Printf("\n\nPARSEDBODY: %s", parsedBody) + parsedBody := shuffle.GetExecutionbody(body) newBody := shuffle.ExecutionStruct{ Start: hook.Start, ExecutionSource: "webhook", diff --git a/docker-compose.yml b/docker-compose.yml index 45d69899..b17892a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: frontend: #build: ./frontend - image: ghcr.io/frikky/shuffle-frontend:0.8.74 + image: ghcr.io/frikky/shuffle-frontend:0.8.75 container_name: shuffle-frontend hostname: shuffle-frontend ports: @@ -17,7 +17,7 @@ services: - backend backend: #build: ./backend - image: ghcr.io/frikky/shuffle-backend:0.8.74 + image: ghcr.io/frikky/shuffle-backend:0.8.75 container_name: shuffle-backend hostname: ${BACKEND_HOSTNAME} # Here for debugging: @@ -47,7 +47,7 @@ services: - database orborus: #build: ./functions/onprem/orborus - image: ghcr.io/frikky/shuffle-orborus:0.8.73 + image: ghcr.io/frikky/shuffle-orborus:0.8.75 container_name: shuffle-orborus hostname: shuffle-orborus networks: @@ -55,8 +55,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock environment: - - SHUFFLE_APP_SDK_VERSION=0.8.73 - - SHUFFLE_WORKER_VERSION=0.8.73 + - SHUFFLE_APP_SDK_VERSION=0.8.75 + - SHUFFLE_WORKER_VERSION=0.8.75 - ORG_ID=${ORG_ID} - ENVIRONMENT_NAME=${ENVIRONMENT_NAME} - BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT} diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx index 60d7bb3b..85291e1b 100644 --- a/frontend/src/views/Admin.jsx +++ b/frontend/src/views/Admin.jsx @@ -66,7 +66,7 @@ const Admin = (props) => { const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io" const getApps = () => { - fetch(globalUrl+"/api/v1/workflows/apps", { + fetch(globalUrl+"/api/v1/apps", { method: 'GET', headers: { 'Content-Type': 'application/json', diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx index bd344504..dd86648e 100644 --- a/frontend/src/views/Apps.jsx +++ b/frontend/src/views/Apps.jsx @@ -187,7 +187,7 @@ const Apps = (props) => { } const getApps = () => { - fetch(globalUrl+"/api/v1/workflows/apps", { + fetch(globalUrl+"/api/v1/apps", { method: 'GET', headers: { 'Content-Type': 'application/json', diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh index 47d0510e..2f2136b0 100644 --- a/functions/onprem/orborus/build.sh +++ b/functions/onprem/orborus/build.sh @@ -1,11 +1,12 @@ NAME=shuffle-orborus -VERSION=0.8.73 +VERSION=0.8.75 echo "Running docker build with $NAME:$VERSION" #docker rmi frikky/shuffle:$NAME --force -docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION +docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly #docker push frikky/$NAME:$VERSION # docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION docker push frikky/shuffle:$NAME docker push ghcr.io/frikky/$NAME:$VERSION +docker push ghcr.io/frikky/$NAME:nightly diff --git a/functions/onprem/worker/build.sh b/functions/onprem/worker/build.sh index 4f9dc1df..d0742a19 100644 --- a/functions/onprem/worker/build.sh +++ b/functions/onprem/worker/build.sh @@ -1,9 +1,9 @@ NAME=shuffle-worker -VERSION=0.8.73 +VERSION=0.8.75 echo "Running docker build with $NAME:$VERSION" #CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin . -docker build . -t frikky/shuffle:$NAME -t frikky/shuffle:$NAME_$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION +docker build . -t frikky/shuffle:$NAME -t frikky/shuffle:$NAME_$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly # Push both for now.. #docker push frikky/$NAME:$VERSION @@ -12,3 +12,4 @@ docker build . -t frikky/shuffle:$NAME -t frikky/shuffle:$NAME_$VERSION -t docke #docker tag frikky/shuffle:0.8.51 ghcr.io/frikky/shuffle-worker:0.8.5 #docker tag frikky/shuffle:$NAME ghcr.io/frikky/shuffle-worker:0.8.52 docker push ghcr.io/frikky/$NAME:$VERSION +docker push ghcr.io/frikky/$NAME:nightly