mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix getting container details when a container has a underscore in it

pull/248/head
Tim Robinson 2016-01-28 22:52:37 +00:00
rodzic e1ed5682e9
commit 71e2261a0a
2 zmienionych plików z 28 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
node_modules/c9/docker-helpers.js wygenerowano vendored
Wyświetl plik

@ -1,5 +1,15 @@
var dockerHelpers = {
getContainerIdFromContainer: function (container) {
var match = container.match(/^[a-f0-9]+/);
return match && match[0];
},
getContainerNameFromContainer: function (container) {
var match = container.replace(/[^0-9a-zA-Z]$/, "").match(/[0-9a-zA-Z_-]+$/);
return match && match[0];
},
getUsernameFromContainerName: function (containerName) {
if (containerName.split("-").length < 3) return "";
return containerName.replace(/^container-/, "")

18
node_modules/c9/docker-helpers_test.js wygenerowano vendored
Wyświetl plik

@ -7,7 +7,24 @@ var faker = require("faker");
var dockerHelpers = require("c9/docker-helpers");
describe("docker-helpers", function() {
describe("getContainerIdFromContainer", function() {
it("should work", function() {
assert.equal(
dockerHelpers.getContainerIdFromContainer('3b765c5179d1 cloud9/ws-html5:2014-11-07T10-08-51Z "/mnt/shared/sbin/mic" 3 weeks ago Up 34 hours 0.0.0.0:16276->22/tcp, 0.0.0.0:47527->8080/tcp, 0.0.0.0:46944->8081/tcp, 0.0.0.0:48538->8082/tcp container-russellfeeed-html_assesment-601963-KPRaMXXRlGruDjpH'),
'3b765c5179d1'
);
});
});
describe("getContainerNameFromContainer", function() {
it("should work", function() {
assert.equal(
dockerHelpers.getContainerNameFromContainer('3b765c5179d1 cloud9/ws-html5:2014-11-07T10-08-51Z "/mnt/shared/sbin/mic" 3 weeks ago Up 34 hours 0.0.0.0:16276->22/tcp, 0.0.0.0:47527->8080/tcp, 0.0.0.0:46944->8081/tcp, 0.0.0.0:48538->8082/tcp container-russellfeeed-html_assesment-601963-KPRaMXXRlGruDjpH'),
'container-russellfeeed-html_assesment-601963-KPRaMXXRlGruDjpH'
);
});
});
describe("getUsernameFromContainerName", function () {
it("should work", function() {
assert.equal(dockerHelpers.getUsernameFromContainerName("container-stefko-demo-project-884917"), "stefko");
@ -35,6 +52,7 @@ describe("docker-helpers", function() {
assert.equal(dockerHelpers.getProjectNameFromContainerName("artawil-etutor_11plus-wp-1422098"), "etutor_11plus-wp");
assert.equal(dockerHelpers.getProjectNameFromContainerName("container-johns66139-nice-access-bot-1753521-SDcuzVdxeUNhwhpo"), "nice-access-bot");
assert.equal(dockerHelpers.getProjectNameFromContainerName("johns66139-nice-access-bot-1753521-SDcuzVdxeUNhwhpo"), "nice-access-bot");
assert.equal(dockerHelpers.getProjectNameFromContainerName("container-russellfeeed-html_assesment-601963-KPRaMXXRlGruDjpH"), "html_assesment");
assert.equal(dockerHelpers.getProjectNameFromContainerName("d9canary"), "");
assert.equal(dockerHelpers.getProjectNameFromContainerName("selenium-9213"), "");
assert.equal(dockerHelpers.getProjectNameFromContainerName("/selenium-9213"), "");