mirror of
https://github.com/portainer/portainer.git
synced 2025-07-22 23:09:41 +02:00
chore(project): add prettier for code format (#3645)
* chore(project): install prettier and lint-staged * chore(project): apply prettier to html too * chore(project): git ignore eslintcache * chore(project): add a comment about format script * chore(prettier): update printWidth * chore(prettier): remove useTabs option * chore(prettier): add HTML validation * refactor(prettier): fix closing tags * feat(prettier): define angular parser for html templates * style(prettier): run prettier on codebase Co-authored-by: Anthony Lapenna <lapenna.anthony@gmail.com>
This commit is contained in:
Chaim Lev-Ari
GitHub
parent
6663073be1
commit
cf5056d9c0
714 changed files with 31228 additions and 28305 deletions
|
|
@ -1,5 +1,5 @@
|
|||
import _ from 'lodash-es';
|
||||
import splitargs from 'splitargs/src/splitargs'
|
||||
import splitargs from 'splitargs/src/splitargs';
|
||||
|
||||
const portPattern = /^([1-9]|[1-5]?[0-9]{2,4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/m;
|
||||
|
||||
|
|
@ -33,8 +33,7 @@ function isValidPortRange(portRange) {
|
|||
portRange = parsePortRange();
|
||||
}
|
||||
|
||||
return Array.isArray(portRange) && portRange.length === 2 &&
|
||||
portRange[0] > 0 && portRange[1] >= portRange[0];
|
||||
return Array.isArray(portRange) && portRange.length === 2 && portRange[0] > 0 && portRange[1] >= portRange[0];
|
||||
}
|
||||
|
||||
function createPortRange(portRangeText, port) {
|
||||
|
|
@ -49,7 +48,7 @@ function createPortRange(portRangeText, port) {
|
|||
portRangeText = portRangeText.substr(colonIndex + 1);
|
||||
}
|
||||
|
||||
port = (typeof port === 'number' ? port : parsePort(port));
|
||||
port = typeof port === 'number' ? port : parsePort(port);
|
||||
const portRange = parsePortRange(portRangeText);
|
||||
const startPort = Math.min(portRange[0], port);
|
||||
const endPort = Math.max(portRange[1], port);
|
||||
|
|
@ -61,178 +60,181 @@ function createPortRange(portRangeText, port) {
|
|||
}
|
||||
}
|
||||
|
||||
angular.module('portainer.docker')
|
||||
.factory('ContainerHelper', [function ContainerHelperFactory() {
|
||||
'use strict';
|
||||
var helper = {};
|
||||
angular.module('portainer.docker').factory('ContainerHelper', [
|
||||
function ContainerHelperFactory() {
|
||||
'use strict';
|
||||
var helper = {};
|
||||
|
||||
helper.commandStringToArray = function(command) {
|
||||
return splitargs(command);
|
||||
};
|
||||
|
||||
helper.commandArrayToString = function(array) {
|
||||
return array.map(function(elem) {
|
||||
return '\'' + elem + '\'';
|
||||
}).join(' ');
|
||||
};
|
||||
|
||||
helper.configFromContainer = function(container) {
|
||||
var config = container.Config;
|
||||
// HostConfig
|
||||
config.HostConfig = container.HostConfig;
|
||||
// Name
|
||||
config.name = container.Name.replace(/^\//g, '');
|
||||
// Network
|
||||
var mode = config.HostConfig.NetworkMode;
|
||||
config.NetworkingConfig = {
|
||||
'EndpointsConfig': {}
|
||||
helper.commandStringToArray = function (command) {
|
||||
return splitargs(command);
|
||||
};
|
||||
config.NetworkingConfig.EndpointsConfig = container.NetworkSettings.Networks;
|
||||
if (mode.indexOf('container:') !== -1) {
|
||||
delete config.Hostname;
|
||||
delete config.ExposedPorts;
|
||||
}
|
||||
// Set volumes
|
||||
var binds = [];
|
||||
var volumes = {};
|
||||
for (var v in container.Mounts) {
|
||||
if ({}.hasOwnProperty.call(container.Mounts, v)) {
|
||||
var mount = container.Mounts[v];
|
||||
var name = mount.Name || mount.Source;
|
||||
var containerPath = mount.Destination;
|
||||
if (name && containerPath) {
|
||||
var bind = name + ':' + containerPath;
|
||||
volumes[containerPath] = {};
|
||||
if (mount.RW === false) {
|
||||
bind += ':ro';
|
||||
|
||||
helper.commandArrayToString = function (array) {
|
||||
return array
|
||||
.map(function (elem) {
|
||||
return "'" + elem + "'";
|
||||
})
|
||||
.join(' ');
|
||||
};
|
||||
|
||||
helper.configFromContainer = function (container) {
|
||||
var config = container.Config;
|
||||
// HostConfig
|
||||
config.HostConfig = container.HostConfig;
|
||||
// Name
|
||||
config.name = container.Name.replace(/^\//g, '');
|
||||
// Network
|
||||
var mode = config.HostConfig.NetworkMode;
|
||||
config.NetworkingConfig = {
|
||||
EndpointsConfig: {},
|
||||
};
|
||||
config.NetworkingConfig.EndpointsConfig = container.NetworkSettings.Networks;
|
||||
if (mode.indexOf('container:') !== -1) {
|
||||
delete config.Hostname;
|
||||
delete config.ExposedPorts;
|
||||
}
|
||||
// Set volumes
|
||||
var binds = [];
|
||||
var volumes = {};
|
||||
for (var v in container.Mounts) {
|
||||
if ({}.hasOwnProperty.call(container.Mounts, v)) {
|
||||
var mount = container.Mounts[v];
|
||||
var name = mount.Name || mount.Source;
|
||||
var containerPath = mount.Destination;
|
||||
if (name && containerPath) {
|
||||
var bind = name + ':' + containerPath;
|
||||
volumes[containerPath] = {};
|
||||
if (mount.RW === false) {
|
||||
bind += ':ro';
|
||||
}
|
||||
binds.push(bind);
|
||||
}
|
||||
binds.push(bind);
|
||||
}
|
||||
}
|
||||
}
|
||||
config.HostConfig.Binds = binds;
|
||||
config.Volumes = volumes;
|
||||
return config;
|
||||
};
|
||||
config.HostConfig.Binds = binds;
|
||||
config.Volumes = volumes;
|
||||
return config;
|
||||
};
|
||||
|
||||
helper.preparePortBindings = function(portBindings) {
|
||||
const bindings = {};
|
||||
_.forEach(portBindings, (portBinding) => {
|
||||
if (!portBinding.containerPort) {
|
||||
return;
|
||||
}
|
||||
|
||||
let hostPort = portBinding.hostPort;
|
||||
const containerPortRange = parsePortRange(portBinding.containerPort);
|
||||
if (!isValidPortRange(containerPortRange)) {
|
||||
throw new Error('Invalid port specification: ' + portBinding.containerPort);
|
||||
}
|
||||
|
||||
const startPort = containerPortRange[0];
|
||||
const endPort = containerPortRange[1];
|
||||
let hostIp = undefined;
|
||||
let startHostPort = 0;
|
||||
let endHostPort = 0;
|
||||
if (hostPort) {
|
||||
if (hostPort.indexOf(':') > -1) {
|
||||
const hostAndPort = _.split(hostPort, ':');
|
||||
hostIp = hostAndPort[0];
|
||||
hostPort = hostAndPort[1];
|
||||
helper.preparePortBindings = function (portBindings) {
|
||||
const bindings = {};
|
||||
_.forEach(portBindings, (portBinding) => {
|
||||
if (!portBinding.containerPort) {
|
||||
return;
|
||||
}
|
||||
|
||||
const hostPortRange = parsePortRange(hostPort);
|
||||
if (!isValidPortRange(hostPortRange)) {
|
||||
throw new Error('Invalid port specification: ' + hostPort);
|
||||
let hostPort = portBinding.hostPort;
|
||||
const containerPortRange = parsePortRange(portBinding.containerPort);
|
||||
if (!isValidPortRange(containerPortRange)) {
|
||||
throw new Error('Invalid port specification: ' + portBinding.containerPort);
|
||||
}
|
||||
|
||||
startHostPort = hostPortRange[0];
|
||||
endHostPort = hostPortRange[1];
|
||||
if (endPort !== startPort && (endPort - startPort) !== (endHostPort - startHostPort)) {
|
||||
throw new Error('Invalid port specification: ' + hostPort);
|
||||
}
|
||||
}
|
||||
const startPort = containerPortRange[0];
|
||||
const endPort = containerPortRange[1];
|
||||
let hostIp = undefined;
|
||||
let startHostPort = 0;
|
||||
let endHostPort = 0;
|
||||
if (hostPort) {
|
||||
if (hostPort.indexOf(':') > -1) {
|
||||
const hostAndPort = _.split(hostPort, ':');
|
||||
hostIp = hostAndPort[0];
|
||||
hostPort = hostAndPort[1];
|
||||
}
|
||||
|
||||
for (let i = 0; i <= (endPort - startPort); i++) {
|
||||
const containerPort = (startPort + i).toString();
|
||||
if (startHostPort > 0) {
|
||||
hostPort = (startHostPort + i).toString();
|
||||
}
|
||||
if (startPort === endPort && startHostPort !== endHostPort) {
|
||||
hostPort += '-' + endHostPort.toString();
|
||||
const hostPortRange = parsePortRange(hostPort);
|
||||
if (!isValidPortRange(hostPortRange)) {
|
||||
throw new Error('Invalid port specification: ' + hostPort);
|
||||
}
|
||||
|
||||
startHostPort = hostPortRange[0];
|
||||
endHostPort = hostPortRange[1];
|
||||
if (endPort !== startPort && endPort - startPort !== endHostPort - startHostPort) {
|
||||
throw new Error('Invalid port specification: ' + hostPort);
|
||||
}
|
||||
}
|
||||
|
||||
const bindKey = containerPort + '/' + portBinding.protocol;
|
||||
bindings[bindKey] = [{ HostIp: hostIp, HostPort: hostPort }];
|
||||
}
|
||||
});
|
||||
return bindings;
|
||||
};
|
||||
for (let i = 0; i <= endPort - startPort; i++) {
|
||||
const containerPort = (startPort + i).toString();
|
||||
if (startHostPort > 0) {
|
||||
hostPort = (startHostPort + i).toString();
|
||||
}
|
||||
if (startPort === endPort && startHostPort !== endHostPort) {
|
||||
hostPort += '-' + endHostPort.toString();
|
||||
}
|
||||
|
||||
helper.sortAndCombinePorts = function(portBindings) {
|
||||
const bindings = [];
|
||||
const portBindingKeys = _.keys(portBindings);
|
||||
const bindKey = containerPort + '/' + portBinding.protocol;
|
||||
bindings[bindKey] = [{ HostIp: hostIp, HostPort: hostPort }];
|
||||
}
|
||||
});
|
||||
return bindings;
|
||||
};
|
||||
|
||||
// Group the port bindings by protocol
|
||||
const portBindingKeysByProtocol = _.groupBy(portBindingKeys, (portKey) => {
|
||||
return _.split(portKey, '/')[1];
|
||||
});
|
||||
helper.sortAndCombinePorts = function (portBindings) {
|
||||
const bindings = [];
|
||||
const portBindingKeys = _.keys(portBindings);
|
||||
|
||||
_.forEach(portBindingKeysByProtocol, (portBindingKeys, protocol) => {
|
||||
// Group the port bindings by host IP
|
||||
const portBindingKeysByHostIp = _.groupBy(portBindingKeys, (portKey) => {
|
||||
const portBinding = portBindings[portKey][0];
|
||||
return portBinding.HostIp || '';
|
||||
// Group the port bindings by protocol
|
||||
const portBindingKeysByProtocol = _.groupBy(portBindingKeys, (portKey) => {
|
||||
return _.split(portKey, '/')[1];
|
||||
});
|
||||
|
||||
_.forEach(portBindingKeysByHostIp, (portBindingKeys) => {
|
||||
// Sort by host port
|
||||
const sortedPortBindingKeys = _.orderBy(portBindingKeys, (portKey) => {
|
||||
return parseInt(_.split(portKey, '/')[0]);
|
||||
_.forEach(portBindingKeysByProtocol, (portBindingKeys, protocol) => {
|
||||
// Group the port bindings by host IP
|
||||
const portBindingKeysByHostIp = _.groupBy(portBindingKeys, (portKey) => {
|
||||
const portBinding = portBindings[portKey][0];
|
||||
return portBinding.HostIp || '';
|
||||
});
|
||||
|
||||
let previousHostPort = -1;
|
||||
let previousContainerPort = -1;
|
||||
_.forEach(sortedPortBindingKeys, (portKey) => {
|
||||
const portKeySplit = _.split(portKey, '/');
|
||||
const containerPort = parseInt(portKeySplit[0]);
|
||||
const portBinding = portBindings[portKey][0];
|
||||
const hostPort = parsePort(portBinding.HostPort);
|
||||
_.forEach(portBindingKeysByHostIp, (portBindingKeys) => {
|
||||
// Sort by host port
|
||||
const sortedPortBindingKeys = _.orderBy(portBindingKeys, (portKey) => {
|
||||
return parseInt(_.split(portKey, '/')[0]);
|
||||
});
|
||||
|
||||
let previousHostPort = -1;
|
||||
let previousContainerPort = -1;
|
||||
_.forEach(sortedPortBindingKeys, (portKey) => {
|
||||
const portKeySplit = _.split(portKey, '/');
|
||||
const containerPort = parseInt(portKeySplit[0]);
|
||||
const portBinding = portBindings[portKey][0];
|
||||
const hostPort = parsePort(portBinding.HostPort);
|
||||
|
||||
// We only combine single ports, and skip the host port ranges on one container port
|
||||
if (hostPort > 0) {
|
||||
// If we detect consecutive ports, we create a range of them
|
||||
if (bindings.length > 0 && previousHostPort === hostPort - 1 && previousContainerPort === containerPort - 1) {
|
||||
bindings[bindings.length - 1].hostPort = createPortRange(bindings[bindings.length - 1].hostPort, hostPort);
|
||||
bindings[bindings.length - 1].containerPort = createPortRange(bindings[bindings.length - 1].containerPort, containerPort);
|
||||
previousHostPort = hostPort;
|
||||
previousContainerPort = containerPort;
|
||||
return;
|
||||
}
|
||||
|
||||
// We only combine single ports, and skip the host port ranges on one container port
|
||||
if (hostPort > 0) {
|
||||
// If we detect consecutive ports, we create a range of them
|
||||
if (bindings.length > 0 && previousHostPort === (hostPort - 1) && previousContainerPort === (containerPort - 1)) {
|
||||
bindings[bindings.length-1].hostPort = createPortRange(bindings[bindings.length-1].hostPort, hostPort);
|
||||
bindings[bindings.length-1].containerPort = createPortRange(bindings[bindings.length-1].containerPort, containerPort);
|
||||
previousHostPort = hostPort;
|
||||
previousContainerPort = containerPort;
|
||||
return;
|
||||
} else {
|
||||
previousHostPort = -1;
|
||||
previousContainerPort = -1;
|
||||
}
|
||||
|
||||
previousHostPort = hostPort;
|
||||
previousContainerPort = containerPort;
|
||||
} else {
|
||||
previousHostPort = -1;
|
||||
previousContainerPort = -1;
|
||||
}
|
||||
let bindingHostPort = portBinding.HostPort.toString();
|
||||
if (portBinding.HostIp) {
|
||||
bindingHostPort = portBinding.HostIp + ':' + bindingHostPort;
|
||||
}
|
||||
|
||||
let bindingHostPort = portBinding.HostPort.toString();
|
||||
if (portBinding.HostIp) {
|
||||
bindingHostPort = portBinding.HostIp + ':' + bindingHostPort;
|
||||
}
|
||||
|
||||
const binding = {
|
||||
hostPort: bindingHostPort,
|
||||
containerPort: containerPort,
|
||||
protocol: protocol
|
||||
};
|
||||
bindings.push(binding);
|
||||
const binding = {
|
||||
hostPort: bindingHostPort,
|
||||
containerPort: containerPort,
|
||||
protocol: protocol,
|
||||
};
|
||||
bindings.push(binding);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
return bindings;
|
||||
};
|
||||
return bindings;
|
||||
};
|
||||
|
||||
return helper;
|
||||
}]);
|
||||
return helper;
|
||||
},
|
||||
]);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue