ship.zone/npmci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2021-05-14 18:11:12 +00:00
parent efdf789575
commit f850c79b6c
27 changed files with 9928 additions and 1536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -15,8 +15,6 @@ node_modules/
# builds # builds
dist/ dist/
dist_web/ dist_*/
dist_serve/
dist_ts_web/
# custom # custom

52
.gitlab-ci.yml
View File

@ -4,13 +4,13 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache: cache:
paths: paths:
- .npmci_cache/ - .npmci_cache/
key: "$CI_BUILD_STAGE" key: '$CI_BUILD_STAGE'
stages: stages:
- security - security
- test - test
- release - release
- metadata - metadata
# ==================== # ====================
# security stage # security stage
@ -19,20 +19,35 @@ mirror:
stage: security stage: security
script: script:
- npmci git mirror - npmci git mirror
only:
- tags
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
snyk: auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security stage: security
script: script:
- npmci npm prepare - npmci npm prepare
- npmci command npm install -g snyk - npmci command npm install --production --ignore-scripts
- npmci command npm install --ignore-scripts - npmci command npm config set registry https://registry.npmjs.org
- npmci command snyk test - npmci command npm audit --audit-level=high --only=prod --production
tags: tags:
- docker - docker
- notpriv
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=dev
tags:
- docker
allow_failure: true
# ==================== # ====================
# test stage # test stage
@ -48,28 +63,27 @@ testStable:
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- docker - docker
- priv
testBuild: testBuild:
stage: test stage: test
script: script:
- npmci npm prepare - npmci npm prepare
- npmci node install lts - npmci node install stable
- npmci npm install - npmci npm install
- npmci command npm run build - npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/ coverage: /\d+.?\d+?\%\s*coverage/
tags: tags:
- docker - docker
- notpriv
release: release:
stage: release stage: release
script: script:
- npmci node install lts - npmci node install stable
- npmci npm publish - npmci npm publish
only: only:
- tags - tags
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
@ -79,11 +93,15 @@ release:
codequality: codequality:
stage: metadata stage: metadata
allow_failure: true allow_failure: true
only:
- tags
script: script:
- npmci command npm install -g tslint typescript - npmci command npm install -g tslint typescript
- npmci npm prepare
- npmci npm install - npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts" - npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags: tags:
- lossless
- docker - docker
- priv - priv
@ -94,20 +112,20 @@ trigger:
only: only:
- tags - tags
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
pages: pages:
image: hosttoday/ht-docker-dbase:npmci
services:
- docker:stable-dind
stage: metadata stage: metadata
script: script:
- npmci node install lts
- npmci command npm install -g @gitzone/tsdoc - npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare - npmci npm prepare
- npmci npm install - npmci npm install
- npmci command tsdoc - npmci command tsdoc
tags: tags:
- lossless
- docker - docker
- notpriv - notpriv
only: only:

29
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,29 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "current file",
"type": "node",
"request": "launch",
"args": [
"${relativeFile}"
],
"runtimeArgs": ["-r", "@gitzone/tsrun"],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "test.ts",
"type": "node",
"request": "launch",
"args": [
"test/test.ts"
],
"runtimeArgs": ["-r", "@gitzone/tsrun"],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"internalConsoleOptions": "openOnSessionStart"
}
]
}

25
.vscode/settings.json vendored
View File

@ -1,3 +1,26 @@
{ {
"workbench.colorCustomizations": {} "json.schemas": [
{
"fileMatch": ["/npmextra.json"],
"schema": {
"type": "object",
"properties": {
"npmci": {
"type": "object",
"description": "settings for npmci"
},
"gitzone": {
"type": "object",
"description": "settings for gitzone",
"properties": {
"projectType": {
"type": "string",
"enum": ["website", "element", "service", "npm", "wcc"]
}
}
}
}
}
}
]
} }

3
cli.js
View File

@ -1,3 +1,4 @@
#!/usr/bin/env node #!/usr/bin/env node
process.env.CLI_CALL = 'true'; process.env.CLI_CALL = 'true';
require('./dist/index'); const cliTool = require('./dist_ts/index');
cliTool.runCli();

3
cli.ts.js
View File

