@docupace/pipeline 1.0.7-alpha.ervins1.7 → 1.0.7-alpha.ervins1.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/next/connect.js +6 -8
package/package.json
CHANGED
package/src/next/connect.js
CHANGED
|
@@ -22,7 +22,8 @@ import {
|
|
|
22
22
|
process.env.COMMON_VAULT_PATH = process.env.COMMON_VAULT_PATH || 'secret/data/common/config';
|
|
23
23
|
process.env.VAULT_SKIP_VERIFY = process.env.VAULT_SKIP_VERIFY || 'true';
|
|
24
24
|
process.env.CONNECT_DIR = process.env.CONNECT_DIR || 'connect';
|
|
25
|
-
|
|
25
|
+
const vaultToken = process.env.VAULT_TOKEN;
|
|
26
|
+
const vaultAddr = process.env.VAULT_ADDR;
|
|
26
27
|
|
|
27
28
|
function log(msg) {
|
|
28
29
|
console.log(`[*] ${msg}`);
|
|
@@ -40,22 +41,19 @@ function log(msg) {
|
|
|
40
41
|
log(`Cloning ${destDir} repository...`);
|
|
41
42
|
}
|
|
42
43
|
|
|
43
|
-
// Since we use zx, the environment variables can be read from process.env
|
|
44
|
-
// e.g. $BITBUCKET_USERNAME, $BITBUCKET_APP_PASSWORD
|
|
45
44
|
const username = process.env.BITBUCKET_USERNAME;
|
|
46
45
|
const password = process.env.BITBUCKET_APP_PASSWORD;
|
|
47
46
|
|
|
48
47
|
// Construct clone command
|
|
49
48
|
const cloneUrl = `https://${username}:${password}@bitbucket.org/dp-cloud/${repository}.git`;
|
|
50
49
|
|
|
51
|
-
|
|
50
|
+
log(`Perform cloning`);
|
|
52
51
|
await $`git clone --branch=${branch} --depth 1 ${cloneUrl} ${destDir}`;
|
|
53
52
|
}
|
|
54
53
|
|
|
55
54
|
|
|
56
55
|
|
|
57
|
-
|
|
58
|
-
const vaultAddr = process.env.VAULT_ADDR;
|
|
56
|
+
|
|
59
57
|
|
|
60
58
|
|
|
61
59
|
export async function connectClone() {
|
|
@@ -100,7 +98,7 @@ export async function connectClone() {
|
|
|
100
98
|
|
|
101
99
|
const projectRoot = process.cwd();
|
|
102
100
|
// 4) Clone 'connect-deploy' into CONNECT_DIR
|
|
103
|
-
|
|
101
|
+
log($`pwd ; echo "test"; find ..`);
|
|
104
102
|
|
|
105
103
|
await gitCheckout('connect-deploy', process.env.CONNECT_DIR);
|
|
106
104
|
|
|
@@ -111,7 +109,7 @@ export async function connectClone() {
|
|
|
111
109
|
const connectHome = path.join(projectRoot,process.env.CONNECT_DIR);
|
|
112
110
|
$`find .`;
|
|
113
111
|
if (!(await fs.pathExists(cloneFrom))) {
|
|
114
|
-
log('Clone template directory not found');
|
|
112
|
+
log('Clone template directory not found:');
|
|
115
113
|
process.exit(1);
|
|
116
114
|
}
|
|
117
115
|
|