@catladder/cli 1.47.1 → 1.48.1

package/dist/apps/cli/commands/project/commandOpenDashboard.js

@@ -36,9 +36,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 exports.__esModule = true;
+var pipeline_1 = require("@catladder/pipeline");
 var getProjectConfig_1 = require("../../../../config/getProjectConfig");
-var getGoogleAuthUserNumber_1 = require("../../utils/getGoogleAuthUserNumber");
-var shared_1 = require("../shared");
+var openCloudRunDashboards_1 = require("../../../../gcloud/cloudRun/openCloudRunDashboards");
+var openKubernetesDashboards_1 = require("../../../../kubernetes/openKubernetesDashboards");
 var autocompletions_1 = require("./utils/autocompletions");
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, _b;
@@ -46,35 +47,33 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
         switch (_c.label) {
             case 0:
                 _b = (_a = vorpal
-                    .command("project-open-dashboard <envComponent>", "open kubernetes dashboard on google"))
+                    .command("project-open-dashboard <envComponent>", "open an apps dashboard (kubernetes or cloudrun)"))
                     .autocomplete;
                 return [4 /*yield*/, (0, autocompletions_1.envAndComponents)()];
             case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])
                     .action(function (_a) {
                     var envComponent = _a.envComponent;
                     return __awaiter(this, void 0, void 0, function () {
-                        var _b, env, componentName, _c, componentConfig, environment, namespace, authGoogleNumber;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
+                        var _b, env, componentName, context;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
                                 case 0:
                                     _b = (0, getProjectConfig_1.parseChoice)(envComponent), env = _b.env, componentName = _b.componentName;
                                     return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
                                 case 1:
-                                    _c = _d.sent(), componentConfig = _c.componentConfig, environment = _c.environment;
-                                    if (!componentConfig.deploy ||
-                                        componentConfig.deploy.type !== "kubernetes") {
-                                        throw new Error("only kubernetes deployments are supported at the moment");
-                                    }
-                                    if (!componentConfig.deploy.cluster ||
-                                        componentConfig.deploy.cluster.type !== "gcloud") {
-                                        throw new Error("no gcloud custer configured");
-                                    }
-                                    namespace = environment.envVars.KUBE_NAMESPACE;
-                                    return [4 /*yield*/, getGoogleAuthUserNumber_1.getGoogleAuthUserNumber.call(this, vorpal)];
+                                    context = _c.sent();
+                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
+                                    return [4 /*yield*/, (0, openKubernetesDashboards_1.openGoogleCloudKubernetesDashboard)(this, context)];
                                 case 2:
-                                    authGoogleNumber = _d.sent();
-                                    (0, shared_1.openGoogleCloudKubernetesDashboard)(componentConfig.deploy.cluster, namespace, authGoogleNumber);
-                                    return [2 /*return*/];
+                                    _c.sent();
+                                    _c.label = 3;
+                                case 3:
+                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
+                                    return [4 /*yield*/, (0, openCloudRunDashboards_1.openGoogleCloudRunDashboard)(this, context)];
+                                case 4:
+                                    _c.sent();
+                                    _c.label = 5;
+                                case 5: return [2 /*return*/];
                             }
                         });
                     });

package/dist/apps/cli/commands/project/commandOpenDashboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandOpenDashboard.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandOpenDashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAG6C;AAC7C,+EAA8E;AAC9E,oCAA+D;AAC/D,2DAA2D;AAC3D,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,uCAAuC,EACvC,qCAAqC,CACtC,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCAChB,qBAAM,IAAA,6CAA0B,EACvE,GAAG,EACH,aAAa,CACd,EAAA;;oCAHK,KAAmC,SAGxC,EAHO,eAAe,qBAAA,EAAE,WAAW,iBAAA;oCAKpC,IACE,CAAC,eAAe,CAAC,MAAM;wCACvB,eAAe,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAC5C;wCACA,MAAM,IAAI,KAAK,CACb,yDAAyD,CAC1D,CAAC;qCACH;oCAED,IACE,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO;wCAC/B,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAChD;wCACA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;qCAChD;oCAEK,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;oCAE5B,qBAAM,iDAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;oCAAnE,gBAAgB,GAAG,SAAgD;oCAEzE,IAAA,2CAAkC,EAChC,eAAe,CAAC,MAAM,CAAC,OAAO,EAC9B,SAAS,EACT,gBAAgB,CACjB,CAAC;;;;;iBACH,CAAC,EAAA;;;KAAA,EAAC"}
+{"version":3,"file":"commandOpenDashboard.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandOpenDashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAqD;AAErD,wEAG6C;AAC7C,6FAAiG;AACjG,4FAAqG;AAErG,2DAA2D;AAE3D,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,uCAAuC,EACvC,iDAAiD,CAClD,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;yCAChE,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAA5D,wBAA4D;oCAC9D,qBAAM,IAAA,6DAAkC,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAvD,SAAuD,CAAC;;;yCAEtD,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;oCACnE,qBAAM,IAAA,oDAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAhD,SAAgD,CAAC;;;;;;iBAEpD,CAAC,EAAA;;;KAAA,EAAC"}