@ -1,4 +1,5 @@
#!/usr/bin/env node #!/usr/bin/env node
process.env.CLI_CALL = 'true'; process.env.CLI_CALL = 'true';
require('@gitzone/tsrun'); require('@gitzone/tsrun');
require('./ts/index'); const cliTool = require('./ts/index');
cliTool.runCli();

1
npmextra.json
View File

@ -9,6 +9,7 @@
"command": "npmci test stable" "command": "npmci test stable"
}, },
"gitzone": { "gitzone": {
"projectType": "npm",
"module": { "module": {
"githost": "gitlab.com", "githost": "gitlab.com",
"gitscope": "shipzone", "gitscope": "shipzone",

11025
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

68
package.json
View File

@ -3,8 +3,8 @@
"version": "3.1.74", "version": "3.1.74",
"private": false, "private": false,
"description": "node and docker in gitlab ci on steroids", "description": "node and docker in gitlab ci on steroids",
"main": "dist/index.js", "main": "dist_ts/index.js",
"typings": "dist/index.d.ts", "typings": "dist_ts/index.d.ts",
"bin": { "bin": {
"npmci": "cli.js" "npmci": "cli.js"
}, },
@ -24,46 +24,50 @@
}, },
"homepage": "https://gitlab.com/gitzone/npmci#README", "homepage": "https://gitlab.com/gitzone/npmci#README",
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.17", "@gitzone/tsbuild": "^2.1.25",
"@gitzone/tsrun": "^1.2.6", "@gitzone/tsrun": "^1.2.12",
"@gitzone/tstest": "^1.0.28", "@gitzone/tstest": "^1.0.54",
"@pushrocks/tapbundle": "^3.2.0", "@pushrocks/tapbundle": "^3.2.14",
"@types/node": "^12.12.12", "@types/node": "^15.0.3",
"tslint": "^5.20.1", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0" "tslint-config-prettier": "^1.18.0"
}, },
"dependencies": { "dependencies": {
"@apiglobal/typedrequest": "^1.0.24", "@apiglobal/typedrequest": "^1.0.56",
"@pushrocks/lik": "^3.0.11", "@pushrocks/lik": "^4.0.20",
"@pushrocks/npmextra": "^3.0.7", "@pushrocks/npmextra": "^3.0.9",
"@pushrocks/projectinfo": "^4.0.2", "@pushrocks/projectinfo": "^4.0.5",
"@pushrocks/qenv": "^4.0.6", "@pushrocks/qenv": "^4.0.10",
"@pushrocks/smartanalytics": "^2.0.15", "@pushrocks/smartanalytics": "^2.0.15",
"@pushrocks/smartcli": "^3.0.7", "@pushrocks/smartcli": "^3.0.14",
"@pushrocks/smartdelay": "^2.0.6", "@pushrocks/smartdelay": "^2.0.10",
"@pushrocks/smartfile": "^7.0.6", "@pushrocks/smartfile": "^8.0.10",
"@pushrocks/smartlog": "^2.0.21", "@pushrocks/smartlog": "^2.0.39",
"@pushrocks/smartlog-destination-local": "^8.0.2", "@pushrocks/smartlog-destination-local": "^8.0.8",
"@pushrocks/smartparam": "^1.0.4", "@pushrocks/smartparam": "^1.1.6",
"@pushrocks/smartpromise": "^3.0.6", "@pushrocks/smartpromise": "^3.1.5",
"@pushrocks/smartrequest": "^1.1.43", "@pushrocks/smartrequest": "^1.1.51",
"@pushrocks/smartshell": "^2.0.25", "@pushrocks/smartshell": "^2.0.26",
"@pushrocks/smartsocket": "^1.1.58", "@pushrocks/smartsocket": "^1.2.8",
"@pushrocks/smartssh": "^1.2.3", "@pushrocks/smartssh": "^1.2.3",
"@pushrocks/smartstring": "^3.0.17", "@pushrocks/smartstring": "^3.0.24",
"@servezone/servezone-interfaces": "^2.0.51", "@servezone/servezone-interfaces": "^2.0.51",
"@types/through2": "^2.0.34", "@types/through2": "^2.0.36",
"through2": "^3.0.1" "through2": "^4.0.2"
}, },
"files": [ "files": [
"ts/*", "ts/**/*",
"ts_web/*", "ts_web/**/*",
"dist/*", "dist/**/*",
"dist_web/*", "dist_*/**/*",
"dist_ts_web/*", "dist_ts/**/*",
"assets/*", "dist_ts_web/**/*",
"assets/**/*",
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
],
"browserslist": [
"last 1 chrome versions"
] ]
} }

