Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Bouquillon committed Dec 17, 2023
1 parent 7e8a5db commit 5fba127
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 148 deletions.
10 changes: 0 additions & 10 deletions packages/common/utils/async-shell.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@ const ProgramError = require("./program-error.class")
* @param {{ignoreErrors?: string[]}} extraOptions
* @returns
*/

/**
*
* @param {import("child_process").ChildProcessWithoutNullStreams} child
* @param {null | ((child: import("child_process").ChildProcessWithoutNullStreams) => void)} callback
* @param {Kontinuous.PatchContext["logger"]} logger
* @param {{ignoreErrors?: string[]}} extraOptions
* @returns
*/

const promiseFromChildProcess = (child, callback, logger, extraOptions) => {
const { ignoreErrors = [] } = extraOptions
child.on("error", () => {}) // avoid crash on not found executable
Expand Down
30 changes: 0 additions & 30 deletions packages/common/utils/export-dir-modules.js

This file was deleted.

3 changes: 2 additions & 1 deletion packages/common/utils/kubectl-retry.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const retriableNetwork = require("./retriable-network")
* @prop {string} [kubeconfigContext]
* @prop {string[]} [ignoreErrors]
* @prop {string} [stdin]
* @prop {string} [abortSignal]
* @prop {import('child_process').ChildProcess[]} [collectProcesses]
*/

Expand Down Expand Up @@ -44,7 +45,7 @@ const kubectlRun = async (kubectlArgs, options = {}) => {

return new Promise((resolve, reject) => {
const proc = spawn(cmd, args, {
encoding: "utf-8",
// encoding: "utf-8",
env: {
...process.env,
...(kubeconfig ? { KUBECONFIG: kubeconfig } : {}),
Expand Down
4 changes: 2 additions & 2 deletions packages/common/utils/slug.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const suffix = (name, len = SUFFIX_SHA_LENGTH) => {
* @param {string} name
* @param {number} len
* @param {number} shalen
* @param {slugSource} [string]
* @param {string} [slugSource]
* @returns
*/
const slugString = (name, len, shalen, slugSource = name) => {
Expand All @@ -59,7 +59,7 @@ const slugString = (name, len, shalen, slugSource = name) => {
/**
*
* @param {string[]|string} mixed
* @param {undefined | ({maxLength?:number, partMaxLength?:number, glue?:string})} options
* @param {undefined | ({shaLength?:number, maxLength?:number, partMaxLength?:number, glue?:string})} options
* @returns string
*/
const slug = (mixed, options = {}) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ exports[`egapro 1`] = `
β”‚ β”œβ”€β”€ name: basic-auth
β”‚ └── name: staff
β”œβ”€β”€ Job
<<<<<<< HEAD
β”‚ β”œβ”€β”€ job-egapro-master-jobs-con-6v7vwk-build-api-buildkit-4zg3ke
β”‚ β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.168.4
Expand Down Expand Up @@ -129,38 +128,6 @@ exports[`egapro 1`] = `
β”‚ └── job
β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
=======
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ └── degit-repository (init)
β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
>>>>>>> f07f15398 (chore: fix snapshots)
β”œβ”€β”€ CronJob
β”‚ β”œβ”€β”€ export-public-data
β”‚ β”‚ β”œβ”€β”€ schedule: 0 0 * * *
Expand Down Expand Up @@ -294,7 +261,6 @@ exports[`template 1`] = `
β”‚ β”œβ”€β”€ name: basic-auth
β”‚ └── name: staff
β”œβ”€β”€ Job
<<<<<<< HEAD
β”‚ β”œβ”€β”€ job-egapro-master-jobs-con-6v7vwk-build-api-buildkit-4zg3ke
β”‚ β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.168.4
Expand Down Expand Up @@ -330,38 +296,6 @@ exports[`template 1`] = `
β”‚ └── job
β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
=======
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ └── degit-repository (init)
β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
>>>>>>> f07f15398 (chore: fix snapshots)
β”œβ”€β”€ CronJob
β”‚ β”œβ”€β”€ export-public-data
β”‚ β”‚ β”œβ”€β”€ schedule: 0 0 * * *
Expand Down Expand Up @@ -596,7 +530,6 @@ exports[`www 1`] = `
β”‚ β”œβ”€β”€ name: basic-auth
β”‚ └── name: staff
β”œβ”€β”€ Job
<<<<<<< HEAD
β”‚ β”œβ”€β”€ job-egapro-master-jobs-con-6v7vwk-build-api-buildkit-4zg3ke
β”‚ β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.168.4
Expand Down Expand Up @@ -632,38 +565,6 @@ exports[`www 1`] = `
β”‚ └── job
β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
=======
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ β”œβ”€β”€ degit-repository (init)
β”‚ β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
β”‚ β”œβ”€β”€ job
β”‚ β”‚ β”œβ”€β”€ image: moby/buildkit:v0.10.5-rootless
β”‚ β”‚ └── command: /bin/sh -c set -e if [ "" != "" ]; then export C...
β”‚ └── degit-repository (init)
β”‚ β”œβ”€β”€ image: ghcr.io/socialgouv/kontinuous/degit:v1.115.0
β”‚ └── command: sh -c degit SocialGouv/egapro#master \\ /workspa...
>>>>>>> f07f15398 (chore: fix snapshots)
β”œβ”€β”€ CronJob
β”‚ β”œβ”€β”€ export-public-data
β”‚ β”‚ β”œβ”€β”€ schedule: 0 0 * * *
Expand Down
7 changes: 1 addition & 6 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,5 @@
"noEmit": true,
"strict": false
},
"include": [
"plugins/contrib/patches/*.js",
"packages/common/utils/**/*",
//"packages/common/utils/kind-is-runnable",
"index.d.ts"
]
"include": ["**.js", "**.d.ts"]
}

0 comments on commit 5fba127

Please sign in to comment.