@contember/cli 1.1.0-alpha.6 → 1.1.0-alpha.7

package/dist/src/utils/instance/environment.d.ts

@@ -1,5 +1,4 @@
 export declare type InstanceApiEnvironment = {
     baseUrl: string;
 };
-export declare const getInstanceFromEnv: () => string | undefined;
 //# sourceMappingURL=environment.d.ts.map

package/dist/src/utils/instance/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/environment.ts"],"names":[],"mappings":"AAAA,oBAAY,sBAAsB,GAAG;IACpC,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,kBAAkB,QAAO,MAAM,GAAG,SAE9C,CAAA"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/environment.ts"],"names":[],"mappings":"AAAA,oBAAY,sBAAsB,GAAG;IACpC,OAAO,EAAE,MAAM,CAAA;CACf,CAAA"}

package/dist/src/utils/instance/environment.js

@@ -1,8 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInstanceFromEnv = void 0;
-const getInstanceFromEnv = () => {
-    return process.env.CONTEMBER_API_URL || process.env.CONTEMBER_INSTANCE;
-};
-exports.getInstanceFromEnv = getInstanceFromEnv;
 //# sourceMappingURL=environment.js.map

package/dist/src/utils/instance/environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/utils/instance/environment.ts"],"names":[],"mappings":";;;AAIO,MAAM,kBAAkB,GAAG,GAAuB,EAAE;IAC1D,OAAO,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;AACvE,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B"}
+{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../src/utils/instance/environment.ts"],"names":[],"mappings":""}

package/dist/src/utils/instance/interactiveUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactiveUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/interactiveUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAgBjD,eAAO,MAAM,8CAA8C,cAC/C,SAAS,oCAElB,QAAQ,sBAAsB,CAkBhC,CAAA"}
+{"version":3,"file":"interactiveUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/instance/interactiveUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAgBjD,eAAO,MAAM,8CAA8C,cAC/C,SAAS,oCAElB,QAAQ,sBAAsB,CAkBhC,CAAA"}

package/dist/src/utils/instance/interactiveUtils.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interactiveResolveInstanceEnvironmentFromInput = void 0;
-const environment_1 = require("./environment");
 const prompts_1 = __importDefault(require("prompts"));
 const createRemoteInstanceEnvironment = (instanceName) => {
     let baseUrl = instanceName;
@@ -19,7 +18,7 @@ const createRemoteInstanceEnvironment = (instanceName) => {
 };
 const interactiveResolveInstanceEnvironmentFromInput = async (workspace, instance) => {
     let instanceName = instance ||
-        (0, environment_1.getInstanceFromEnv)() ||
+        workspace.env.apiUrl ||
         (await (0, prompts_1.default)({
             type: 'text',
             name: 'instance',

package/dist/src/utils/instance/interactiveUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"interactiveUtils.js","sourceRoot":"","sources":["../../../../src/utils/instance/interactiveUtils.ts"],"names":[],"mappings":";;;;;;AAAA,+CAA0E;AAE1E,sDAA6B;AAE7B,MAAM,+BAA+B,GAAG,CAAC,YAAoB,EAA0B,EAAE;IACxF,IAAI,OAAO,GAAG,YAAY,CAAA;IAC1B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC1B,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;KAClD;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAA;QACpE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;KACjE;IAED,OAAO,EAAE,OAAO,EAAE,CAAA;AACnB,CAAC,CAAA;AAEM,MAAM,8CAA8C,GAAG,KAAK,EAClE,SAAoB,EACpB,QAAiB,EACiB,EAAE;IACpC,IAAI,YAAY,GACf,QAAQ;QACR,IAAA,gCAAkB,GAAE;QACpB,CACC,MAAM,IAAA,iBAAO,EAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,cAAc;SACvB,CAAC,CACF,CAAC,QAAQ,CAAA;IACX,IAAI,CAAC,YAAY,EAAE;QAClB,MAAM,gCAAgC,CAAA;KACtC;IACD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAClC,MAAM,yBAAyB,YAAY,GAAG,CAAA;KAC9C;IACD,OAAO,+BAA+B,CAAC,YAAY,CAAC,CAAA;AACrD,CAAC,CAAA;AArBY,QAAA,8CAA8C,kDAqB1D"}
+{"version":3,"file":"interactiveUtils.js","sourceRoot":"","sources":["../../../../src/utils/instance/interactiveUtils.ts"],"names":[],"mappings":";;;;;;AAEA,sDAA6B;AAE7B,MAAM,+BAA+B,GAAG,CAAC,YAAoB,EAA0B,EAAE;IACxF,IAAI,OAAO,GAAG,YAAY,CAAA;IAC1B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC1B,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;KAClD;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAA;QACpE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;KACjE;IAED,OAAO,EAAE,OAAO,EAAE,CAAA;AACnB,CAAC,CAAA;AAEM,MAAM,8CAA8C,GAAG,KAAK,EAClE,SAAoB,EACpB,QAAiB,EACiB,EAAE;IACpC,IAAI,YAAY,GACf,QAAQ;QACR,SAAS,CAAC,GAAG,CAAC,MAAM;QACpB,CACC,MAAM,IAAA,iBAAO,EAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,cAAc;SACvB,CAAC,CACF,CAAC,QAAQ,CAAA;IACX,IAAI,CAAC,YAAY,EAAE;QAClB,MAAM,gCAAgC,CAAA;KACtC;IACD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAClC,MAAM,yBAAyB,YAAY,GAAG,CAAA;KAC9C;IACD,OAAO,+BAA+B,CAAC,YAAY,CAAC,CAAA;AACrD,CAAC,CAAA;AArBY,QAAA,8CAA8C,kDAqB1D"}

package/dist/src/utils/tenant.d.ts

@@ -1,7 +1,8 @@
 import { GraphQLClient } from 'graphql-request';
 import { InstanceApiEnvironment } from './instance';
+import { Workspace } from '@contember/cli-common';
 export declare const createTenantApiUrl: (url: string) => string;
-export declare const interactiveResolveLoginToken: (instance: InstanceApiEnvironment) => Promise<any>;
+export declare const interactiveResolveLoginToken: (workspace: Workspace) => Promise<any>;
 export declare const interactiveSignIn: ({ apiUrl, loginToken, expiration, }: {
     apiUrl: string;
     loginToken: string;
@@ -13,8 +14,10 @@ export declare const interactiveAskForCredentials: () => Promise<{
     email: string;
     password: string;
 }>;
-export declare const interactiveResolveApiToken: ({ instance, }: {
+export declare const interactiveResolveApiToken: ({ workspace, instance, apiToken, }: {
+    workspace: Workspace;
     instance: InstanceApiEnvironment;
+    apiToken?: string | undefined;
 }) => Promise<string>;
 export declare const interactiveInvite: ({ client }: {
     client: TenantClient;

package/dist/src/utils/tenant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../../src/utils/tenant.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAKnD,eAAO,MAAM,kBAAkB,QAAS,MAAM,WAQ7C,CAAA;AAED,eAAO,MAAM,4BAA4B,aAAoB,sBAAsB,iBAUlF,CAAA;AAED,eAAO,MAAM,iBAAiB;YAKrB,MAAM;gBACF,MAAM;;MAEf,QAAQ;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAwBnC,CAAA;AAED,eAAO,MAAM,4BAA4B;WAA8B,MAAM;cAAY,MAAM;EAmB9F,CAAA;AAED,eAAO,MAAM,0BAA0B;cAG5B,sBAAsB;MAC7B,QAAQ,MAAM,CAyBjB,CAAA;AAED,eAAO,MAAM,iBAAiB;YAAgC,YAAY;MAAK,QAAQ,IAAI,CAyB1F,CAAA;AAED,eAAO,MAAM,uBAAuB;YAG3B,YAAY;MACjB,QAAQ;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAuBxC,CAAA;AA4DD,eAAO,MAAM,wBAAwB;YAI5B,MAAM;gBACF,MAAM;MACf,QAAQ,IAAI,CAkCf,CAAA;AAED,aAAK,kBAAkB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AACD,aAAK,UAAU,GAAG;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,kBAAkB,EAAE,CAAA;CAC/B,CAAA;AAED,UAAU,OAAO;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE;QACN,IAAI,EAAE,MAAM,CAAA;QACZ,SAAS,EAAE;YACV,IAAI,EAAE,MAAM,CAAA;SACZ,EAAE,CAAA;KACH,EAAE,CAAA;CACH;AAED,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,aAAa;WAEvC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IASpD,YAAY,CACxB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,UAAU,EAAE,EACzB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAwB5B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBpF,YAAY,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAsBlC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAsB9F,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAmBvE,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBxD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7D,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB/E"}
+{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../../src/utils/tenant.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAKjD,eAAO,MAAM,kBAAkB,QAAS,MAAM,WAQ7C,CAAA;AAED,eAAO,MAAM,4BAA4B,cAAqB,SAAS,iBAUtE,CAAA;AAED,eAAO,MAAM,iBAAiB;YAKrB,MAAM;gBACF,MAAM;;MAEf,QAAQ;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAwBnC,CAAA;AAED,eAAO,MAAM,4BAA4B;WAA8B,MAAM;cAAY,MAAM;EAmB9F,CAAA;AAED,eAAO,MAAM,0BAA0B;eAK3B,SAAS;cACV,sBAAsB;;MAE7B,QAAQ,MAAM,CA4BjB,CAAA;AAED,eAAO,MAAM,iBAAiB;YAAgC,YAAY;MAAK,QAAQ,IAAI,CAyB1F,CAAA;AAED,eAAO,MAAM,uBAAuB;YAG3B,YAAY;MACjB,QAAQ;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAuBxC,CAAA;AA4DD,eAAO,MAAM,wBAAwB;YAI5B,MAAM;gBACF,MAAM;MACf,QAAQ,IAAI,CAkCf,CAAA;AAED,aAAK,kBAAkB,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AACD,aAAK,UAAU,GAAG;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,kBAAkB,EAAE,CAAA;CAC/B,CAAA;AAED,UAAU,OAAO;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE;QACN,IAAI,EAAE,MAAM,CAAA;QACZ,SAAS,EAAE;YACV,IAAI,EAAE,MAAM,CAAA;SACZ,EAAE,CAAA;KACH,EAAE,CAAA;CACH;AAED,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,aAAa;WAEvC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IASpD,YAAY,CACxB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,UAAU,EAAE,EACzB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAwB5B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBpF,YAAY,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAsBlC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAsB9F,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAmBvE,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBxD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7D,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB/E"}

package/dist/src/utils/tenant.js

@@ -17,9 +17,9 @@ const createTenantApiUrl = (url) => {
     return url + '/tenant';
 };
 exports.createTenantApiUrl = createTenantApiUrl;
-const interactiveResolveLoginToken = async (instance) => {
-    if (process.env.CONTEMBER_LOGIN_TOKEN) {
-        return process.env.CONTEMBER_LOGIN_TOKEN;
+const interactiveResolveLoginToken = async (workspace) => {
+    if (workspace.env.loginToken) {
+        return workspace.env.loginToken;
     }
     const { loginToken } = await (0, prompts_1.default)({
         type: 'text',
@@ -75,9 +75,12 @@ const interactiveAskForCredentials = async () => {
     return { email, password };
 };
 exports.interactiveAskForCredentials = interactiveAskForCredentials;
-const interactiveResolveApiToken = async ({ instance, }) => {
-    if (process.env.CONTEMBER_API_TOKEN) {
-        return process.env.CONTEMBER_API_TOKEN;
+const interactiveResolveApiToken = async ({ workspace, instance, apiToken, }) => {
+    if (apiToken) {
+        return apiToken;
+    }
+    if (workspace.env.apiToken) {
+        return workspace.env.apiToken;
     }
     const { strategy } = await (0, prompts_1.default)({
         type: 'select',
@@ -89,7 +92,7 @@ const interactiveResolveApiToken = async ({ instance, }) => {
         ],
     });
     if (strategy === 'signin') {
-        const loginToken = await (0, exports.interactiveResolveLoginToken)(instance);
+        const loginToken = await (0, exports.interactiveResolveLoginToken)(workspace);
         return (await (0, exports.interactiveSignIn)({ apiUrl: (0, exports.createTenantApiUrl)(instance.baseUrl), loginToken, expiration: 60 * 5 }))
             .sessionToken;
     }

package/dist/src/utils/tenant.js.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../src/utils/tenant.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../../src/utils/tenant.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "1.1.0-alpha.6",
+  "version": "1.1.0-alpha.7",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/src/run.js"
@@ -14,15 +14,15 @@
     "@types/prompts": "^2.0.1"
   },
   "dependencies": {
-    "@contember/cli-common": "^1.1.0-alpha.6",
-    "@contember/config-loader": "^1.1.0-alpha.6",
-    "@contember/database-migrations": "^1.1.0-alpha.6",
-    "@contember/dic": "^1.1.0-alpha.6",
-    "@contember/engine-content-api": "^1.1.0-alpha.6",
-    "@contember/schema": "^1.1.0-alpha.6",
-    "@contember/schema-definition": "^1.1.0-alpha.6",
-    "@contember/schema-migrations": "^1.1.0-alpha.6",
-    "@contember/schema-utils": "^1.1.0-alpha.6",
+    "@contember/cli-common": "^1.1.0-alpha.7",
+    "@contember/config-loader": "^1.1.0-alpha.7",
+    "@contember/database-migrations": "^1.1.0-alpha.7",
+    "@contember/dic": "^1.1.0-alpha.7",
+    "@contember/engine-content-api": "^1.1.0-alpha.7",
+    "@contember/schema": "^1.1.0-alpha.7",
+    "@contember/schema-definition": "^1.1.0-alpha.7",
+    "@contember/schema-migrations": "^1.1.0-alpha.7",
+    "@contember/schema-utils": "^1.1.0-alpha.7",
     "@graphql-tools/merge": "^6.2.14",
     "chalk": "^4.1.0",
     "chalk-table": "^1.0.2",

package/src/commands/deploy/DeployCommand.ts

@@ -1,4 +1,4 @@
-import { Command, CommandConfiguration, Input, Workspace } from '@contember/cli-common'
+import { Command, CommandConfiguration, Input, Project, Workspace } from '@contember/cli-common'
 import {
 	configureExecuteMigrationCommand,
 	ExecuteMigrationOptions,
@@ -11,9 +11,14 @@ import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/inst
 import { SystemClient } from '../../utils/system'
 import { MigrationsContainerFactory } from '../../MigrationsContainer'
 import { AdminClient, readAdminFiles } from '../../utils/admin'
+import { URL } from 'url'
+import prompts from 'prompts'
+import { printMigrationDescription } from '../../utils/migrations'
+import { maskToken } from '../../utils/token'
 
 type Args = {
-	project: string
+	dsn: string
+	project?: string
 }
 
 type Options = ExecuteMigrationOptions & {
@@ -23,40 +28,92 @@ type Options = ExecuteMigrationOptions & {
 export class DeployCommand extends Command<Args, Options> {
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Deploy Contember project')
-		configuration.argument('project')
+		configuration.argument('dsn')
+		configuration.argument('project').optional()
 		configuration.option('admin').valueRequired()
 		configureExecuteMigrationCommand(configuration)
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<void | number> {
-		const projectName = input.getArgument('project')
-		const adminEndpoint = input.getOption('admin')
-
+		const [dsn, projectName] = this.getNormalizedInput(input)
 		const workspace = await Workspace.get(process.cwd())
-		const project = await workspace.projects.getProject(projectName, { fuzzy: true })
-		const projectAdminDistDir = `${project.adminDir}/dist`
+		let project: Project
+
+		let apiUrl = input.getOption('instance')
+		let adminEndpoint = input.getOption('admin')
+
+		let apiTokenFromDsn: string | undefined = undefined
+		if (projectName) {
+			project = await workspace.projects.getProject(projectName, { fuzzy: true })
+		} else {
+			const projects = await workspace.projects.listProjects()
+			if (projects.length !== 1) {
+				throw 'Please specify a local name project'
+			}
+			project = projects[0]
+		}
+		let remoteProject = input.getOption('remote-project') || project.name
+		if (dsn) {
+			const uri = new URL(dsn)
+			if (uri.protocol !== 'contember:' && uri.protocol !== 'contember-unsecure:') {
+				throw 'Invalid deploy DSN'
+			}
+			remoteProject = uri.username
+			apiTokenFromDsn = uri.password
+			adminEndpoint = (uri.protocol === 'contember-unsecure:' ? 'http://' : 'https://') + uri.host
+		}
+		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, apiUrl ?? (adminEndpoint ? adminEndpoint + '/_api' : undefined))
+		const apiToken = await interactiveResolveApiToken({ workspace, instance, apiToken: apiTokenFromDsn })
+		console.log('')
+		console.log('Contember project deployment configuration:')
+		console.log(`Local project name: ${project.name}`)
+		console.log(`Target project name: ${remoteProject}`)
+		console.log(`API URL: ${instance.baseUrl}`)
+		console.log(`Admin URL: ${adminEndpoint ?? 'none'}`)
+		console.log(`Deploy token: ${maskToken(apiToken)}`)
+		console.log('')
+
 		const migrationsDir = project.migrationsDir
 		const container = new MigrationsContainerFactory(migrationsDir).create()
 
-		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input?.getOption('instance'))
-		const apiToken = await interactiveResolveApiToken({ instance })
-		const remoteProject = input.getOption('remote-project') || project.name
 		const tenantClient = TenantClient.create(instance.baseUrl, apiToken)
 		await tenantClient.createProject(remoteProject, true)
 		const systemClient = SystemClient.create(instance.baseUrl, remoteProject, apiToken)
 
+		const projectAdminDistDir = `${project.adminDir}/dist`
 		if (adminEndpoint && !(await pathExists(`${projectAdminDistDir}/index.html`))) {
 			throw `Missing ${projectAdminDistDir}/index.html. Please build admin before deploying.`
 		}
 
 		const status = await resolveMigrationStatus(systemClient, container.migrationsResolver, false)
-
+		if (status.migrationsToExecute.length === 0 && !adminEndpoint) {
+			console.log('Nothing to do.')
+			return 0
+		}
+		if (!input.getOption('yes')) {
+			if (!process.stdin.isTTY) {
+				throw 'TTY not available. Pass --yes option to confirm execution.'
+			}
+			console.log('Following migrations will be executed:')
+			console.log(status.migrationsToExecute.length ? status.migrationsToExecute.map(it => it.name).join(' ') : 'none')
+			console.log(adminEndpoint ? 'Admin will be deployed.' : 'Admin will NOT be deployed.')
+			console.log('(to skip this dialog, you can pass --yes option)')
+			console.log('')
+			const { ok } = await prompts({
+				type: 'confirm',
+				name: 'ok',
+				message: `Do you want to continue?`,
+			})
+			 if (!ok) {
+				return 1
+			}
+		}
 		const migrationExitCode = await executeMigrations({
 			migrationDescriber: container.migrationDescriber,
 			schemaVersionBuilder: container.schemaVersionBuilder,
 			client: systemClient,
 			migrations: status.migrationsToExecute,
-			requireConfirmation: !input.getOption('yes'),
+			requireConfirmation: false,
 			force: false,
 		})
 
@@ -65,10 +122,26 @@ export class DeployCommand extends Command<Args, Options> {
 		}
 
 		if (adminEndpoint) {
+			console.log('Deploying admin:')
 			const client = AdminClient.create(adminEndpoint, apiToken)
-			await client.deploy(remoteProject, await readAdminFiles(projectAdminDistDir))
+			const files = await readAdminFiles(projectAdminDistDir)
+			files.forEach(it => console.log('  ' + it.path))
+			await client.deploy(remoteProject, files)
+			console.log('Admin deployed')
 		}
+		console.log('')
+		console.log('Deployment successful')
 
 		return 0
 	}
+
+	private getNormalizedInput(input: Input<Args, Options>): [string | undefined, string | undefined] {
+		const projectOrDsnInput = input.getArgument('dsn')
+		const secondInput = input.getArgument('project')
+
+		const isUriLike = projectOrDsnInput.includes('://')
+		const dsn = isUriLike ? projectOrDsnInput : undefined
+		const projectName = !isUriLike ? projectOrDsnInput : secondInput
+		return [dsn, projectName]
+	}
 }

package/src/commands/migrations/MigrationDiffCommand.ts

@@ -79,7 +79,7 @@ export class MigrationDiffCommand extends Command<Args, Options> {
 
 					if (shouldExecute) {
 						const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace)
-						const apiToken = await interactiveResolveApiToken({ instance })
+						const apiToken = await interactiveResolveApiToken({ workspace, instance })
 						const tenantClient = TenantClient.create(instance.baseUrl, apiToken)
 						await tenantClient.createProject(project.name, true)
 						const systemClient = SystemClient.create(instance.baseUrl, project.name, apiToken)

package/src/commands/migrations/MigrationExecuteCommand.ts

@@ -54,7 +54,7 @@ export class MigrationExecuteCommand extends Command<Args, Options> {
 			const migrationArg = input.getArgument('migration')
 
 			const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input?.getOption('instance'))
-			const apiToken = await interactiveResolveApiToken({ instance })
+			const apiToken = await interactiveResolveApiToken({ workspace, instance })
 			const remoteProject = remoteProjectOption || project.name
 			const tenantClient = TenantClient.create(instance.baseUrl, apiToken)
 			await tenantClient.createProject(remoteProject, true)

package/src/commands/migrations/MigrationExecuteHelper.ts

@@ -50,6 +50,9 @@ export const executeMigrations = async ({
 	migrationDescriber: MigrationDescriber
 	force?: boolean
 }): Promise<number> => {
+	if (migrations.length === 0) {
+		return 0
+	}
 	console.log('Will execute following migrations:')
 	migrations.forEach(it => console.log(it.name))
 	if (requireConfirmation) {

package/src/commands/migrations/MigrationStatusCommand.ts

@@ -54,7 +54,7 @@ export class MigrationStatusCommand extends Command<Args, Options> {
 		const container = new MigrationsContainerFactory(migrationsDir).create()
 
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getOption('instance'))
-		const apiToken = await interactiveResolveApiToken({ instance })
+		const apiToken = await interactiveResolveApiToken({ workspace, instance })
 		const remoteProject = input.getOption('remote-project') || project.name
 		const client = SystemClient.create(instance.baseUrl, remoteProject, apiToken)
 

package/src/commands/migrations/SystemApiClientResolver.ts

@@ -16,7 +16,7 @@ export const resolveSystemApiClient = async (
 	>,
 ): Promise<SystemClient> => {
 	const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input?.getOption('instance'))
-	const apiToken = await interactiveResolveApiToken({ instance })
+	const apiToken = await interactiveResolveApiToken({ workspace, instance })
 	const remoteProject = input?.getOption('remote-project') || project.name
 	return SystemClient.create(instance.baseUrl, remoteProject, apiToken)
 }

package/src/commands/tenant/CreateApiKeyCommand.ts

@@ -24,7 +24,7 @@ export class CreateApiKeyCommand extends Command<Args, Options> {
 		}
 		const workspace = await Workspace.get(process.cwd())
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
-		const apiToken = await interactiveResolveApiToken({ instance })
+		const apiToken = await interactiveResolveApiToken({ workspace, instance })
 		const tenantClient = TenantClient.create(instance.baseUrl, apiToken)
 		const { id, token } = await interactiveCreateApiKey({ client: tenantClient })
 		console.log('API key created:')

package/src/commands/tenant/InviteCommand.ts

@@ -24,7 +24,7 @@ export class InviteCommand extends Command<Args, Options> {
 		}
 		const workspace = await Workspace.get(process.cwd())
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
-		const apiToken = await interactiveResolveApiToken({ instance })
+		const apiToken = await interactiveResolveApiToken({ workspace, instance })
 		const tenantClient = TenantClient.create(instance.baseUrl, apiToken)
 		await interactiveInvite({ client: tenantClient })
 		console.log('User has been invited')

package/src/commands/tenant/ResetPasswordCommand.ts

@@ -24,7 +24,7 @@ export class ResetPasswordCommand extends Command<Args, Options> {
 		}
 		const workspace = await Workspace.get(process.cwd())
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
-		const loginToken = await interactiveResolveLoginToken(instance)
+		const loginToken = await interactiveResolveLoginToken(workspace)
 		await interactiveResetPassword({ apiUrl: instance.baseUrl, loginToken })
 	}
 }

package/src/commands/tenant/SignInCommand.ts

@@ -24,7 +24,7 @@ export class SignInCommand extends Command<Args, Options> {
 		}
 		const workspace = await Workspace.get(process.cwd())
 		const instance = await interactiveResolveInstanceEnvironmentFromInput(workspace, input.getArgument('instance'))
-		const loginToken = await interactiveResolveLoginToken(instance)
+		const loginToken = await interactiveResolveLoginToken(workspace)
 		const { sessionToken } = await interactiveSignIn({ apiUrl: instance.baseUrl, loginToken })
 		console.log('Session token:')
 		console.log(sessionToken)

package/src/utils/instance/environment.ts

@@ -2,6 +2,3 @@ export type InstanceApiEnvironment = {
 	baseUrl: string
 }
 
-export const getInstanceFromEnv = (): string | undefined => {
-	return process.env.CONTEMBER_API_URL || process.env.CONTEMBER_INSTANCE
-}

package/src/utils/instance/interactiveUtils.ts

@@ -1,4 +1,4 @@
-import { getInstanceFromEnv, InstanceApiEnvironment } from './environment'
+import { InstanceApiEnvironment } from './environment'
 import { Workspace } from '@contember/cli-common'
 import prompts from 'prompts'
 
@@ -21,7 +21,7 @@ export const interactiveResolveInstanceEnvironmentFromInput = async (
 ): Promise<InstanceApiEnvironment> => {
 	let instanceName =
 		instance ||
-		getInstanceFromEnv() ||
+		workspace.env.apiUrl ||
 		(
 			await prompts({
 				type: 'text',

package/src/utils/tenant.ts

@@ -1,6 +1,7 @@
 import prompts from 'prompts'
 import { GraphQLClient } from 'graphql-request'
 import { InstanceApiEnvironment } from './instance'
+import { Workspace } from '@contember/cli-common'
 
 const validatePassword = (password: string) =>
 	password.length < 6 ? 'Password must contain at least 6 characters' : true
@@ -15,9 +16,9 @@ export const createTenantApiUrl = (url: string) => {
 	return url + '/tenant'
 }
 
-export const interactiveResolveLoginToken = async (instance: InstanceApiEnvironment) => {
-	if (process.env.CONTEMBER_LOGIN_TOKEN) {
-		return process.env.CONTEMBER_LOGIN_TOKEN
+export const interactiveResolveLoginToken = async (workspace: Workspace) => {
+	if (workspace.env.loginToken) {
+		return workspace.env.loginToken
 	}
 	const { loginToken } = await prompts({
 		type: 'text',
@@ -83,12 +84,19 @@ export const interactiveAskForCredentials = async (): Promise<{ email: string; p
 }
 
 export const interactiveResolveApiToken = async ({
+	workspace,
 	instance,
+	apiToken,
 }: {
+	workspace: Workspace
 	instance: InstanceApiEnvironment
+	apiToken?: string
 }): Promise<string> => {
-	if (process.env.CONTEMBER_API_TOKEN) {
-		return process.env.CONTEMBER_API_TOKEN
+	if (apiToken) {
+		return apiToken
+	}
+	if (workspace.env.apiToken) {
+		return workspace.env.apiToken
 	}
 	const { strategy } = await prompts({
 		type: 'select',
@@ -100,7 +108,7 @@ export const interactiveResolveApiToken = async ({
 		],
 	})
 	if (strategy === 'signin') {
-		const loginToken = await interactiveResolveLoginToken(instance)
+		const loginToken = await interactiveResolveLoginToken(workspace)
 		return (await interactiveSignIn({ apiUrl: createTenantApiUrl(instance.baseUrl), loginToken, expiration: 60 * 5 }))
 			.sessionToken
 	}