26
readme.md
View File

@ -8,13 +8,20 @@ node and docker in gitlab ci on steroids
* [docs (typedoc)](https://shipzone.gitlab.io/npmci/) * [docs (typedoc)](https://shipzone.gitlab.io/npmci/)
## Status for master ## Status for master
[![build status](https://gitlab.com/shipzone/npmci/badges/master/build.svg)](https://gitlab.com/shipzone/npmci/commits/master)
[![coverage report](https://gitlab.com/shipzone/npmci/badges/master/coverage.svg)](https://gitlab.com/shipzone/npmci/commits/master) Status Category | Status Badge
[![npm downloads per month](https://img.shields.io/npm/dm/@shipzone/npmci.svg)](https://www.npmjs.com/package/@shipzone/npmci) -- | --
[![Known Vulnerabilities](https://snyk.io/test/npm/@shipzone/npmci/badge.svg)](https://snyk.io/test/npm/@shipzone/npmci) GitLab Pipelines | [![pipeline status](https://gitlab.com/shipzone/npmci/badges/master/pipeline.svg)](https://lossless.cloud)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/shipzone/npmci/badges/master/coverage.svg)](https://lossless.cloud)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) npm | [![npm downloads per month](https://badgen.net/npm/dy/@shipzone/npmci)](https://lossless.cloud)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/) Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/shipzone/npmci)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@shipzone/npmci)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@shipzone/npmci)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@shipzone/npmci)](https://lossless.cloud)
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
## Usage ## Usage
@ -93,6 +100,11 @@ For further information read the linked docs at the top of this README.
Use TypeScript for best in class instellisense. Use TypeScript for best in class instellisense.
## Contribution
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
For further information read the linked docs at the top of this readme. For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

20
test/test.ts
View File

@ -31,11 +31,11 @@ tap.test('should return valid Dockerfiles', async () => {
const npmciInstance = new npmci.Npmci(); const npmciInstance = new npmci.Npmci();
dockerfile1 = new npmci.Dockerfile(npmciInstance.dockerManager, { dockerfile1 = new npmci.Dockerfile(npmciInstance.dockerManager, {
filePath: './Dockerfile', filePath: './Dockerfile',
read: true read: true,
}); });
dockerfile2 = new npmci.Dockerfile(npmciInstance.dockerManager, { dockerfile2 = new npmci.Dockerfile(npmciInstance.dockerManager, {
filePath: './Dockerfile_sometag1', filePath: './Dockerfile_sometag1',
read: true read: true,
}); });
expect(dockerfile1.version).to.equal('latest'); expect(dockerfile1.version).to.equal('latest');
return expect(dockerfile2.version).to.equal('sometag1'); return expect(dockerfile2.version).to.equal('sometag1');
@ -62,28 +62,28 @@ tap.test('should sort an array of Dockerfiles', async () => {
tap.test('should build all Dockerfiles', async () => { tap.test('should build all Dockerfiles', async () => {
const npmciInstance = new npmci.Npmci(); const npmciInstance = new npmci.Npmci();
return npmciInstance.dockerManager.handleCli({ return npmciInstance.dockerManager.handleCli({
_: ['docker', 'build'] _: ['docker', 'build'],
}); });
}); });
tap.test('should test all Dockerfiles', async () => { tap.test('should test all Dockerfiles', async () => {
const npmciInstance = new npmci.Npmci(); const npmciInstance = new npmci.Npmci();
return npmciInstance.dockerManager.handleCli({ return npmciInstance.dockerManager.handleCli({
_: ['docker', 'test'] _: ['docker', 'test'],
}); });
}); });
tap.test('should test dockerfiles', async () => { tap.test('should test dockerfiles', async () => {
const npmciInstance = new npmci.Npmci(); const npmciInstance = new npmci.Npmci();
return npmciInstance.dockerManager.handleCli({ return npmciInstance.dockerManager.handleCli({
_: ['docker', 'test'] _: ['docker', 'test'],
}); });
}); });
tap.test('should login docker daemon', async () => { tap.test('should login docker daemon', async () => {
const npmciInstance = new npmci.Npmci(); const npmciInstance = new npmci.Npmci();
return npmciInstance.dockerManager.handleCli({ return npmciInstance.dockerManager.handleCli({
_: ['docker', 'login'] _: ['docker', 'login'],
}); });
}); });
@ -93,7 +93,7 @@ tap.test('should login docker daemon', async () => {
tap.test('should prepare SSH keys', async () => { tap.test('should prepare SSH keys', async () => {
const npmciModSsh = await import('../ts/mod_ssh'); const npmciModSsh = await import('../ts/mod_ssh');
return await npmciModSsh.handleCli({ return await npmciModSsh.handleCli({
_: ['ssh', 'prepare'] _: ['ssh', 'prepare'],
}); });
}); });
@ -103,13 +103,13 @@ tap.test('should prepare SSH keys', async () => {
tap.test('should install a certain version of node', async () => { tap.test('should install a certain version of node', async () => {
const npmciInstance = new npmci.Npmci(); const npmciInstance = new npmci.Npmci();
await npmciInstance.nodejsManager.handleCli({ await npmciInstance.nodejsManager.handleCli({
_: ['node', 'install', 'stable'] _: ['node', 'install', 'stable'],
}); });
await npmciInstance.nodejsManager.handleCli({ await npmciInstance.nodejsManager.handleCli({
_: ['node', 'install', 'lts'] _: ['node', 'install', 'lts'],
}); });
await npmciInstance.nodejsManager.handleCli({ await npmciInstance.nodejsManager.handleCli({
_: ['node', 'install', 'legacy'] _: ['node', 'install', 'legacy'],
}); });
}); });

11
ts/connector.cloudly/cloudlyconnector.ts
View File

@ -13,7 +13,9 @@ export class CloudlyConnector {
this.npmciRef = npmciRefArg; this.npmciRef = npmciRefArg;
} }
public async announceDockerContainer(optionsArg: plugins.servezoneInterfaces.version.IVersionData) { public async announceDockerContainer(
optionsArg: plugins.servezoneInterfaces.version.IVersionData
) {
const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly; const cloudlyUrl = this.npmciRef.npmciConfig.getConfig().urlCloudly;
if (!cloudlyUrl) { if (!cloudlyUrl) {
logger.log( logger.log(
@ -23,9 +25,10 @@ export class CloudlyConnector {
return; return;
} }
const typedrequest = new plugins.typedrequest.TypedRequest< const typedrequest = new plugins.typedrequest.TypedRequest<plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update>(
plugins.servezoneInterfaces.request.version.IRequest_Any_Cloudly_VersionManager_Update `https://${cloudlyUrl}/versionmanager`,
>(`https://${cloudlyUrl}/versionmanager`, 'update'); 'update'
);
const response = await typedrequest.fire(optionsArg); const response = await typedrequest.fire(optionsArg);
} }

4
ts/index.ts
View File

@ -5,6 +5,6 @@ export const npmciInstance = new Npmci();
export { Dockerfile, Npmci }; export { Dockerfile, Npmci };
if (process.env.CLI_CALL) { export const runCli = async () => {
npmciInstance.start(); npmciInstance.start();
} };

10
ts/manager.docker/index.ts
View File

@ -21,7 +21,7 @@ export class NpmciDockerManager {
* handle cli input * handle cli input
* @param argvArg * @param argvArg
*/ */
public handleCli = async argvArg => { public handleCli = async (argvArg) => {
if (argvArg._.length >= 2) { if (argvArg._.length >= 2) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {
@ -85,7 +85,7 @@ export class NpmciDockerManager {
new DockerRegistry({ new DockerRegistry({
registryUrl: 'registry.gitlab.com', registryUrl: 'registry.gitlab.com',
username: 'gitlab-ci-token', username: 'gitlab-ci-token',
password: process.env.CI_BUILD_TOKEN password: process.env.CI_BUILD_TOKEN,
}) })
); );
@ -93,7 +93,7 @@ export class NpmciDockerManager {
await plugins.smartparam.forEachMinimatch( await plugins.smartparam.forEachMinimatch(
process.env, process.env,
'NPMCI_LOGIN_DOCKER*', 'NPMCI_LOGIN_DOCKER*',
async envString => { async (envString) => {
this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString)); this.npmciRegistryStorage.addRegistry(DockerRegistry.fromEnvString(envString));
} }
); );
@ -104,7 +104,7 @@ export class NpmciDockerManager {
* pushes an image towards a registry * pushes an image towards a registry
* @param argvArg * @param argvArg
*/ */
public push = async argvArg => { public push = async (argvArg) => {
await this.prepare(); await this.prepare();
let dockerRegistryUrls: string[] = []; let dockerRegistryUrls: string[] = [];
@ -151,7 +151,7 @@ export class NpmciDockerManager {
/** /**
* pulls an image * pulls an image
*/ */
public pull = async argvArg => { public pull = async (argvArg) => {
await this.prepare(); await this.prepare();
const registryUrlArg = argvArg._[2]; const registryUrlArg = argvArg._[2];
let suffix = null; let suffix = null;

16
ts/manager.docker/mod.classes.dockerfile.ts
View File

@ -31,7 +31,7 @@ export class Dockerfile {
for (const dockerfilePath of fileTree) { for (const dockerfilePath of fileTree) {
const myDockerfile = new Dockerfile(npmciDockerManagerRefArg, { const myDockerfile = new Dockerfile(npmciDockerManagerRefArg, {
filePath: dockerfilePath, filePath: dockerfilePath,
read: true read: true,
}); });
readDockerfilesArray.push(myDockerfile); readDockerfilesArray.push(myDockerfile);
} }
@ -51,7 +51,7 @@ export class Dockerfile {
const cleanTagsOriginal = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray); const cleanTagsOriginal = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
let sorterFunctionCounter: number = 0; let sorterFunctionCounter: number = 0;
const sorterFunction = () => { const sorterFunction = () => {
sortableArrayArg.forEach(dockerfileArg => { sortableArrayArg.forEach((dockerfileArg) => {
const cleanTags = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray); const cleanTags = Dockerfile.cleanTagsArrayFunction(sortableArrayArg, sortedArray);
if ( if (
cleanTags.indexOf(dockerfileArg.baseImage) === -1 && cleanTags.indexOf(dockerfileArg.baseImage) === -1 &&
@ -83,7 +83,7 @@ export class Dockerfile {
* maps local Dockerfiles dependencies to the correspoding Dockerfile class instances * maps local Dockerfiles dependencies to the correspoding Dockerfile class instances
*/ */
public static async mapDockerfiles(sortedDockerfileArray: Dockerfile[]): Promise<Dockerfile[]> { public static async mapDockerfiles(sortedDockerfileArray: Dockerfile[]): Promise<Dockerfile[]> {
sortedDockerfileArray.forEach(dockerfileArg => { sortedDockerfileArray.forEach((dockerfileArg) => {
if (dockerfileArg.localBaseImageDependent) { if (dockerfileArg.localBaseImageDependent) {
sortedDockerfileArray.forEach((dockfile2: Dockerfile) => { sortedDockerfileArray.forEach((dockfile2: Dockerfile) => {
if (dockfile2.cleanTag === dockerfileArg.baseImage) { if (dockfile2.cleanTag === dockerfileArg.baseImage) {
@ -198,7 +198,7 @@ export class Dockerfile {
trackingArrayArg: Dockerfile[] trackingArrayArg: Dockerfile[]
): string[] { ): string[] {
const cleanTagsArray: string[] = []; const cleanTagsArray: string[] = [];
dockerfileArrayArg.forEach(dockerfileArg => { dockerfileArrayArg.forEach((dockerfileArg) => {
if (trackingArrayArg.indexOf(dockerfileArg) === -1) { if (trackingArrayArg.indexOf(dockerfileArg) === -1) {
cleanTagsArray.push(dockerfileArg.cleanTag); cleanTagsArray.push(dockerfileArg.cleanTag);
} }
@ -269,14 +269,14 @@ export class Dockerfile {
); );
await bash(`docker tag ${this.buildTag} ${this.pushTag}`); await bash(`docker tag ${this.buildTag} ${this.pushTag}`);
await bash(`docker push ${this.pushTag}`); await bash(`docker push ${this.pushTag}`);
const imageDigest = (await bash( const imageDigest = (
`docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}` await bash(`docker inspect --format="{{index .RepoDigests 0}}" ${this.pushTag}`)
)).split('@')[1]; ).split('@')[1];
console.log(`The image ${this.pushTag} has digest ${imageDigest}`); console.log(`The image ${this.pushTag} has digest ${imageDigest}`);
await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({ await this.npmciDockerManagerRef.npmciRef.cloudlyConnector.announceDockerContainer({
dockerImageUrl: this.pushTag, dockerImageUrl: this.pushTag,
dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo dockerImageVersion: this.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo
.npm.version .npm.version,
}); });
} }

2
ts/manager.docker/mod.classes.dockerregistry.ts
View File

@ -32,7 +32,7 @@ export class DockerRegistry {
return new DockerRegistry({ return new DockerRegistry({
registryUrl: registryUrl, registryUrl: registryUrl,
username: username, username: username,
password: password password: password,
}); });
} }

8
ts/manager.docker/mod.classes.registrystorage.ts
View File

@ -1,11 +1,11 @@
import { logger } from '../npmci.logging'; import { logger } from '../npmci.logging';
import * as plugins from './mod.plugins'; import * as plugins from './mod.plugins';
import { Objectmap } from '@pushrocks/lik'; import { ObjectMap } from '@pushrocks/lik';
import { DockerRegistry } from './mod.classes.dockerregistry'; import { DockerRegistry } from './mod.classes.dockerregistry';
export class RegistryStorage { export class RegistryStorage {
objectMap = new Objectmap<DockerRegistry>(); objectMap = new ObjectMap<DockerRegistry>();
constructor() { constructor() {
// Nothing here // Nothing here
} }
@ -15,13 +15,13 @@ export class RegistryStorage {
} }
getRegistryByUrl(registryUrlArg: string) { getRegistryByUrl(registryUrlArg: string) {
return this.objectMap.find(registryArg => { return this.objectMap.find((registryArg) => {
return registryArg.registryUrl === registryUrlArg; return registryArg.registryUrl === registryUrlArg;
}); });
} }
async loginAll() { async loginAll() {
await this.objectMap.forEach(async registryArg => { await this.objectMap.forEach(async (registryArg) => {
await registryArg.login(); await registryArg.login();
}); });
logger.log('success', 'logged in successfully into all available DockerRegistries!'); logger.log('success', 'logged in successfully into all available DockerRegistries!');

2
ts/manager.git/index.ts
View File

@ -14,7 +14,7 @@ export class NpmciGitManager {
* handle cli input * handle cli input
* @param argvArg * @param argvArg
*/ */
public handleCli = async argvArg => { public handleCli = async (argvArg) => {
if (argvArg._.length >= 2) { if (argvArg._.length >= 2) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {

6
ts/manager.npm/index.ts
View File

@ -54,7 +54,7 @@ export class NpmciNpmManager {
public async prepare() { public async prepare() {
const config = this.npmciRef.npmciConfig.getConfig(); const config = this.npmciRef.npmciConfig.getConfig();
let npmrcFileString: string = ''; let npmrcFileString: string = '';
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => { await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => {
const npmRegistryUrl = npmEnvArg.split('|')[0]; const npmRegistryUrl = npmEnvArg.split('|')[0];
const npmToken = npmEnvArg.split('|')[1]; const npmToken = npmEnvArg.split('|')[1];
npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode( npmrcFileString += `//${npmRegistryUrl}/:_authToken="${plugins.smartstring.base64.decode(
@ -91,7 +91,7 @@ export class NpmciNpmManager {
let publishVerdaccioAsWell = false; let publishVerdaccioAsWell = false;
const config = this.npmciRef.npmciConfig.getConfig(); const config = this.npmciRef.npmciConfig.getConfig();
const availableRegistries: string[] = []; const availableRegistries: string[] = [];
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => { await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', (npmEnvArg) => {
availableRegistries.push(npmEnvArg.split('|')[0]); availableRegistries.push(npmEnvArg.split('|')[0]);
}); });
@ -116,7 +116,7 @@ export class NpmciNpmManager {
// publishEverywhere // publishEverywhere
if (publishVerdaccioAsWell) { if (publishVerdaccioAsWell) {
const verdaccioRegistry = availableRegistries.find(registryString => const verdaccioRegistry = availableRegistries.find((registryString) =>
registryString.startsWith('verdaccio') registryString.startsWith('verdaccio')
); );
if (verdaccioRegistry) { if (verdaccioRegistry) {

2
ts/mod_ssh/index.ts
View File

@ -2,7 +2,7 @@ import { logger } from '../npmci.logging';
import * as plugins from './mod.plugins'; import * as plugins from './mod.plugins';
let sshInstance: plugins.smartssh.SshInstance; let sshInstance: plugins.smartssh.SshInstance;
export let handleCli = async argvArg => { export let handleCli = async (argvArg) => {
if (argvArg._.length >= 2) { if (argvArg._.length >= 2) {
const action: string = argvArg._[1]; const action: string = argvArg._[1];
switch (action) { switch (action) {

8
ts/mod_trigger/index.ts
View File

@ -9,7 +9,7 @@ export let trigger = async () => {
await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger); await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TRIGGER_*', evaluateTrigger);
}; };
const evaluateTrigger = async triggerEnvVarArg => { const evaluateTrigger = async (triggerEnvVarArg) => {
const triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg); const triggerRegexResultArray = triggerValueRegex.exec(triggerEnvVarArg);
const regexDomain = triggerRegexResultArray[1]; const regexDomain = triggerRegexResultArray[1];
const regexProjectId = triggerRegexResultArray[2]; const regexProjectId = triggerRegexResultArray[2];
@ -30,13 +30,13 @@ const evaluateTrigger = async triggerEnvVarArg => {
{ {
name: 'token', name: 'token',
payload: regexProjectTriggerToken, payload: regexProjectTriggerToken,
type: 'string' type: 'string',
}, },
{ {
name: 'ref', name: 'ref',
payload: regexRefName, payload: regexRefName,
type: 'string' type: 'string',
} },
] ]
); );
}; };

4
ts/npmci.bash.ts
View File

@ -13,7 +13,7 @@ export let nvmAvailable = smartpromise.defer<boolean>();
*/ */
const npmciSmartshell = new plugins.smartshell.Smartshell({ const npmciSmartshell = new plugins.smartshell.Smartshell({
executor: 'bash', executor: 'bash',
sourceFilePaths: [] sourceFilePaths: [],
}); });
/** /**
@ -84,7 +84,7 @@ export let bash = async (commandArg: string, retryArg: number = 2): Promise<stri
logger.log('info', 'ShellExec would be: ' + commandArg); logger.log('info', 'ShellExec would be: ' + commandArg);
execResult = { execResult = {
exitCode: 0, exitCode: 0,
stdout: 'testOutput' stdout: 'testOutput',
}; };
} }
return execResult.stdout; return execResult.stdout;

2
ts/npmci.classes.npmci.ts
View File

@ -32,7 +32,7 @@ export class Npmci {
this.analytics = new plugins.smartanalytics.Analytics({ this.analytics = new plugins.smartanalytics.Analytics({
apiEndPoint: 'https://pubapi.lossless.one/analytics', apiEndPoint: 'https://pubapi.lossless.one/analytics',
projectId: 'gitzone', projectId: 'gitzone',
appName: 'npmci' appName: 'npmci',
}); });
this.cloudlyConnector = new CloudlyConnector(this); this.cloudlyConnector = new CloudlyConnector(this);
this.npmciEnv = new NpmciEnv(this); this.npmciEnv = new NpmciEnv(this);

32
ts/npmci.classes.npmcicli.ts
View File

@ -14,11 +14,11 @@ export class NpmciCli {
// clean // clean
this.smartcli.addCommand('clean').subscribe( this.smartcli.addCommand('clean').subscribe(
async argv => { async (argv) => {
const modClean = await import('./mod_clean/index'); const modClean = await import('./mod_clean/index');
await modClean.clean(); await modClean.clean();
}, },
err => { (err) => {
console.log(err); console.log(err);
process.exit(1); process.exit(1);
} }
@ -26,11 +26,11 @@ export class NpmciCli {
// command // command
this.smartcli.addCommand('command').subscribe( this.smartcli.addCommand('command').subscribe(
async argv => { async (argv) => {
const modCommand = await import('./mod_command/index'); const modCommand = await import('./mod_command/index');
await modCommand.command(); await modCommand.command();
}, },
err => { (err) => {
console.log(err); console.log(err);
process.exit(1); process.exit(1);
} }
@ -38,10 +38,10 @@ export class NpmciCli {
// command // command
this.smartcli.addCommand('git').subscribe( this.smartcli.addCommand('git').subscribe(
async argvArg => { async (argvArg) => {
await this.npmciRef.gitManager.handleCli(argvArg); await this.npmciRef.gitManager.handleCli(argvArg);
}, },
err => { (err) => {
console.log(err); console.log(err);
process.exit(1); process.exit(1);
} }
@ -49,10 +49,10 @@ export class NpmciCli {
// build // build
this.smartcli.addCommand('docker').subscribe( this.smartcli.addCommand('docker').subscribe(
async argvArg => { async (argvArg) => {
await this.npmciRef.dockerManager.handleCli(argvArg); await this.npmciRef.dockerManager.handleCli(argvArg);
}, },
err => { (err) => {
console.log(err); console.log(err);
process.exit(1); process.exit(1);
} }
@ -60,10 +60,10 @@ export class NpmciCli {
// node // node
this.smartcli.addCommand('node').subscribe( this.smartcli.addCommand('node').subscribe(
async argvArg => { async (argvArg) => {
await this.npmciRef.nodejsManager.handleCli(argvArg); await this.npmciRef.nodejsManager.handleCli(argvArg);
}, },
err => { (err) => {
console.log(err); console.log(err);
process.exit(1); process.exit(1);
} }
@ -71,21 +71,21 @@ export class NpmciCli {
// npm // npm
this.smartcli.addCommand('npm').subscribe( this.smartcli.addCommand('npm').subscribe(
async argvArg => { async (argvArg) => {
await this.npmciRef.npmManager.handleCli(argvArg); await this.npmciRef.npmManager.handleCli(argvArg);
}, },
err => { (err) => {
console.log(err); console.log(err);
} }
); );
// trigger // trigger
this.smartcli.addCommand('ssh').subscribe( this.smartcli.addCommand('ssh').subscribe(
async argvArg => { async (argvArg) => {
const modSsh = await import('./mod_ssh/index'); const modSsh = await import('./mod_ssh/index');
await modSsh.handleCli(argvArg); await modSsh.handleCli(argvArg);
}, },
err => { (err) => {
console.log(err); console.log(err);
process.exit(1); process.exit(1);
} }
@ -93,11 +93,11 @@ export class NpmciCli {
// trigger // trigger
this.smartcli.addCommand('trigger').subscribe( this.smartcli.addCommand('trigger').subscribe(
async argv => { async (argv) => {
const modTrigger = await import('./mod_trigger/index'); const modTrigger = await import('./mod_trigger/index');
await modTrigger.trigger(); await modTrigger.trigger();
}, },
err => { (err) => {
console.log(err); console.log(err);
process.exit(1); process.exit(1);
} }

5
ts/npmci.classes.npmciconfig.ts
View File

@ -47,8 +47,7 @@ export class NpmciConfig {
this.npmciQenv = new plugins.qenv.Qenv( this.npmciQenv = new plugins.qenv.Qenv(
paths.NpmciProjectDir, paths.NpmciProjectDir,
paths.NpmciProjectNogitDir, paths.NpmciProjectNogitDir,
false, false
logger
); );
this.configObject = { this.configObject = {
@ -59,7 +58,7 @@ export class NpmciConfig {
npmAccessLevel: 'private', npmAccessLevel: 'private',
npmRegistryUrl: 'registry.npmjs.org', npmRegistryUrl: 'registry.npmjs.org',
dockerBuildargEnvMap: {}, dockerBuildargEnvMap: {},
urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY') urlCloudly: this.npmciQenv.getEnvVarOnDemand('NPMCI_URL_CLOUDLY'),
}; };
} }

4
ts/npmci.logging.ts
View File

@ -7,8 +7,8 @@ export const logger = new plugins.smartlog.Smartlog({
containerName: 'Some ContainerName', containerName: 'Some ContainerName',
environment: 'test', environment: 'test',
runtime: 'node', runtime: 'node',
zone: 'Some Zone' zone: 'Some Zone',
} },
}); });
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal()); logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

2
ts/npmci.plugins.ts
View File

@ -47,7 +47,7 @@ export {
smartshell, smartshell,
smartsocket, smartsocket,
smartssh, smartssh,
smartstring smartstring,
}; };
import * as through2 from 'through2'; import * as through2 from 'through2';