@zuplo/cli 7.11.0 → 7.11.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/node_modules/@hono/node-server/README.md +2 -0
- package/node_modules/@hono/node-server/dist/index.cjs +1 -1
- package/node_modules/@hono/node-server/dist/index.mjs +1 -1
- package/node_modules/@hono/node-server/dist/serve-static.cjs +2 -1
- package/node_modules/@hono/node-server/dist/serve-static.mjs +2 -1
- package/node_modules/@hono/node-server/package.json +1 -1
- package/node_modules/@posthog/core/dist/metrics/index.d.ts +9 -0
- package/node_modules/@posthog/core/dist/metrics/index.d.ts.map +1 -1
- package/node_modules/@posthog/core/dist/metrics/index.js +38 -3
- package/node_modules/@posthog/core/dist/metrics/index.mjs +38 -3
- package/node_modules/@posthog/core/dist/metrics/types.d.ts +7 -2
- package/node_modules/@posthog/core/dist/metrics/types.d.ts.map +1 -1
- package/node_modules/@posthog/core/dist/traces/ids.d.ts.map +1 -1
- package/node_modules/@posthog/core/dist/traces/ids.js +2 -2
- package/node_modules/@posthog/core/dist/traces/ids.mjs +2 -2
- package/node_modules/@posthog/core/package.json +2 -2
- package/node_modules/@posthog/core/src/metrics/index.spec.ts +75 -0
- package/node_modules/@posthog/core/src/metrics/index.ts +60 -0
- package/node_modules/@posthog/core/src/metrics/types.ts +7 -1
- package/node_modules/@posthog/core/src/traces/ids.ts +4 -2
- package/node_modules/@posthog/types/dist/capture-metric.d.ts +10 -0
- package/node_modules/@posthog/types/dist/capture-metric.d.ts.map +1 -1
- package/node_modules/@posthog/types/dist/index.d.ts +1 -1
- package/node_modules/@posthog/types/dist/index.d.ts.map +1 -1
- package/node_modules/@posthog/types/package.json +1 -1
- package/node_modules/@posthog/types/src/capture-metric.ts +11 -0
- package/node_modules/@posthog/types/src/index.ts +1 -0
- package/node_modules/@zuplo/core/customer.cli.minified.js +80 -80
- package/node_modules/@zuplo/core/index.minified.js +85 -85
- package/node_modules/@zuplo/core/package.json +1 -1
- package/node_modules/@zuplo/graphql/package.json +1 -1
- package/node_modules/@zuplo/openapi-tools/package.json +5 -2
- package/node_modules/@zuplo/otel/package.json +1 -1
- package/node_modules/@zuplo/runtime/out/esm/{chunk-YJ2BHVUH.js → chunk-CDEAY3VY.js} +2 -2
- package/node_modules/@zuplo/runtime/out/esm/chunk-LVSZ3WTO.js +37 -0
- package/node_modules/@zuplo/runtime/out/esm/chunk-LVSZ3WTO.js.map +1 -0
- package/node_modules/@zuplo/runtime/out/esm/{chunk-VTO3F6DK.js → chunk-NUVXDVLJ.js} +2 -2
- package/node_modules/@zuplo/runtime/out/esm/{chunk-6YPRGG62.js → chunk-TPYCFLC7.js} +109 -109
- package/node_modules/@zuplo/runtime/out/esm/chunk-TPYCFLC7.js.map +1 -0
- package/node_modules/@zuplo/runtime/out/esm/index.js +1 -1
- package/node_modules/@zuplo/runtime/out/esm/internal/index.js +1 -1
- package/node_modules/@zuplo/runtime/out/esm/mcp-gateway/index.js +1 -1
- package/node_modules/@zuplo/runtime/out/esm/mocks/index.js +1 -1
- package/node_modules/@zuplo/runtime/out/esm/sdks/aws/index.js +1 -1
- package/node_modules/@zuplo/runtime/out/types/index.d.ts +43 -43
- package/node_modules/@zuplo/runtime/out/types/internal/index.d.ts +14 -0
- package/node_modules/@zuplo/runtime/package.json +1 -1
- package/package.json +15 -12
- package/dist/__tests__/archive-utils.test.d.ts +0 -2
- package/dist/__tests__/archive-utils.test.d.ts.map +0 -1
- package/dist/__tests__/archive-utils.test.js +0 -50
- package/dist/__tests__/archive-utils.test.js.map +0 -1
- package/dist/__tests__/import-openapi.test.d.ts +0 -2
- package/dist/__tests__/import-openapi.test.d.ts.map +0 -1
- package/dist/__tests__/import-openapi.test.js +0 -251
- package/dist/__tests__/import-openapi.test.js.map +0 -1
- package/dist/__tests__/integration/confirm-linked-config.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/confirm-linked-config.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/confirm-linked-config.integration.test.js +0 -202
- package/dist/__tests__/integration/confirm-linked-config.integration.test.js.map +0 -1
- package/dist/__tests__/integration/confirm-production-deploy.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/confirm-production-deploy.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/confirm-production-deploy.integration.test.js +0 -184
- package/dist/__tests__/integration/confirm-production-deploy.integration.test.js.map +0 -1
- package/dist/__tests__/integration/custom-domain.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/custom-domain.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/custom-domain.integration.test.js +0 -563
- package/dist/__tests__/integration/custom-domain.integration.test.js.map +0 -1
- package/dist/__tests__/integration/delete.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/delete.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/delete.integration.test.js +0 -262
- package/dist/__tests__/integration/delete.integration.test.js.map +0 -1
- package/dist/__tests__/integration/deploy.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/deploy.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/deploy.integration.test.js +0 -519
- package/dist/__tests__/integration/deploy.integration.test.js.map +0 -1
- package/dist/__tests__/integration/get-project-param.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/get-project-param.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/get-project-param.integration.test.js +0 -305
- package/dist/__tests__/integration/get-project-param.integration.test.js.map +0 -1
- package/dist/__tests__/integration/info.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/info.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/info.integration.test.js +0 -293
- package/dist/__tests__/integration/info.integration.test.js.map +0 -1
- package/dist/__tests__/integration/jest-mocks-setup.d.ts +0 -2
- package/dist/__tests__/integration/jest-mocks-setup.d.ts.map +0 -1
- package/dist/__tests__/integration/jest-mocks-setup.js +0 -104
- package/dist/__tests__/integration/jest-mocks-setup.js.map +0 -1
- package/dist/__tests__/integration/jest-setup.d.ts +0 -2
- package/dist/__tests__/integration/jest-setup.d.ts.map +0 -1
- package/dist/__tests__/integration/jest-setup.js +0 -12
- package/dist/__tests__/integration/jest-setup.js.map +0 -1
- package/dist/__tests__/integration/link.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/link.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/link.integration.test.js +0 -395
- package/dist/__tests__/integration/link.integration.test.js.map +0 -1
- package/dist/__tests__/integration/linked-config-cascade.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/linked-config-cascade.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/linked-config-cascade.integration.test.js +0 -179
- package/dist/__tests__/integration/linked-config-cascade.integration.test.js.map +0 -1
- package/dist/__tests__/integration/list.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/list.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/list.integration.test.js +0 -300
- package/dist/__tests__/integration/list.integration.test.js.map +0 -1
- package/dist/__tests__/integration/source-upgrade.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/source-upgrade.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/source-upgrade.integration.test.js +0 -100
- package/dist/__tests__/integration/source-upgrade.integration.test.js.map +0 -1
- package/dist/__tests__/integration/test-utils.d.ts +0 -30
- package/dist/__tests__/integration/test-utils.d.ts.map +0 -1
- package/dist/__tests__/integration/test-utils.js +0 -82
- package/dist/__tests__/integration/test-utils.js.map +0 -1
- package/dist/__tests__/integration/tunnel.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/tunnel.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/tunnel.integration.test.js +0 -486
- package/dist/__tests__/integration/tunnel.integration.test.js.map +0 -1
- package/dist/__tests__/integration/variable.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/variable.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/variable.integration.test.js +0 -258
- package/dist/__tests__/integration/variable.integration.test.js.map +0 -1
- package/dist/__tests__/integration/whoami.integration.test.d.ts +0 -2
- package/dist/__tests__/integration/whoami.integration.test.d.ts.map +0 -1
- package/dist/__tests__/integration/whoami.integration.test.js +0 -116
- package/dist/__tests__/integration/whoami.integration.test.js.map +0 -1
- package/dist/__tests__/outdated.test.d.ts +0 -2
- package/dist/__tests__/outdated.test.d.ts.map +0 -1
- package/dist/__tests__/outdated.test.js +0 -67
- package/dist/__tests__/outdated.test.js.map +0 -1
- package/dist/__tests__/populate.test.d.ts +0 -2
- package/dist/__tests__/populate.test.d.ts.map +0 -1
- package/dist/__tests__/populate.test.js +0 -445
- package/dist/__tests__/populate.test.js.map +0 -1
- package/dist/__tests__/tsconfig-upgrader.test.d.ts +0 -2
- package/dist/__tests__/tsconfig-upgrader.test.d.ts.map +0 -1
- package/dist/__tests__/tsconfig-upgrader.test.js +0 -31
- package/dist/__tests__/tsconfig-upgrader.test.js.map +0 -1
- package/dist/ca-certificate/validation.test.d.ts +0 -2
- package/dist/ca-certificate/validation.test.d.ts.map +0 -1
- package/dist/ca-certificate/validation.test.js +0 -131
- package/dist/ca-certificate/validation.test.js.map +0 -1
- package/dist/common/analytics/cli-invocation.test.d.ts +0 -2
- package/dist/common/analytics/cli-invocation.test.d.ts.map +0 -1
- package/dist/common/analytics/cli-invocation.test.js +0 -51
- package/dist/common/analytics/cli-invocation.test.js.map +0 -1
- package/dist/common/analytics/package-manager.test.d.ts +0 -2
- package/dist/common/analytics/package-manager.test.d.ts.map +0 -1
- package/dist/common/analytics/package-manager.test.js +0 -163
- package/dist/common/analytics/package-manager.test.js.map +0 -1
- package/dist/common/cli-dispatcher.test.d.ts +0 -2
- package/dist/common/cli-dispatcher.test.d.ts.map +0 -1
- package/dist/common/cli-dispatcher.test.js +0 -80
- package/dist/common/cli-dispatcher.test.js.map +0 -1
- package/dist/common/middleware/check-pnpm-lifecycle.test.d.ts +0 -2
- package/dist/common/middleware/check-pnpm-lifecycle.test.d.ts.map +0 -1
- package/dist/common/middleware/check-pnpm-lifecycle.test.js +0 -125
- package/dist/common/middleware/check-pnpm-lifecycle.test.js.map +0 -1
- package/dist/common/middleware/get-environment-param.test.d.ts +0 -2
- package/dist/common/middleware/get-environment-param.test.d.ts.map +0 -1
- package/dist/common/middleware/get-environment-param.test.js +0 -57
- package/dist/common/middleware/get-environment-param.test.js.map +0 -1
- package/dist/common/read-linked-config.test.d.ts +0 -2
- package/dist/common/read-linked-config.test.d.ts.map +0 -1
- package/dist/common/read-linked-config.test.js +0 -363
- package/dist/common/read-linked-config.test.js.map +0 -1
- package/dist/common/terminal.test.d.ts +0 -2
- package/dist/common/terminal.test.d.ts.map +0 -1
- package/dist/common/terminal.test.js +0 -101
- package/dist/common/terminal.test.js.map +0 -1
- package/dist/common/utils/build-environment-prompt-choices.test.d.ts +0 -2
- package/dist/common/utils/build-environment-prompt-choices.test.d.ts.map +0 -1
- package/dist/common/utils/build-environment-prompt-choices.test.js +0 -97
- package/dist/common/utils/build-environment-prompt-choices.test.js.map +0 -1
- package/dist/common/utils/format-environment-type.test.d.ts +0 -2
- package/dist/common/utils/format-environment-type.test.d.ts.map +0 -1
- package/dist/common/utils/format-environment-type.test.js +0 -32
- package/dist/common/utils/format-environment-type.test.js.map +0 -1
- package/dist/common/utils/pnpm-lifecycle.test.d.ts +0 -2
- package/dist/common/utils/pnpm-lifecycle.test.d.ts.map +0 -1
- package/dist/common/utils/pnpm-lifecycle.test.js +0 -196
- package/dist/common/utils/pnpm-lifecycle.test.js.map +0 -1
- package/dist/common/utils/pretty-print-environment-prompt.test.d.ts +0 -2
- package/dist/common/utils/pretty-print-environment-prompt.test.d.ts.map +0 -1
- package/dist/common/utils/pretty-print-environment-prompt.test.js +0 -42
- package/dist/common/utils/pretty-print-environment-prompt.test.js.map +0 -1
- package/dist/common/utils/sort-environments-for-prompt.test.d.ts +0 -2
- package/dist/common/utils/sort-environments-for-prompt.test.d.ts.map +0 -1
- package/dist/common/utils/sort-environments-for-prompt.test.js +0 -82
- package/dist/common/utils/sort-environments-for-prompt.test.js.map +0 -1
- package/dist/common/utils/stringify-config.test.d.ts +0 -2
- package/dist/common/utils/stringify-config.test.d.ts.map +0 -1
- package/dist/common/utils/stringify-config.test.js +0 -80
- package/dist/common/utils/stringify-config.test.js.map +0 -1
- package/dist/common/validators/argument-validators.spec.d.ts +0 -2
- package/dist/common/validators/argument-validators.spec.d.ts.map +0 -1
- package/dist/common/validators/argument-validators.spec.js +0 -181
- package/dist/common/validators/argument-validators.spec.js.map +0 -1
- package/dist/common/worker-output.test.d.ts +0 -2
- package/dist/common/worker-output.test.d.ts.map +0 -1
- package/dist/common/worker-output.test.js +0 -32
- package/dist/common/worker-output.test.js.map +0 -1
- package/dist/deploy/archive.local-registry.test.d.ts +0 -2
- package/dist/deploy/archive.local-registry.test.d.ts.map +0 -1
- package/dist/deploy/archive.local-registry.test.js +0 -100
- package/dist/deploy/archive.local-registry.test.js.map +0 -1
- package/dist/deploy/archive.test.d.ts +0 -2
- package/dist/deploy/archive.test.d.ts.map +0 -1
- package/dist/deploy/archive.test.js +0 -248
- package/dist/deploy/archive.test.js.map +0 -1
- package/dist/deploy/classify-build-probe.test.d.ts +0 -2
- package/dist/deploy/classify-build-probe.test.d.ts.map +0 -1
- package/dist/deploy/classify-build-probe.test.js +0 -51
- package/dist/deploy/classify-build-probe.test.js.map +0 -1
- package/dist/deploy/poll-deployment.test.d.ts +0 -2
- package/dist/deploy/poll-deployment.test.d.ts.map +0 -1
- package/dist/deploy/poll-deployment.test.js +0 -158
- package/dist/deploy/poll-deployment.test.js.map +0 -1
- package/dist/dev/zuplo-local-gitignore.test.d.ts +0 -2
- package/dist/dev/zuplo-local-gitignore.test.d.ts.map +0 -1
- package/dist/dev/zuplo-local-gitignore.test.js +0 -58
- package/dist/dev/zuplo-local-gitignore.test.js.map +0 -1
- package/dist/editor/e2e/editor.spec.d.ts +0 -2
- package/dist/editor/e2e/editor.spec.d.ts.map +0 -1
- package/dist/editor/e2e/editor.spec.js +0 -44
- package/dist/editor/e2e/editor.spec.js.map +0 -1
- package/dist/link/project-type.test.d.ts +0 -2
- package/dist/link/project-type.test.d.ts.map +0 -1
- package/dist/link/project-type.test.js +0 -225
- package/dist/link/project-type.test.js.map +0 -1
- package/dist/lint/resolve-binary.test.d.ts +0 -2
- package/dist/lint/resolve-binary.test.d.ts.map +0 -1
- package/dist/lint/resolve-binary.test.js +0 -155
- package/dist/lint/resolve-binary.test.js.map +0 -1
- package/dist/open-api/convert/handler.spec.d.ts +0 -2
- package/dist/open-api/convert/handler.spec.d.ts.map +0 -1
- package/dist/open-api/convert/handler.spec.js +0 -301
- package/dist/open-api/convert/handler.spec.js.map +0 -1
- package/dist/open-api/merge/handler.spec.d.ts +0 -2
- package/dist/open-api/merge/handler.spec.d.ts.map +0 -1
- package/dist/open-api/merge/handler.spec.js +0 -673
- package/dist/open-api/merge/handler.spec.js.map +0 -1
- package/dist/open-api/overlay/handler.spec.d.ts +0 -2
- package/dist/open-api/overlay/handler.spec.d.ts.map +0 -1
- package/dist/open-api/overlay/handler.spec.js +0 -346
- package/dist/open-api/overlay/handler.spec.js.map +0 -1
- package/dist/source/ai-gateway/files.test.d.ts +0 -2
- package/dist/source/ai-gateway/files.test.d.ts.map +0 -1
- package/dist/source/ai-gateway/files.test.js +0 -135
- package/dist/source/ai-gateway/files.test.js.map +0 -1
- package/dist/source/ai-gateway/handler.test.d.ts +0 -2
- package/dist/source/ai-gateway/handler.test.d.ts.map +0 -1
- package/dist/source/ai-gateway/handler.test.js +0 -113
- package/dist/source/ai-gateway/handler.test.js.map +0 -1
- package/dist/source/ai-gateway/package.test.d.ts +0 -2
- package/dist/source/ai-gateway/package.test.d.ts.map +0 -1
- package/dist/source/ai-gateway/package.test.js +0 -30
- package/dist/source/ai-gateway/package.test.js.map +0 -1
- package/dist/source/ai-gateway/planner.test.d.ts +0 -2
- package/dist/source/ai-gateway/planner.test.d.ts.map +0 -1
- package/dist/source/ai-gateway/planner.test.js +0 -330
- package/dist/source/ai-gateway/planner.test.js.map +0 -1
- package/dist/source/ai-gateway/release.test.d.ts +0 -2
- package/dist/source/ai-gateway/release.test.d.ts.map +0 -1
- package/dist/source/ai-gateway/release.test.js +0 -62
- package/dist/source/ai-gateway/release.test.js.map +0 -1
- package/dist/test/invoke-test.test.d.ts +0 -2
- package/dist/test/invoke-test.test.d.ts.map +0 -1
- package/dist/test/invoke-test.test.js +0 -150
- package/dist/test/invoke-test.test.js.map +0 -1
- package/dist/test/test-files.test.d.ts +0 -2
- package/dist/test/test-files.test.d.ts.map +0 -1
- package/dist/test/test-files.test.js +0 -57
- package/dist/test/test-files.test.js.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/file-format.spec.d.ts +0 -2
- package/node_modules/@zuplo/openapi-tools/dist/file-format.spec.d.ts.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/file-format.spec.js +0 -289
- package/node_modules/@zuplo/openapi-tools/dist/file-format.spec.js.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/merge-fixtures.spec.d.ts +0 -2
- package/node_modules/@zuplo/openapi-tools/dist/merge-fixtures.spec.d.ts.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/merge-fixtures.spec.js +0 -181
- package/node_modules/@zuplo/openapi-tools/dist/merge-fixtures.spec.js.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/merge.spec.d.ts +0 -2
- package/node_modules/@zuplo/openapi-tools/dist/merge.spec.d.ts.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/merge.spec.js +0 -399
- package/node_modules/@zuplo/openapi-tools/dist/merge.spec.js.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/overlay.spec.d.ts +0 -2
- package/node_modules/@zuplo/openapi-tools/dist/overlay.spec.d.ts.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/overlay.spec.js +0 -779
- package/node_modules/@zuplo/openapi-tools/dist/overlay.spec.js.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/path-transform.spec.d.ts +0 -2
- package/node_modules/@zuplo/openapi-tools/dist/path-transform.spec.d.ts.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/path-transform.spec.js +0 -269
- package/node_modules/@zuplo/openapi-tools/dist/path-transform.spec.js.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/url-utils.spec.d.ts +0 -2
- package/node_modules/@zuplo/openapi-tools/dist/url-utils.spec.d.ts.map +0 -1
- package/node_modules/@zuplo/openapi-tools/dist/url-utils.spec.js +0 -93
- package/node_modules/@zuplo/openapi-tools/dist/url-utils.spec.js.map +0 -1
- package/node_modules/@zuplo/runtime/out/esm/chunk-6YPRGG62.js.map +0 -1
- package/node_modules/@zuplo/runtime/out/esm/chunk-PBDT4FDO.js +0 -37
- package/node_modules/@zuplo/runtime/out/esm/chunk-PBDT4FDO.js.map +0 -1
- /package/node_modules/@zuplo/runtime/out/esm/{chunk-YJ2BHVUH.js.map → chunk-CDEAY3VY.js.map} +0 -0
- /package/node_modules/@zuplo/runtime/out/esm/{chunk-PBDT4FDO.js.LEGAL.txt → chunk-LVSZ3WTO.js.LEGAL.txt} +0 -0
- /package/node_modules/@zuplo/runtime/out/esm/{chunk-VTO3F6DK.js.map → chunk-NUVXDVLJ.js.map} +0 -0
- /package/node_modules/@zuplo/runtime/out/esm/{chunk-6YPRGG62.js.LEGAL.txt → chunk-TPYCFLC7.js.LEGAL.txt} +0 -0
|
@@ -1,519 +0,0 @@
|
|
|
1
|
-
import nock from "nock";
|
|
2
|
-
import yargs from "yargs/yargs";
|
|
3
|
-
import deployCommand from "../../cmds/deploy.js";
|
|
4
|
-
import { cleanupTest, RequestCapture, setupAuthenticatedNock, setupTestEnvironment, TEST_ACCOUNT_NAME, TEST_API_BASE, TEST_AUTH_TOKEN, TEST_PROJECT_NAME, } from "./test-utils.js";
|
|
5
|
-
jest.mock("../../common/validators/file-system-validator.js", () => ({
|
|
6
|
-
validDeployDirectoryValidator: {
|
|
7
|
-
validate: jest.fn().mockResolvedValue(true),
|
|
8
|
-
},
|
|
9
|
-
}));
|
|
10
|
-
jest.mock("../../deploy/archive.js", () => ({
|
|
11
|
-
archive: jest.fn().mockResolvedValue({
|
|
12
|
-
tarball: "/tmp/test-archive.tar.gz",
|
|
13
|
-
metadata: {
|
|
14
|
-
branch: "main",
|
|
15
|
-
sha: "abc123",
|
|
16
|
-
repoUrl: "https://github.com/user/repo.git",
|
|
17
|
-
},
|
|
18
|
-
}),
|
|
19
|
-
generateMetadata: jest.fn().mockResolvedValue({
|
|
20
|
-
branch: "main",
|
|
21
|
-
sha: "abc123",
|
|
22
|
-
repoUrl: "https://github.com/user/repo.git",
|
|
23
|
-
}),
|
|
24
|
-
}));
|
|
25
|
-
jest.mock("simple-git", () => ({
|
|
26
|
-
simpleGit: () => ({
|
|
27
|
-
checkIsRepo: jest.fn().mockResolvedValue(true),
|
|
28
|
-
status: jest.fn().mockResolvedValue({ current: "git-branch" }),
|
|
29
|
-
}),
|
|
30
|
-
}));
|
|
31
|
-
jest.mock("../../deploy/file-upload.js", () => ({
|
|
32
|
-
upload: jest.fn(async ({ uploadUrl }) => {
|
|
33
|
-
const response = await fetch(uploadUrl, {
|
|
34
|
-
method: "PUT",
|
|
35
|
-
body: "mock-tarball-content",
|
|
36
|
-
});
|
|
37
|
-
return {
|
|
38
|
-
ok: response.ok,
|
|
39
|
-
status: response.status,
|
|
40
|
-
};
|
|
41
|
-
}),
|
|
42
|
-
}));
|
|
43
|
-
jest.mock("../../deploy/poll-deployment.js", () => ({
|
|
44
|
-
pollDeployment: jest.fn().mockResolvedValue({
|
|
45
|
-
url: "https://test-project-main.zuplo.app",
|
|
46
|
-
logUrl: "https://portal.zuplo.com/logs/deployment-123",
|
|
47
|
-
}),
|
|
48
|
-
pollBuild: jest.fn().mockResolvedValue({
|
|
49
|
-
conditionType: "Complete",
|
|
50
|
-
}),
|
|
51
|
-
}));
|
|
52
|
-
jest.mock("../../common/populate.js", () => ({
|
|
53
|
-
pullSystemConfig: jest.fn().mockResolvedValue(undefined),
|
|
54
|
-
pullLocalConfig: jest.fn().mockResolvedValue(undefined),
|
|
55
|
-
}));
|
|
56
|
-
jest.mock("../../deploy/environments.js", () => ({
|
|
57
|
-
retrieveOrCreateEnvironment: jest.fn().mockResolvedValue({
|
|
58
|
-
name: "development",
|
|
59
|
-
type: "development",
|
|
60
|
-
}),
|
|
61
|
-
UnableToAutoLinkToExistingProject: class extends Error {
|
|
62
|
-
},
|
|
63
|
-
isProductionBranchName: jest.fn().mockReturnValue(false),
|
|
64
|
-
}));
|
|
65
|
-
jest.mock("node:fs", () => ({
|
|
66
|
-
existsSync: jest.fn().mockReturnValue(false),
|
|
67
|
-
readFileSync: jest.fn((filePath) => {
|
|
68
|
-
if (filePath.endsWith("tls.crt")) {
|
|
69
|
-
return "mock-cert-content";
|
|
70
|
-
}
|
|
71
|
-
if (filePath.endsWith("tls.key")) {
|
|
72
|
-
return "mock-key-content";
|
|
73
|
-
}
|
|
74
|
-
return Buffer.from("mock-tarball-content");
|
|
75
|
-
}),
|
|
76
|
-
readdirSync: jest.fn().mockReturnValue([]),
|
|
77
|
-
writeFileSync: jest.fn(),
|
|
78
|
-
}));
|
|
79
|
-
async function executeDeployCommand(args) {
|
|
80
|
-
const yargsInstance = yargs([])
|
|
81
|
-
.command(deployCommand)
|
|
82
|
-
.help(false)
|
|
83
|
-
.version(false)
|
|
84
|
-
.exitProcess(false);
|
|
85
|
-
const commandArgs = ["deploy"];
|
|
86
|
-
if (args.account) {
|
|
87
|
-
commandArgs.push("--account", args.account);
|
|
88
|
-
}
|
|
89
|
-
if (args.project) {
|
|
90
|
-
commandArgs.push("--project", args.project);
|
|
91
|
-
}
|
|
92
|
-
if (args["api-key"]) {
|
|
93
|
-
commandArgs.push("--api-key", args["api-key"]);
|
|
94
|
-
}
|
|
95
|
-
commandArgs.push("--branch", args.environment ?? "main");
|
|
96
|
-
if (args["self-hosted-endpoint"]) {
|
|
97
|
-
commandArgs.push("--self-hosted-endpoint", args["self-hosted-endpoint"]);
|
|
98
|
-
}
|
|
99
|
-
if (args["mtls-certificates-dir"]) {
|
|
100
|
-
commandArgs.push("--mtls-certificates-dir", args["mtls-certificates-dir"]);
|
|
101
|
-
}
|
|
102
|
-
if (args.dir) {
|
|
103
|
-
commandArgs.push("--dir", args.dir);
|
|
104
|
-
}
|
|
105
|
-
process.argv = ["node", "zuplo", ...commandArgs];
|
|
106
|
-
return await yargsInstance.parse(commandArgs);
|
|
107
|
-
}
|
|
108
|
-
const mockPrintResult = jest.mocked(require("../../common/output.js").printResultToConsoleAndExitGracefully);
|
|
109
|
-
const mockReadFileSync = jest.mocked(require("node:fs").readFileSync);
|
|
110
|
-
const mockReaddirSync = jest.mocked(require("node:fs").readdirSync);
|
|
111
|
-
const mockExistsSync = jest.mocked(require("node:fs").existsSync);
|
|
112
|
-
describe("Deploy Command Integration Tests", () => {
|
|
113
|
-
let requestCapture;
|
|
114
|
-
const originalArgv = process.argv;
|
|
115
|
-
beforeEach(() => {
|
|
116
|
-
setupTestEnvironment();
|
|
117
|
-
requestCapture = new RequestCapture();
|
|
118
|
-
nock.disableNetConnect();
|
|
119
|
-
jest.clearAllMocks();
|
|
120
|
-
mockExistsSync.mockReturnValue(false);
|
|
121
|
-
mockReaddirSync.mockReturnValue([]);
|
|
122
|
-
mockReadFileSync.mockImplementation((filePath) => {
|
|
123
|
-
if (filePath.endsWith("tls.crt")) {
|
|
124
|
-
return "mock-cert-content";
|
|
125
|
-
}
|
|
126
|
-
if (filePath.endsWith("tls.key")) {
|
|
127
|
-
return "mock-key-content";
|
|
128
|
-
}
|
|
129
|
-
return Buffer.from("mock-tarball-content");
|
|
130
|
-
});
|
|
131
|
-
});
|
|
132
|
-
afterEach(() => {
|
|
133
|
-
process.argv = originalArgv;
|
|
134
|
-
cleanupTest();
|
|
135
|
-
requestCapture.clear();
|
|
136
|
-
});
|
|
137
|
-
describe("SaaS deployment", () => {
|
|
138
|
-
it("should intercept POST request to get source upload URL", async () => {
|
|
139
|
-
const mockUploadUrlResponse = {
|
|
140
|
-
uploadUrl: "https://storage.example.com/upload/abc123",
|
|
141
|
-
deploymentId: "deployment-456",
|
|
142
|
-
};
|
|
143
|
-
const scope = setupAuthenticatedNock(nock(TEST_API_BASE))
|
|
144
|
-
.post("/v1/deployments/source-url")
|
|
145
|
-
.reply(200, mockUploadUrlResponse);
|
|
146
|
-
const uploadScope = nock("https://storage.example.com")
|
|
147
|
-
.put("/upload/abc123")
|
|
148
|
-
.reply(200, { message: "Upload successful" });
|
|
149
|
-
[scope, uploadScope].forEach((s) => {
|
|
150
|
-
s.on("request", (req, interceptor, body) => {
|
|
151
|
-
requestCapture.capture(req, interceptor, body);
|
|
152
|
-
});
|
|
153
|
-
});
|
|
154
|
-
await executeDeployCommand({
|
|
155
|
-
account: TEST_ACCOUNT_NAME,
|
|
156
|
-
project: TEST_PROJECT_NAME,
|
|
157
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
158
|
-
dir: ".",
|
|
159
|
-
});
|
|
160
|
-
expect(scope.isDone()).toBe(true);
|
|
161
|
-
expect(uploadScope.isDone()).toBe(true);
|
|
162
|
-
expect(mockPrintResult).toHaveBeenCalledWith(expect.stringContaining("Deployed to https://test-project-main.zuplo.app"), expect.any(Object));
|
|
163
|
-
const capturedRequests = requestCapture.getRequests();
|
|
164
|
-
expect(capturedRequests).toMatchSnapshot("deploy-saas-requests");
|
|
165
|
-
const sourceUrlRequest = capturedRequests.find((req) => req.path === "/v1/deployments/source-url");
|
|
166
|
-
expect(sourceUrlRequest?.method).toBe("POST");
|
|
167
|
-
expect(sourceUrlRequest?.body).toEqual({
|
|
168
|
-
accountName: TEST_ACCOUNT_NAME,
|
|
169
|
-
projectName: TEST_PROJECT_NAME,
|
|
170
|
-
environment: "main",
|
|
171
|
-
repositoryUrl: "https://github.com/user/repo.git",
|
|
172
|
-
sha: "abc123",
|
|
173
|
-
});
|
|
174
|
-
});
|
|
175
|
-
it("should handle upload URL request failure", async () => {
|
|
176
|
-
const errorResponse = {
|
|
177
|
-
error: "Forbidden",
|
|
178
|
-
message: "Insufficient permissions",
|
|
179
|
-
statusCode: 403,
|
|
180
|
-
};
|
|
181
|
-
const scope = setupAuthenticatedNock(nock(TEST_API_BASE))
|
|
182
|
-
.post("/v1/deployments/source-url")
|
|
183
|
-
.reply(403, errorResponse);
|
|
184
|
-
scope.on("request", (req, interceptor, body) => {
|
|
185
|
-
requestCapture.capture(req, interceptor, body);
|
|
186
|
-
});
|
|
187
|
-
await expect(executeDeployCommand({
|
|
188
|
-
account: TEST_ACCOUNT_NAME,
|
|
189
|
-
project: TEST_PROJECT_NAME,
|
|
190
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
191
|
-
dir: ".",
|
|
192
|
-
})).rejects.toThrow("Process would exit");
|
|
193
|
-
expect(scope.isDone()).toBe(true);
|
|
194
|
-
const capturedRequests = requestCapture.getRequests();
|
|
195
|
-
expect(capturedRequests).toMatchSnapshot("deploy-saas-error-requests");
|
|
196
|
-
});
|
|
197
|
-
});
|
|
198
|
-
describe("Branch flag spellings", () => {
|
|
199
|
-
const mockArchive = jest.mocked(require("../../deploy/archive.js").archive);
|
|
200
|
-
const baseArgs = [
|
|
201
|
-
"deploy",
|
|
202
|
-
"--account",
|
|
203
|
-
TEST_ACCOUNT_NAME,
|
|
204
|
-
"--project",
|
|
205
|
-
TEST_PROJECT_NAME,
|
|
206
|
-
"--api-key",
|
|
207
|
-
TEST_AUTH_TOKEN,
|
|
208
|
-
];
|
|
209
|
-
afterEach(() => {
|
|
210
|
-
delete process.env.ZUPLO_ENVIRONMENT;
|
|
211
|
-
delete process.env.ZUPLO_BRANCH;
|
|
212
|
-
});
|
|
213
|
-
const cases = [
|
|
214
|
-
{
|
|
215
|
-
name: "--environment X",
|
|
216
|
-
flags: ["--environment", "my-feature"],
|
|
217
|
-
env: {},
|
|
218
|
-
expected: "my-feature",
|
|
219
|
-
},
|
|
220
|
-
{
|
|
221
|
-
name: "--environment=X",
|
|
222
|
-
flags: ["--environment=my-feature"],
|
|
223
|
-
env: {},
|
|
224
|
-
expected: "my-feature",
|
|
225
|
-
},
|
|
226
|
-
{
|
|
227
|
-
name: "ZUPLO_ENVIRONMENT",
|
|
228
|
-
flags: [],
|
|
229
|
-
env: { ZUPLO_ENVIRONMENT: "my-feature" },
|
|
230
|
-
expected: "my-feature",
|
|
231
|
-
},
|
|
232
|
-
{
|
|
233
|
-
name: "--branch X",
|
|
234
|
-
flags: ["--branch", "my-feature"],
|
|
235
|
-
env: {},
|
|
236
|
-
expected: "my-feature",
|
|
237
|
-
},
|
|
238
|
-
{
|
|
239
|
-
name: "--branch=X",
|
|
240
|
-
flags: ["--branch=my-feature"],
|
|
241
|
-
env: {},
|
|
242
|
-
expected: "my-feature",
|
|
243
|
-
},
|
|
244
|
-
{
|
|
245
|
-
name: "ZUPLO_BRANCH alone: ignored, falls back to git as before",
|
|
246
|
-
flags: [],
|
|
247
|
-
env: { ZUPLO_BRANCH: "from-branch-var" },
|
|
248
|
-
expected: "git-branch",
|
|
249
|
-
},
|
|
250
|
-
{
|
|
251
|
-
name: "no flag or env var: git branch",
|
|
252
|
-
flags: [],
|
|
253
|
-
env: {},
|
|
254
|
-
expected: "git-branch",
|
|
255
|
-
},
|
|
256
|
-
{
|
|
257
|
-
name: "--branch overrides --environment",
|
|
258
|
-
flags: ["--branch", "my-feature", "--environment", "other"],
|
|
259
|
-
env: {},
|
|
260
|
-
expected: "my-feature",
|
|
261
|
-
},
|
|
262
|
-
{
|
|
263
|
-
name: "--branch overrides ZUPLO_ENVIRONMENT",
|
|
264
|
-
flags: ["--branch", "my-feature"],
|
|
265
|
-
env: { ZUPLO_ENVIRONMENT: "from-env-var" },
|
|
266
|
-
expected: "my-feature",
|
|
267
|
-
},
|
|
268
|
-
{
|
|
269
|
-
name: "a typed flag beats ZUPLO_ENVIRONMENT",
|
|
270
|
-
flags: ["--environment", "my-feature"],
|
|
271
|
-
env: { ZUPLO_ENVIRONMENT: "from-env-var" },
|
|
272
|
-
expected: "my-feature",
|
|
273
|
-
},
|
|
274
|
-
];
|
|
275
|
-
for (const { name, flags, env, expected } of cases) {
|
|
276
|
-
it(`resolves the branch from ${name}`, async () => {
|
|
277
|
-
Object.assign(process.env, env);
|
|
278
|
-
const args = [...baseArgs, ...flags];
|
|
279
|
-
process.argv = ["node", "zuplo", ...args];
|
|
280
|
-
const scope = setupAuthenticatedNock(nock(TEST_API_BASE))
|
|
281
|
-
.post("/v1/deployments/source-url")
|
|
282
|
-
.reply(200, {
|
|
283
|
-
uploadUrl: "https://storage.example.com/upload/abc123",
|
|
284
|
-
deploymentId: "deployment-456",
|
|
285
|
-
});
|
|
286
|
-
const uploadScope = nock("https://storage.example.com")
|
|
287
|
-
.put("/upload/abc123")
|
|
288
|
-
.reply(200, {});
|
|
289
|
-
await yargs([])
|
|
290
|
-
.env("ZUPLO")
|
|
291
|
-
.command(deployCommand)
|
|
292
|
-
.help(false)
|
|
293
|
-
.version(false)
|
|
294
|
-
.exitProcess(false)
|
|
295
|
-
.parse(args);
|
|
296
|
-
expect(scope.isDone()).toBe(true);
|
|
297
|
-
expect(uploadScope.isDone()).toBe(true);
|
|
298
|
-
expect(mockArchive).toHaveBeenCalledTimes(1);
|
|
299
|
-
expect(mockArchive.mock.calls[0][0]).toMatchObject({
|
|
300
|
-
environment: expected,
|
|
301
|
-
});
|
|
302
|
-
});
|
|
303
|
-
}
|
|
304
|
-
});
|
|
305
|
-
describe("Self-hosted deployment", () => {
|
|
306
|
-
it("should intercept POST request to self-hosted build endpoint", async () => {
|
|
307
|
-
const selfHostedEndpoint = "https://my-zuplo.company.com";
|
|
308
|
-
const mockBuildResponse = {
|
|
309
|
-
buildName: "build-789",
|
|
310
|
-
};
|
|
311
|
-
const buildScope = setupAuthenticatedNock(nock(selfHostedEndpoint))
|
|
312
|
-
.post("/v1/deployments/build")
|
|
313
|
-
.reply(200, mockBuildResponse);
|
|
314
|
-
const deploymentScope = setupAuthenticatedNock(nock(selfHostedEndpoint))
|
|
315
|
-
.get("/v1/deployments/test-project-main")
|
|
316
|
-
.reply(200, {
|
|
317
|
-
deploymentUrl: "https://my-zuplo.company.com/test-project-main",
|
|
318
|
-
});
|
|
319
|
-
[buildScope, deploymentScope].forEach((scope) => {
|
|
320
|
-
scope.on("request", (req, interceptor, body) => {
|
|
321
|
-
requestCapture.capture(req, interceptor, body);
|
|
322
|
-
});
|
|
323
|
-
});
|
|
324
|
-
await executeDeployCommand({
|
|
325
|
-
account: TEST_ACCOUNT_NAME,
|
|
326
|
-
project: TEST_PROJECT_NAME,
|
|
327
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
328
|
-
"self-hosted-endpoint": selfHostedEndpoint,
|
|
329
|
-
dir: ".",
|
|
330
|
-
});
|
|
331
|
-
expect(buildScope.isDone()).toBe(true);
|
|
332
|
-
expect(deploymentScope.isDone()).toBe(true);
|
|
333
|
-
expect(mockPrintResult).toHaveBeenCalledWith(expect.stringContaining("Deployed to https://my-zuplo.company.com/test-project-main"), expect.any(Object));
|
|
334
|
-
const capturedRequests = requestCapture.getRequests();
|
|
335
|
-
expect(capturedRequests).toMatchSnapshot("deploy-self-hosted-requests");
|
|
336
|
-
const buildRequest = capturedRequests.find((req) => req.path === "/v1/deployments/build");
|
|
337
|
-
expect(buildRequest?.method).toBe("POST");
|
|
338
|
-
expect(buildRequest?.body).toBeDefined();
|
|
339
|
-
}, 60000);
|
|
340
|
-
it("should handle self-hosted build failure", async () => {
|
|
341
|
-
const selfHostedEndpoint = "https://my-zuplo.company.com";
|
|
342
|
-
const errorResponse = {
|
|
343
|
-
error: "Bad Request",
|
|
344
|
-
message: "Invalid project configuration",
|
|
345
|
-
statusCode: 400,
|
|
346
|
-
};
|
|
347
|
-
const scope = setupAuthenticatedNock(nock(selfHostedEndpoint))
|
|
348
|
-
.post("/v1/deployments/build")
|
|
349
|
-
.reply(400, errorResponse);
|
|
350
|
-
scope.on("request", (req, interceptor, body) => {
|
|
351
|
-
requestCapture.capture(req, interceptor, body);
|
|
352
|
-
});
|
|
353
|
-
await executeDeployCommand({
|
|
354
|
-
account: TEST_ACCOUNT_NAME,
|
|
355
|
-
project: TEST_PROJECT_NAME,
|
|
356
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
357
|
-
"self-hosted-endpoint": selfHostedEndpoint,
|
|
358
|
-
dir: ".",
|
|
359
|
-
});
|
|
360
|
-
expect(scope.isDone()).toBe(true);
|
|
361
|
-
const capturedRequests = requestCapture.getRequests();
|
|
362
|
-
expect(capturedRequests).toMatchSnapshot("deploy-self-hosted-error-requests");
|
|
363
|
-
}, 60000);
|
|
364
|
-
it("should include mtls certificates from mtls-certificates-dir", async () => {
|
|
365
|
-
const selfHostedEndpoint = "https://my-zuplo.company.com";
|
|
366
|
-
const mockBuildResponse = {
|
|
367
|
-
buildName: "build-789",
|
|
368
|
-
};
|
|
369
|
-
let capturedBuildRequestBody = "";
|
|
370
|
-
mockReaddirSync.mockReturnValue([
|
|
371
|
-
{
|
|
372
|
-
name: "cert-name-2",
|
|
373
|
-
isDirectory: () => true,
|
|
374
|
-
},
|
|
375
|
-
{
|
|
376
|
-
name: "cert-name-1",
|
|
377
|
-
isDirectory: () => true,
|
|
378
|
-
},
|
|
379
|
-
]);
|
|
380
|
-
mockReadFileSync.mockImplementation((filePath) => {
|
|
381
|
-
if (/cert-name-1[\\/]tls\.crt$/.test(filePath)) {
|
|
382
|
-
return "CERT_1";
|
|
383
|
-
}
|
|
384
|
-
if (/cert-name-1[\\/]tls\.key$/.test(filePath)) {
|
|
385
|
-
return "KEY_1";
|
|
386
|
-
}
|
|
387
|
-
if (/cert-name-2[\\/]tls\.crt$/.test(filePath)) {
|
|
388
|
-
return "CERT_2";
|
|
389
|
-
}
|
|
390
|
-
if (/cert-name-2[\\/]tls\.key$/.test(filePath)) {
|
|
391
|
-
return "KEY_2";
|
|
392
|
-
}
|
|
393
|
-
return Buffer.from("mock-tarball-content");
|
|
394
|
-
});
|
|
395
|
-
const buildScope = setupAuthenticatedNock(nock(selfHostedEndpoint))
|
|
396
|
-
.post("/v1/deployments/build", (body) => {
|
|
397
|
-
capturedBuildRequestBody = Buffer.isBuffer(body)
|
|
398
|
-
? body.toString("utf-8")
|
|
399
|
-
: String(body);
|
|
400
|
-
return true;
|
|
401
|
-
})
|
|
402
|
-
.reply(200, mockBuildResponse);
|
|
403
|
-
const deploymentScope = setupAuthenticatedNock(nock(selfHostedEndpoint))
|
|
404
|
-
.get("/v1/deployments/test-project-main")
|
|
405
|
-
.reply(200, {
|
|
406
|
-
deploymentUrl: "https://my-zuplo.company.com/test-project-main",
|
|
407
|
-
});
|
|
408
|
-
[buildScope, deploymentScope].forEach((scope) => {
|
|
409
|
-
scope.on("request", (req, interceptor, body) => {
|
|
410
|
-
requestCapture.capture(req, interceptor, body);
|
|
411
|
-
});
|
|
412
|
-
});
|
|
413
|
-
await executeDeployCommand({
|
|
414
|
-
account: TEST_ACCOUNT_NAME,
|
|
415
|
-
project: TEST_PROJECT_NAME,
|
|
416
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
417
|
-
"self-hosted-endpoint": selfHostedEndpoint,
|
|
418
|
-
"mtls-certificates-dir": "./mtls",
|
|
419
|
-
dir: ".",
|
|
420
|
-
});
|
|
421
|
-
expect(buildScope.isDone()).toBe(true);
|
|
422
|
-
expect(deploymentScope.isDone()).toBe(true);
|
|
423
|
-
const capturedRequests = requestCapture.getRequests();
|
|
424
|
-
const buildRequest = capturedRequests.find((req) => req.path === "/v1/deployments/build");
|
|
425
|
-
expect(buildRequest?.method).toBe("POST");
|
|
426
|
-
expect(capturedBuildRequestBody).toContain('name="mtlsCertificate"');
|
|
427
|
-
expect((capturedBuildRequestBody.match(/name="mtlsCertificate"/g) || []).length).toBe(2);
|
|
428
|
-
expect(capturedBuildRequestBody).toContain('"certName":"cert-name-1"');
|
|
429
|
-
expect(capturedBuildRequestBody).toContain('"mtlsCrt":"CERT_1"');
|
|
430
|
-
expect(capturedBuildRequestBody).toContain('"mtlsKey":"KEY_1"');
|
|
431
|
-
expect(capturedBuildRequestBody).toContain('"certName":"cert-name-2"');
|
|
432
|
-
expect(capturedBuildRequestBody).toContain('"mtlsCrt":"CERT_2"');
|
|
433
|
-
expect(capturedBuildRequestBody).toContain('"mtlsKey":"KEY_2"');
|
|
434
|
-
expect(capturedBuildRequestBody.indexOf('"certName":"cert-name-1"')).toBeLessThan(capturedBuildRequestBody.indexOf('"certName":"cert-name-2"'));
|
|
435
|
-
}, 60000);
|
|
436
|
-
});
|
|
437
|
-
describe("Directory argument handling", () => {
|
|
438
|
-
it("should work when --dir is not specified (uses default)", async () => {
|
|
439
|
-
const mockUploadUrlResponse = {
|
|
440
|
-
uploadUrl: "https://storage.example.com/upload/default-test",
|
|
441
|
-
deploymentId: "deployment-default",
|
|
442
|
-
};
|
|
443
|
-
const scope = setupAuthenticatedNock(nock(TEST_API_BASE))
|
|
444
|
-
.post("/v1/deployments/source-url")
|
|
445
|
-
.reply(200, mockUploadUrlResponse);
|
|
446
|
-
const uploadScope = nock("https://storage.example.com")
|
|
447
|
-
.put("/upload/default-test")
|
|
448
|
-
.reply(200, { message: "Upload successful" });
|
|
449
|
-
[scope, uploadScope].forEach((s) => {
|
|
450
|
-
s.on("request", (req, interceptor, body) => {
|
|
451
|
-
requestCapture.capture(req, interceptor, body);
|
|
452
|
-
});
|
|
453
|
-
});
|
|
454
|
-
await executeDeployCommand({
|
|
455
|
-
account: TEST_ACCOUNT_NAME,
|
|
456
|
-
project: TEST_PROJECT_NAME,
|
|
457
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
458
|
-
});
|
|
459
|
-
expect(scope.isDone()).toBe(true);
|
|
460
|
-
expect(uploadScope.isDone()).toBe(true);
|
|
461
|
-
expect(mockPrintResult).toHaveBeenCalledWith(expect.stringContaining("Deployed to https://test-project-main.zuplo.app"), expect.any(Object));
|
|
462
|
-
const capturedRequests = requestCapture.getRequests();
|
|
463
|
-
expect(capturedRequests).toMatchSnapshot("deploy-default-dir-requests");
|
|
464
|
-
});
|
|
465
|
-
it("should work with explicit --dir=.", async () => {
|
|
466
|
-
const mockUploadUrlResponse = {
|
|
467
|
-
uploadUrl: "https://storage.example.com/upload/explicit-dot",
|
|
468
|
-
deploymentId: "deployment-dot",
|
|
469
|
-
};
|
|
470
|
-
const scope = setupAuthenticatedNock(nock(TEST_API_BASE))
|
|
471
|
-
.post("/v1/deployments/source-url")
|
|
472
|
-
.reply(200, mockUploadUrlResponse);
|
|
473
|
-
const uploadScope = nock("https://storage.example.com")
|
|
474
|
-
.put("/upload/explicit-dot")
|
|
475
|
-
.reply(200, { message: "Upload successful" });
|
|
476
|
-
[scope, uploadScope].forEach((s) => {
|
|
477
|
-
s.on("request", (req, interceptor, body) => {
|
|
478
|
-
requestCapture.capture(req, interceptor, body);
|
|
479
|
-
});
|
|
480
|
-
});
|
|
481
|
-
await executeDeployCommand({
|
|
482
|
-
account: TEST_ACCOUNT_NAME,
|
|
483
|
-
project: TEST_PROJECT_NAME,
|
|
484
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
485
|
-
dir: ".",
|
|
486
|
-
});
|
|
487
|
-
expect(scope.isDone()).toBe(true);
|
|
488
|
-
expect(uploadScope.isDone()).toBe(true);
|
|
489
|
-
const capturedRequests = requestCapture.getRequests();
|
|
490
|
-
expect(capturedRequests).toMatchSnapshot("deploy-explicit-dot-requests");
|
|
491
|
-
});
|
|
492
|
-
});
|
|
493
|
-
describe("Request validation", () => {
|
|
494
|
-
it("should include correct headers for SaaS deployment", async () => {
|
|
495
|
-
const mockResponse = {
|
|
496
|
-
uploadUrl: "https://storage.example.com/upload/abc123",
|
|
497
|
-
deploymentId: "deployment-456",
|
|
498
|
-
};
|
|
499
|
-
const scope = nock(TEST_API_BASE)
|
|
500
|
-
.post("/v1/deployments/source-url")
|
|
501
|
-
.matchHeader("authorization", `Bearer ${TEST_AUTH_TOKEN}`)
|
|
502
|
-
.reply(200, mockResponse);
|
|
503
|
-
nock("https://storage.example.com").put("/upload/abc123").reply(200);
|
|
504
|
-
scope.on("request", (req, interceptor, body) => {
|
|
505
|
-
requestCapture.capture(req, interceptor, body);
|
|
506
|
-
});
|
|
507
|
-
await executeDeployCommand({
|
|
508
|
-
account: TEST_ACCOUNT_NAME,
|
|
509
|
-
project: TEST_PROJECT_NAME,
|
|
510
|
-
"api-key": TEST_AUTH_TOKEN,
|
|
511
|
-
dir: ".",
|
|
512
|
-
});
|
|
513
|
-
expect(scope.isDone()).toBe(true);
|
|
514
|
-
const capturedRequests = requestCapture.getRequests();
|
|
515
|
-
expect(capturedRequests).toMatchSnapshot("deploy-headers-validation");
|
|
516
|
-
});
|
|
517
|
-
});
|
|
518
|
-
});
|
|
519
|
-
//# sourceMappingURL=deploy.integration.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.integration.test.js","sourceRoot":"","sources":["../../../src/__tests__/integration/deploy.integration.test.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Integration tests for the deploy command\n */\n/// <reference types=\"jest\" />\nimport nock from \"nock\";\nimport yargs from \"yargs/yargs\";\nimport deployCommand from \"../../cmds/deploy.js\";\nimport {\n cleanupTest,\n RequestCapture,\n setupAuthenticatedNock,\n setupTestEnvironment,\n TEST_ACCOUNT_NAME,\n TEST_API_BASE,\n TEST_AUTH_TOKEN,\n TEST_PROJECT_NAME,\n} from \"./test-utils.js\";\n\n// Mock file system validator\njest.mock(\"../../common/validators/file-system-validator.js\", () => ({\n validDeployDirectoryValidator: {\n validate: jest.fn().mockResolvedValue(true),\n },\n}));\n\n// Mock archive functionality to return predictable metadata\njest.mock(\"../../deploy/archive.js\", () => ({\n archive: jest.fn().mockResolvedValue({\n tarball: \"/tmp/test-archive.tar.gz\",\n metadata: {\n branch: \"main\",\n sha: \"abc123\",\n repoUrl: \"https://github.com/user/repo.git\",\n },\n }),\n generateMetadata: jest.fn().mockResolvedValue({\n branch: \"main\",\n sha: \"abc123\",\n repoUrl: \"https://github.com/user/repo.git\",\n }),\n}));\n\n// Mock file upload but allow the HTTP call to be intercepted\n// Only reached when no branch is typed. Stands in for the git checkout so the\n// test never shells out to the real repository.\njest.mock(\"simple-git\", () => ({\n simpleGit: () => ({\n checkIsRepo: jest.fn().mockResolvedValue(true),\n status: jest.fn().mockResolvedValue({ current: \"git-branch\" }),\n }),\n}));\n\njest.mock(\"../../deploy/file-upload.js\", () => ({\n upload: jest.fn(async ({ uploadUrl }) => {\n // Make actual HTTP call to allow nock interception\n const response = await fetch(uploadUrl, {\n method: \"PUT\",\n body: \"mock-tarball-content\",\n });\n return {\n ok: response.ok,\n status: response.status,\n };\n }),\n}));\n\n// Mock polling functions to simulate deployment success\njest.mock(\"../../deploy/poll-deployment.js\", () => ({\n pollDeployment: jest.fn().mockResolvedValue({\n url: \"https://test-project-main.zuplo.app\",\n logUrl: \"https://portal.zuplo.com/logs/deployment-123\",\n }),\n pollBuild: jest.fn().mockResolvedValue({\n conditionType: \"Complete\",\n }),\n}));\n\n// Mock link functionality for self-hosted\njest.mock(\"../../common/populate.js\", () => ({\n pullSystemConfig: jest.fn().mockResolvedValue(undefined),\n pullLocalConfig: jest.fn().mockResolvedValue(undefined),\n}));\n\n// Mock environment functions\njest.mock(\"../../deploy/environments.js\", () => ({\n retrieveOrCreateEnvironment: jest.fn().mockResolvedValue({\n name: \"development\",\n type: \"development\",\n }),\n UnableToAutoLinkToExistingProject: class extends Error {},\n // Used by confirmProductionDeploy middleware. Default to false so the\n // test's default (interactive=false) path is preserved; tests that want\n // to assert the prompt path can override this mock.\n isProductionBranchName: jest.fn().mockReturnValue(false),\n}));\n\n// Mock file system functions\njest.mock(\"node:fs\", () => ({\n existsSync: jest.fn().mockReturnValue(false),\n readFileSync: jest.fn((filePath: string) => {\n if (filePath.endsWith(\"tls.crt\")) {\n return \"mock-cert-content\";\n }\n if (filePath.endsWith(\"tls.key\")) {\n return \"mock-key-content\";\n }\n return Buffer.from(\"mock-tarball-content\");\n }),\n readdirSync: jest.fn().mockReturnValue([]),\n writeFileSync: jest.fn(),\n}));\n\n/**\n * Execute deploy command with given arguments using actual yargs command\n */\nasync function executeDeployCommand(args: {\n account?: string;\n project?: string;\n \"api-key\"?: string;\n environment?: string;\n \"self-hosted-endpoint\"?: string;\n \"mtls-certificates-dir\"?: string;\n dir?: string;\n}) {\n const yargsInstance = yargs([])\n .command(deployCommand)\n .help(false)\n .version(false)\n .exitProcess(false);\n\n // Build command line arguments\n const commandArgs = [\"deploy\"];\n\n if (args.account) {\n commandArgs.push(\"--account\", args.account);\n }\n\n if (args.project) {\n commandArgs.push(\"--project\", args.project);\n }\n\n if (args[\"api-key\"]) {\n commandArgs.push(\"--api-key\", args[\"api-key\"]);\n }\n\n // Always pass a branch. Without it the `fetchEnvironment` middleware\n // infers one from git, which shells out to the real repository the tests run\n // in — `nock.disableNetConnect()` cannot intercept a git subprocess. On a\n // detached HEAD (how CI checks out tags) that path runs `git fetch --all`\n // against the live remote and fails whenever a tracking ref moved since the\n // clone. The deploy payload's environment comes from the mocked `archive()`\n // metadata, so pinning this here does not change what the tests assert.\n commandArgs.push(\"--branch\", args.environment ?? \"main\");\n\n if (args[\"self-hosted-endpoint\"]) {\n commandArgs.push(\"--self-hosted-endpoint\", args[\"self-hosted-endpoint\"]);\n }\n\n if (args[\"mtls-certificates-dir\"]) {\n commandArgs.push(\"--mtls-certificates-dir\", args[\"mtls-certificates-dir\"]);\n }\n\n if (args.dir) {\n commandArgs.push(\"--dir\", args.dir);\n }\n\n // The command inspects process.argv to tell typed flags from env vars\n process.argv = [\"node\", \"zuplo\", ...commandArgs];\n\n // Parse and execute the command\n return await yargsInstance.parse(commandArgs);\n}\n\n// Get the mocked functions\nconst mockPrintResult = jest.mocked(\n require(\"../../common/output.js\").printResultToConsoleAndExitGracefully\n);\nconst mockReadFileSync = jest.mocked(require(\"node:fs\").readFileSync);\nconst mockReaddirSync = jest.mocked(require(\"node:fs\").readdirSync);\nconst mockExistsSync = jest.mocked(require(\"node:fs\").existsSync);\n\ndescribe(\"Deploy Command Integration Tests\", () => {\n let requestCapture: RequestCapture;\n const originalArgv = process.argv;\n\n beforeEach(() => {\n setupTestEnvironment();\n requestCapture = new RequestCapture();\n\n // Disable real HTTP requests\n nock.disableNetConnect();\n\n // Clear mock calls from previous tests\n jest.clearAllMocks();\n\n mockExistsSync.mockReturnValue(false);\n mockReaddirSync.mockReturnValue([]);\n mockReadFileSync.mockImplementation((filePath: string) => {\n if (filePath.endsWith(\"tls.crt\")) {\n return \"mock-cert-content\";\n }\n if (filePath.endsWith(\"tls.key\")) {\n return \"mock-key-content\";\n }\n return Buffer.from(\"mock-tarball-content\");\n });\n });\n\n afterEach(() => {\n process.argv = originalArgv;\n cleanupTest();\n requestCapture.clear();\n });\n\n describe(\"SaaS deployment\", () => {\n it(\"should intercept POST request to get source upload URL\", async () => {\n const mockUploadUrlResponse = {\n uploadUrl: \"https://storage.example.com/upload/abc123\",\n deploymentId: \"deployment-456\",\n };\n\n const scope = setupAuthenticatedNock(nock(TEST_API_BASE))\n .post(\"/v1/deployments/source-url\")\n .reply(200, mockUploadUrlResponse);\n\n // Mock the upload to cloud storage\n const uploadScope = nock(\"https://storage.example.com\")\n .put(\"/upload/abc123\")\n .reply(200, { message: \"Upload successful\" });\n\n [scope, uploadScope].forEach((s) => {\n s.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n });\n\n await executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n dir: \".\",\n });\n\n expect(scope.isDone()).toBe(true);\n expect(uploadScope.isDone()).toBe(true);\n\n // Verify successful deployment message\n expect(mockPrintResult).toHaveBeenCalledWith(\n expect.stringContaining(\n \"Deployed to https://test-project-main.zuplo.app\"\n ),\n expect.any(Object) // spinner object\n );\n\n const capturedRequests = requestCapture.getRequests();\n expect(capturedRequests).toMatchSnapshot(\"deploy-saas-requests\");\n\n // Verify the source-url request payload\n const sourceUrlRequest = capturedRequests.find(\n (req) => req.path === \"/v1/deployments/source-url\"\n );\n expect(sourceUrlRequest?.method).toBe(\"POST\");\n expect(sourceUrlRequest?.body).toEqual({\n accountName: TEST_ACCOUNT_NAME,\n projectName: TEST_PROJECT_NAME,\n environment: \"main\",\n repositoryUrl: \"https://github.com/user/repo.git\",\n sha: \"abc123\",\n });\n });\n\n it(\"should handle upload URL request failure\", async () => {\n const errorResponse = {\n error: \"Forbidden\",\n message: \"Insufficient permissions\",\n statusCode: 403,\n };\n\n const scope = setupAuthenticatedNock(nock(TEST_API_BASE))\n .post(\"/v1/deployments/source-url\")\n .reply(403, errorResponse);\n\n scope.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n\n await expect(\n executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n dir: \".\",\n })\n ).rejects.toThrow(\"Process would exit\");\n\n expect(scope.isDone()).toBe(true);\n\n const capturedRequests = requestCapture.getRequests();\n expect(capturedRequests).toMatchSnapshot(\"deploy-saas-error-requests\");\n });\n });\n\n describe(\"Branch flag spellings\", () => {\n const mockArchive = jest.mocked(require(\"../../deploy/archive.js\").archive);\n const baseArgs = [\n \"deploy\",\n \"--account\",\n TEST_ACCOUNT_NAME,\n \"--project\",\n TEST_PROJECT_NAME,\n \"--api-key\",\n TEST_AUTH_TOKEN,\n ];\n\n afterEach(() => {\n delete process.env.ZUPLO_ENVIRONMENT;\n delete process.env.ZUPLO_BRANCH;\n });\n\n // Every spelling existing scripts use must keep resolving to the same\n // branch; `--branch` must match them.\n const cases: {\n name: string;\n flags: string[];\n env: Record<string, string>;\n expected: string;\n }[] = [\n {\n name: \"--environment X\",\n flags: [\"--environment\", \"my-feature\"],\n env: {},\n expected: \"my-feature\",\n },\n {\n name: \"--environment=X\",\n flags: [\"--environment=my-feature\"],\n env: {},\n expected: \"my-feature\",\n },\n {\n name: \"ZUPLO_ENVIRONMENT\",\n flags: [],\n env: { ZUPLO_ENVIRONMENT: \"my-feature\" },\n expected: \"my-feature\",\n },\n {\n name: \"--branch X\",\n flags: [\"--branch\", \"my-feature\"],\n env: {},\n expected: \"my-feature\",\n },\n {\n name: \"--branch=X\",\n flags: [\"--branch=my-feature\"],\n env: {},\n expected: \"my-feature\",\n },\n {\n name: \"ZUPLO_BRANCH alone: ignored, falls back to git as before\",\n flags: [],\n env: { ZUPLO_BRANCH: \"from-branch-var\" },\n expected: \"git-branch\",\n },\n {\n name: \"no flag or env var: git branch\",\n flags: [],\n env: {},\n expected: \"git-branch\",\n },\n {\n name: \"--branch overrides --environment\",\n flags: [\"--branch\", \"my-feature\", \"--environment\", \"other\"],\n env: {},\n expected: \"my-feature\",\n },\n {\n name: \"--branch overrides ZUPLO_ENVIRONMENT\",\n flags: [\"--branch\", \"my-feature\"],\n env: { ZUPLO_ENVIRONMENT: \"from-env-var\" },\n expected: \"my-feature\",\n },\n {\n name: \"a typed flag beats ZUPLO_ENVIRONMENT\",\n flags: [\"--environment\", \"my-feature\"],\n env: { ZUPLO_ENVIRONMENT: \"from-env-var\" },\n expected: \"my-feature\",\n },\n ];\n\n for (const { name, flags, env, expected } of cases) {\n it(`resolves the branch from ${name}`, async () => {\n Object.assign(process.env, env);\n const args = [...baseArgs, ...flags];\n process.argv = [\"node\", \"zuplo\", ...args];\n\n const scope = setupAuthenticatedNock(nock(TEST_API_BASE))\n .post(\"/v1/deployments/source-url\")\n .reply(200, {\n uploadUrl: \"https://storage.example.com/upload/abc123\",\n deploymentId: \"deployment-456\",\n });\n const uploadScope = nock(\"https://storage.example.com\")\n .put(\"/upload/abc123\")\n .reply(200, {});\n\n await yargs([])\n .env(\"ZUPLO\")\n .command(deployCommand)\n .help(false)\n .version(false)\n .exitProcess(false)\n .parse(args);\n\n expect(scope.isDone()).toBe(true);\n expect(uploadScope.isDone()).toBe(true);\n expect(mockArchive).toHaveBeenCalledTimes(1);\n expect(mockArchive.mock.calls[0][0]).toMatchObject({\n environment: expected,\n });\n });\n }\n });\n\n describe(\"Self-hosted deployment\", () => {\n it(\"should intercept POST request to self-hosted build endpoint\", async () => {\n const selfHostedEndpoint = \"https://my-zuplo.company.com\";\n const mockBuildResponse = {\n buildName: \"build-789\",\n };\n\n const buildScope = setupAuthenticatedNock(nock(selfHostedEndpoint))\n .post(\"/v1/deployments/build\")\n .reply(200, mockBuildResponse);\n\n // Mock deployment retrieval after build completion\n const deploymentScope = setupAuthenticatedNock(nock(selfHostedEndpoint))\n .get(\"/v1/deployments/test-project-main\")\n .reply(200, {\n deploymentUrl: \"https://my-zuplo.company.com/test-project-main\",\n });\n\n [buildScope, deploymentScope].forEach((scope) => {\n scope.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n });\n\n await executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n \"self-hosted-endpoint\": selfHostedEndpoint,\n dir: \".\",\n });\n\n expect(buildScope.isDone()).toBe(true);\n expect(deploymentScope.isDone()).toBe(true);\n\n // Verify successful deployment message\n expect(mockPrintResult).toHaveBeenCalledWith(\n expect.stringContaining(\n \"Deployed to https://my-zuplo.company.com/test-project-main\"\n ),\n expect.any(Object) // spinner object\n );\n\n const capturedRequests = requestCapture.getRequests();\n expect(capturedRequests).toMatchSnapshot(\"deploy-self-hosted-requests\");\n\n // Verify the build request\n const buildRequest = capturedRequests.find(\n (req) => req.path === \"/v1/deployments/build\"\n );\n expect(buildRequest?.method).toBe(\"POST\");\n // Note: FormData body won't be easily testable in snapshots, but we can verify it exists\n expect(buildRequest?.body).toBeDefined();\n }, 60000); // Increase timeout for this complex test\n\n it(\"should handle self-hosted build failure\", async () => {\n const selfHostedEndpoint = \"https://my-zuplo.company.com\";\n const errorResponse = {\n error: \"Bad Request\",\n message: \"Invalid project configuration\",\n statusCode: 400,\n };\n\n const scope = setupAuthenticatedNock(nock(selfHostedEndpoint))\n .post(\"/v1/deployments/build\")\n .reply(400, errorResponse);\n\n scope.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n\n await executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n \"self-hosted-endpoint\": selfHostedEndpoint,\n dir: \".\",\n });\n\n expect(scope.isDone()).toBe(true);\n\n const capturedRequests = requestCapture.getRequests();\n expect(capturedRequests).toMatchSnapshot(\n \"deploy-self-hosted-error-requests\"\n );\n }, 60000); // Increase timeout for this test too\n\n it(\"should include mtls certificates from mtls-certificates-dir\", async () => {\n const selfHostedEndpoint = \"https://my-zuplo.company.com\";\n const mockBuildResponse = {\n buildName: \"build-789\",\n };\n let capturedBuildRequestBody = \"\";\n\n mockReaddirSync.mockReturnValue([\n {\n name: \"cert-name-2\",\n isDirectory: () => true,\n },\n {\n name: \"cert-name-1\",\n isDirectory: () => true,\n },\n ]);\n mockReadFileSync.mockImplementation((filePath: string) => {\n if (/cert-name-1[\\\\/]tls\\.crt$/.test(filePath)) {\n return \"CERT_1\";\n }\n if (/cert-name-1[\\\\/]tls\\.key$/.test(filePath)) {\n return \"KEY_1\";\n }\n if (/cert-name-2[\\\\/]tls\\.crt$/.test(filePath)) {\n return \"CERT_2\";\n }\n if (/cert-name-2[\\\\/]tls\\.key$/.test(filePath)) {\n return \"KEY_2\";\n }\n return Buffer.from(\"mock-tarball-content\");\n });\n\n const buildScope = setupAuthenticatedNock(nock(selfHostedEndpoint))\n .post(\"/v1/deployments/build\", (body) => {\n capturedBuildRequestBody = Buffer.isBuffer(body)\n ? body.toString(\"utf-8\")\n : String(body);\n return true;\n })\n .reply(200, mockBuildResponse);\n\n const deploymentScope = setupAuthenticatedNock(nock(selfHostedEndpoint))\n .get(\"/v1/deployments/test-project-main\")\n .reply(200, {\n deploymentUrl: \"https://my-zuplo.company.com/test-project-main\",\n });\n\n [buildScope, deploymentScope].forEach((scope) => {\n scope.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n });\n\n await executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n \"self-hosted-endpoint\": selfHostedEndpoint,\n \"mtls-certificates-dir\": \"./mtls\",\n dir: \".\",\n });\n\n expect(buildScope.isDone()).toBe(true);\n expect(deploymentScope.isDone()).toBe(true);\n\n const capturedRequests = requestCapture.getRequests();\n const buildRequest = capturedRequests.find(\n (req) => req.path === \"/v1/deployments/build\"\n );\n\n expect(buildRequest?.method).toBe(\"POST\");\n expect(capturedBuildRequestBody).toContain('name=\"mtlsCertificate\"');\n expect(\n (capturedBuildRequestBody.match(/name=\"mtlsCertificate\"/g) || []).length\n ).toBe(2);\n expect(capturedBuildRequestBody).toContain('\"certName\":\"cert-name-1\"');\n expect(capturedBuildRequestBody).toContain('\"mtlsCrt\":\"CERT_1\"');\n expect(capturedBuildRequestBody).toContain('\"mtlsKey\":\"KEY_1\"');\n expect(capturedBuildRequestBody).toContain('\"certName\":\"cert-name-2\"');\n expect(capturedBuildRequestBody).toContain('\"mtlsCrt\":\"CERT_2\"');\n expect(capturedBuildRequestBody).toContain('\"mtlsKey\":\"KEY_2\"');\n\n expect(\n capturedBuildRequestBody.indexOf('\"certName\":\"cert-name-1\"')\n ).toBeLessThan(\n capturedBuildRequestBody.indexOf('\"certName\":\"cert-name-2\"')\n );\n }, 60000);\n });\n\n describe(\"Directory argument handling\", () => {\n it(\"should work when --dir is not specified (uses default)\", async () => {\n const mockUploadUrlResponse = {\n uploadUrl: \"https://storage.example.com/upload/default-test\",\n deploymentId: \"deployment-default\",\n };\n\n const scope = setupAuthenticatedNock(nock(TEST_API_BASE))\n .post(\"/v1/deployments/source-url\")\n .reply(200, mockUploadUrlResponse);\n\n // Mock the upload to cloud storage\n const uploadScope = nock(\"https://storage.example.com\")\n .put(\"/upload/default-test\")\n .reply(200, { message: \"Upload successful\" });\n\n [scope, uploadScope].forEach((s) => {\n s.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n });\n\n // Note: Not passing dir argument at all - should default to \".\"\n await executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n });\n\n expect(scope.isDone()).toBe(true);\n expect(uploadScope.isDone()).toBe(true);\n\n // Verify successful deployment message\n expect(mockPrintResult).toHaveBeenCalledWith(\n expect.stringContaining(\n \"Deployed to https://test-project-main.zuplo.app\"\n ),\n expect.any(Object)\n );\n\n const capturedRequests = requestCapture.getRequests();\n expect(capturedRequests).toMatchSnapshot(\"deploy-default-dir-requests\");\n });\n\n it(\"should work with explicit --dir=.\", async () => {\n const mockUploadUrlResponse = {\n uploadUrl: \"https://storage.example.com/upload/explicit-dot\",\n deploymentId: \"deployment-dot\",\n };\n\n const scope = setupAuthenticatedNock(nock(TEST_API_BASE))\n .post(\"/v1/deployments/source-url\")\n .reply(200, mockUploadUrlResponse);\n\n const uploadScope = nock(\"https://storage.example.com\")\n .put(\"/upload/explicit-dot\")\n .reply(200, { message: \"Upload successful\" });\n\n [scope, uploadScope].forEach((s) => {\n s.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n });\n\n await executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n dir: \".\",\n });\n\n expect(scope.isDone()).toBe(true);\n expect(uploadScope.isDone()).toBe(true);\n\n const capturedRequests = requestCapture.getRequests();\n expect(capturedRequests).toMatchSnapshot(\"deploy-explicit-dot-requests\");\n });\n });\n\n describe(\"Request validation\", () => {\n it(\"should include correct headers for SaaS deployment\", async () => {\n const mockResponse = {\n uploadUrl: \"https://storage.example.com/upload/abc123\",\n deploymentId: \"deployment-456\",\n };\n\n const scope = nock(TEST_API_BASE)\n .post(\"/v1/deployments/source-url\")\n .matchHeader(\"authorization\", `Bearer ${TEST_AUTH_TOKEN}`)\n .reply(200, mockResponse);\n\n // Mock the upload endpoint\n nock(\"https://storage.example.com\").put(\"/upload/abc123\").reply(200);\n\n scope.on(\"request\", (req, interceptor, body) => {\n requestCapture.capture(req, interceptor, body);\n });\n\n await executeDeployCommand({\n account: TEST_ACCOUNT_NAME,\n project: TEST_PROJECT_NAME,\n \"api-key\": TEST_AUTH_TOKEN,\n dir: \".\",\n });\n\n expect(scope.isDone()).toBe(true);\n\n const capturedRequests = requestCapture.getRequests();\n expect(capturedRequests).toMatchSnapshot(\"deploy-headers-validation\");\n });\n });\n});\n"]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"get-project-param.integration.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/integration/get-project-param.integration.test.ts"],"names":[],"mappings":""}
|