package/dist/apps/cli/commands/project/commandOpenLogs.js

@@ -37,8 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var getProjectConfig_1 = require("../../../../config/getProjectConfig");
-var getGoogleAuthUserNumber_1 = require("../../utils/getGoogleAuthUserNumber");
-var shared_1 = require("../shared");
+var openKubernetesDashboards_1 = require("../../../../kubernetes/openKubernetesDashboards");
 var autocompletions_1 = require("./utils/autocompletions");
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, _b;
@@ -53,29 +52,17 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                     .action(function (_a) {
                     var envComponent = _a.envComponent;
                     return __awaiter(this, void 0, void 0, function () {
-                        var _b, env, componentName, _c, componentConfig, environment, namespace, authGoogleNumber;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
+                        var _b, env, componentName, context;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
                                 case 0:
                                     _b = (0, getProjectConfig_1.parseChoice)(envComponent), env = _b.env, componentName = _b.componentName;
                                     return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
                                 case 1:
-                                    _c = _d.sent(), componentConfig = _c.componentConfig, environment = _c.environment;
-                                    if (!componentConfig.deploy ||
-                                        componentConfig.deploy.type !== "kubernetes") {
-                                        throw new Error("only kubernetes deployments are supported at the moment");
-                                    }
-                                    if (!componentConfig.deploy.cluster ||
-                                        componentConfig.deploy.cluster.type !== "gcloud") {
-                                        throw new Error("no gcloud custer configured");
-                                    }
-                                    namespace = environment.envVars.KUBE_NAMESPACE;
-                                    return [4 /*yield*/, getGoogleAuthUserNumber_1.getGoogleAuthUserNumber.call(this, vorpal)];
+                                    context = _c.sent();
+                                    return [4 /*yield*/, (0, openKubernetesDashboards_1.openGoogleCloudLogs)(this, context)];
                                 case 2:
-                                    authGoogleNumber = _d.sent();
-                                    return [4 /*yield*/, (0, shared_1.openGoogleCloudLogs)(componentConfig.deploy.cluster, namespace, authGoogleNumber)];
-                                case 3:
-                                    _d.sent();
+                                    _c.sent();
                                     return [2 /*return*/];
                             }
                         });

package/dist/apps/cli/commands/project/commandOpenLogs.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandOpenLogs.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandOpenLogs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAG6C;AAG7C,+EAA8E;AAC9E,oCAAgD;AAChD,2DAA2D;AAG3D,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,kCAAkC,EAClC,2CAA2C,CAC5C,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCAChB,qBAAM,IAAA,6CAA0B,EACvE,GAAG,EACH,aAAa,CACd,EAAA;;oCAHK,KAAmC,SAGxC,EAHO,eAAe,qBAAA,EAAE,WAAW,iBAAA;oCAKpC,IACE,CAAC,eAAe,CAAC,MAAM;wCACvB,eAAe,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAC5C;wCACA,MAAM,IAAI,KAAK,CACb,yDAAyD,CAC1D,CAAC;qCACH;oCAED,IACE,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO;wCAC/B,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAChD;wCACA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;qCAChD;oCAEK,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;oCAE5B,qBAAM,iDAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;oCAAnE,gBAAgB,GAAG,SAAgD;oCAEzE,qBAAM,IAAA,4BAAmB,EACvB,eAAe,CAAC,MAAM,CAAC,OAAO,EAC9B,SAAS,EACT,gBAAgB,CACjB,EAAA;;oCAJD,SAIC,CAAC;;;;;iBACH,CAAC,EAAA;;;KAAA,EAAC"}
+{"version":3,"file":"commandOpenLogs.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandOpenLogs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAG6C;AAC7C,4FAAsF;AACtF,2DAA2D;AAE3D,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,kCAAkC,EAClC,2CAA2C,CAC5C,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBALxC,sBAAA,cAKgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCACzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;oCAEpE,qBAAM,IAAA,8CAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,EAAA;;oCAAxC,SAAwC,CAAC;;;;;iBAC1C,CAAC,EAAA;;;KAAA,EAAC"}