From b6c0d9fd0658797950a8597571134b9b7d9fc205 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Tue, 19 Jan 2016 13:27:29 +0000 Subject: [PATCH] support both nameing schemes --- node_modules/c9/hostname.js | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/node_modules/c9/hostname.js b/node_modules/c9/hostname.js index 033acacc..8d079f19 100644 --- a/node_modules/c9/hostname.js +++ b/node_modules/c9/hostname.js @@ -1,14 +1,30 @@ var fs = require("fs"); exports.parse = function(hostname) { - var parts = hostname.split("-"); - return { - type: parts[0], - provider: parts[1], - region: parts[2], - index: parts[5] || parts[3], - env: parts[4] - }; + + var m1 = hostname.match(/^([0-9a-z-]+?)-gce-([a-z]+)-([0-9]+)-([a-z0-9]+)$/); + var m2 = hostname.match(/^([0-9a-z-]+?)-gce-([a-z]+)-([a-z0-9]+)-([a-z0-9]{4})$/); + + if (m1) { + return { + type: m1[1], + provider: "gce", + region: m1[2], + index: m1[3], + env: m1[4] + }; + } + else if (m2) { + return { + type: m2[1], + provider: "gce", + region: m2[2], + env: m2[3], + index: m2[4] + }; + } else { + return {}; + } }; exports.get = function() {