Skip to content

Commit cc45827

Browse files
committed
Removed duplicate object initialisation of REGION_MAP
1 parent 7d1439e commit cc45827

24 files changed

Lines changed: 1983 additions & 2173 deletions

.talismanrc

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,46 @@
11
fileignoreconfig:
2-
- filename: .github/workflows/secrets-scan.yml
3-
ignore_detectors:
4-
- filecontent
5-
- filename: package-lock.json
6-
checksum: 474467984a5dbec5b9cf3fac76eeef3672e1e9e47ef2b91370503491ef239791
7-
- filename: pnpm-lock.yaml
8-
checksum: 7144a9442db6520f8e95d095afe857efa5e1c6c9391957094be28d50f36d942b
92
- filename: packages/contentstack-import/test/integration/auth-token-modules/environments.test.js
10-
checksum: a59bd1d2eb42c70e8b6a935d9de4851a89baefa03ab8bf5824e6691191afd936
3+
checksum: bc6f06b75d082aaf99e2f2f4b932b143765e2f14086967fb8973fe1b2ca6c03e
114
- filename: packages/contentstack-import/test/integration/environments.test.js
12-
checksum: 7d1ecf94b2a09e062dc3e94fa66ebc3bcf8ff963212b1b57c4b2031a2c6f494c
13-
- filename: packages/contentstack-auth/test/unit/tokens-validation.test.ts
14-
checksum: 54b0927001dfbb16beb8c8dd574fa5ae8c86feb8e060b026633bceaec14ec6b1
15-
- filename: packages/contentstack-utilities/src/helpers.ts
16-
checksum: 54b0927001dfbb16beb8c8dd574fa5ae8c86feb8e060b026633bceaec14ec6b1
17-
version: '1.0'
5+
checksum: e71f033dad8944ffeafdf22d0514bda1d20c43e8fea0d62c96e774f3414beb31
6+
- filename: packages/contentstack-import/test/integration/auth-token-modules/extensions.test.js
7+
checksum: 9c79540ab8522736f17c3ae1c9bfea07784b6ed0aa41f5617c90ba6812b91e72
8+
- filename: packages/contentstack-import/test/integration/auth-token-modules/workflows.test.js
9+
checksum: 1c77d21cff245157bc9a9863cc264d29bd81591447de3b27ae3aff67239e2937
10+
- filename: packages/contentstack-import/test/integration/auth-token-modules/global-fields.test.js
11+
checksum: db5b7aedcd89d783760eb988a2369243c34edc9c12e93a41b2b08fb0da02afdc
12+
- filename: packages/contentstack-import/test/integration/auth-token-modules/custom-roles.test.js
13+
checksum: 429bd7cfe81f22266da6230eae538c36a846b0267de17d0e55f611a9311eef78
14+
- filename: packages/contentstack-import/test/integration/auth-token-modules/locales.test.js
15+
checksum: e3ae0c7c1e7cf15d74918711f8939e46e9257b2525bf936e41d85d6328d4a018
16+
- filename: packages/contentstack-import/test/integration/auth-token-modules/assets.test.js
17+
checksum: 844ac7242268fab10c0fd22cfd4e98284d6461de95d55d22925f61e1b1f29433
18+
- filename: packages/contentstack-import/test/integration/auth-token-modules/webhooks.test.js
19+
checksum: 06290dce8c950c394d061427ad5ecce10e5f36644372d46ee542bffa09a76185
20+
- filename: packages/contentstack-import/test/integration/content-types.test.js
21+
checksum: 0f15d1b877cc99ac27cd89ad31082c00f902667e631e1941d5d97d73e74d39e2
22+
- filename: packages/contentstack-import/test/integration/auth-token-modules/entries.test.js
23+
checksum: 75f2c3b007488e9dd0ff43bcc624f9edc9a3daf1dbb1dfd24203a488a986937d
24+
- filename: packages/contentstack-import/test/integration/custom-roles.test.js
25+
checksum: 58d77f9139c9c01a4471d9ce821fbc683eaea4650787bfc510959e7817084ed6
26+
- filename: packages/contentstack-import/test/integration/entries.test.js
27+
checksum: 5e33da22b28afd09ce105a6714a90e27c1e2ad559e6b9d8b41f59de02e83894c
28+
- filename: packages/contentstack-import/test/integration/auth-token.test.js
29+
checksum: 05a5a9917440203efc6db1c5d46ba2c7ce61db4648c379db28b36e08cfe049ef
30+
- filename: packages/contentstack-import/test/integration/auth-token-modules/content-types.test.js
31+
checksum: b24e5dee9677453088b2ecbd5c70b077cf99756f8fe927c4f38670e6041da94d
32+
- filename: packages/contentstack-import/test/integration/assets.test.js
33+
checksum: ca95054274b7262f3e0325ed312dac3fc09965acf4097a79184a42913c08ecb7
34+
- filename: packages/contentstack-import/test/integration/workflows.test.js
35+
checksum: 07cfe3cbb586d30b143a0169e7001a1f91ce50a1a5ae4485b2518c2181973cf7
36+
- filename: packages/contentstack-import/test/integration/webhooks.test.js
37+
checksum: eb11a310516a3cdfd5c2dc77bdfe7143eb268b1ab1e0e33babbe9352c5b72c38
38+
- filename: packages/contentstack-import/test/integration/global-fields.test.js
39+
checksum: 16ead9a66c7834e4d24ca27eb11c6a1c70a02304c39a6c0483802e1851438903
40+
- filename: packages/contentstack-import/test/integration/extensions.test.js
41+
checksum: 2e62534faf6b3c5d9fd9bc001fd45e900430e835f899a2afd70b781098d2add7
42+
- filename: packages/contentstack-import/test/integration/locales.test.js
43+
checksum: f3b6c73302f5883a40dad4e878a37bfc9780c39743c3745402037baa0cd7eab4
44+
- filename: packages/contentstack-import/test/integration/management-token.test.js
45+
checksum: 095187d8b5fee8466f39a13e5cbc9f3c78f3dd0eb07d2c5af3929aca8aff8f2d
46+
version: ''
Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
11
{
2-
"IS_TS": false,
3-
"UNIT_EXECUTION_ORDER": [],
4-
"INTEGRATION_EXECUTION_ORDER": [
5-
"management-token.test.js",
6-
"assets.test.js",
7-
"content-types.test.js",
8-
"custom-roles.test.js",
9-
"entries.test.js",
10-
"environments.test.js",
11-
"extensions.test.js",
12-
"global-fields.test.js",
13-
"locales.test.js",
14-
"webhooks.test.js",
15-
"workflows.test.js",
16-
"auth-token.test.js",
17-
"auth-token-modules/assets.test.js",
18-
"auth-token-modules/content-types.test.js",
19-
"auth-token-modules/custom-roles.test.js",
20-
"auth-token-modules/entries.test.js",
21-
"auth-token-modules/environments.test.js",
22-
"auth-token-modules/extensions.test.js",
23-
"auth-token-modules/global-fields.test.js",
24-
"auth-token-modules/locales.test.js",
25-
"auth-token-modules/webhooks.test.js",
26-
"auth-token-modules/workflows.test.js"
27-
],
28-
"ENABLE_PREREQUISITES": true,
29-
"REGIONS": [
30-
"AWS-NA",
31-
"AWS-EU",
32-
"AWS-AU",
33-
"AZURE-NA",
34-
"AZURE-EU",
35-
"GCP-NA",
36-
"GCP-EU"
37-
]
38-
}
2+
"IS_TS": false,
3+
"UNIT_EXECUTION_ORDER": [],
4+
"INTEGRATION_EXECUTION_ORDER": [
5+
"management-token.test.js",
6+
"assets.test.js",
7+
"content-types.test.js",
8+
"custom-roles.test.js",
9+
"entries.test.js",
10+
"environments.test.js",
11+
"extensions.test.js",
12+
"global-fields.test.js",
13+
"locales.test.js",
14+
"webhooks.test.js",
15+
"workflows.test.js",
16+
"auth-token.test.js",
17+
"auth-token-modules/assets.test.js",
18+
"auth-token-modules/content-types.test.js",
19+
"auth-token-modules/custom-roles.test.js",
20+
"auth-token-modules/entries.test.js",
21+
"auth-token-modules/environments.test.js",
22+
"auth-token-modules/extensions.test.js",
23+
"auth-token-modules/global-fields.test.js",
24+
"auth-token-modules/locales.test.js",
25+
"auth-token-modules/webhooks.test.js",
26+
"auth-token-modules/workflows.test.js"
27+
],
28+
"ENABLE_PREREQUISITES": true,
29+
"REGIONS": ["AWS-NA", "AWS-EU", "AWS-AU", "AZURE-NA", "AZURE-EU", "GCP-NA", "GCP-EU"],
30+
"REGION_MAP": {
31+
"AWS_NA": "AWS-NA",
32+
"AWS_EU": "AWS-EU",
33+
"AWS_AU": "AWS-AU",
34+
"AZURE_NA": "AZURE-NA",
35+
"AZURE_EU": "AZURE-EU",
36+
"GCP_NA": "GCP-NA",
37+
"GCP_EU": "GCP-EU"
38+
}
39+
}

packages/contentstack-import/test/integration/assets.test.js

Lines changed: 105 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -12,129 +12,119 @@ const ExportCommand = require('@contentstack/cli-cm-export/src/commands/cm/stack
1212
const { default: defaultConfig } = require('../../src/config');
1313
const modules = defaultConfig.modules;
1414
const { getStackDetailsByRegion, getAssetAndFolderCount, cleanUp, deleteStack, getEnvData } = require('./utils/helper');
15-
const { PRINT_LOGS, IMPORT_PATH } = require('./config.json');
15+
const { PRINT_LOGS, IMPORT_PATH, REGION_MAP } = require('./config.json');
1616
const { DELIMITER, KEY_VAL_DELIMITER } = process.env;
1717
const { ENCRYPTION_KEY } = getEnvData();
1818

19-
const REGION_MAP = {
20-
AWS_NA: 'AWS-NA',
21-
AWS_EU: 'AWS-EU',
22-
AWS_AU: 'AWS-AU',
23-
AZURE_NA: 'AZURE-NA',
24-
AZURE_EU: 'AZURE-EU',
25-
GCP_NA: 'GCP-NA',
26-
GCP_EU: 'GCP-EU'
27-
};
28-
2919
module.exports = (region) => {
30-
const stackDetails = getStackDetailsByRegion(region.REGION, DELIMITER, KEY_VAL_DELIMITER);
31-
for (const stack of Object.keys(stackDetails)) {
32-
const basePath = path.join(__dirname, '..', '..', `${IMPORT_PATH}_${stack}`);
33-
const importBasePath = path.join(basePath, stackDetails[stack].BRANCH ? stackDetails[stack].BRANCH : 'main');
34-
const assetsBasePath = path.join(importBasePath, modules.assets.dirName);
35-
const assetsFolderPath = path.join(assetsBasePath, 'folders.json');
36-
const assetsJson = path.join(assetsBasePath, modules.assets.fileName);
37-
const messageFilePath = path.join(__dirname, '..', '..', 'messages/index.json');
38-
messageHandler.init({ messageFilePath });
39-
const username = ENCRYPTION_KEY ? crypto.decrypt(region.USERNAME) : region.USERNAME;
40-
const password = ENCRYPTION_KEY ? crypto.decrypt(region.PASSWORD) : region.PASSWORD;
20+
const stackDetails = getStackDetailsByRegion(region.REGION, DELIMITER, KEY_VAL_DELIMITER);
21+
for (const stack of Object.keys(stackDetails)) {
22+
const basePath = path.join(__dirname, '..', '..', `${IMPORT_PATH}_${stack}`);
23+
const importBasePath = path.join(basePath, stackDetails[stack].BRANCH ? stackDetails[stack].BRANCH : 'main');
24+
const assetsBasePath = path.join(importBasePath, modules.assets.dirName);
25+
const assetsFolderPath = path.join(assetsBasePath, 'folders.json');
26+
const assetsJson = path.join(assetsBasePath, modules.assets.fileName);
27+
const messageFilePath = path.join(__dirname, '..', '..', 'messages/index.json');
28+
messageHandler.init({ messageFilePath });
29+
const username = ENCRYPTION_KEY ? crypto.decrypt(region.USERNAME) : region.USERNAME;
30+
const password = ENCRYPTION_KEY ? crypto.decrypt(region.PASSWORD) : region.PASSWORD;
4131

42-
describe('Contentstack-import plugin test [--module=assets]', () => {
43-
customTest
44-
.stdout({ print: PRINT_LOGS || false })
45-
.command(RegionSetCommand, [REGION_MAP[stackDetails[stack].REGION_NAME]])
46-
.command(LoginCommand, [`-u=${username}`, `-p=${password}`])
47-
.it('should work without any errors', (_, done) => {
48-
done();
49-
});
32+
describe('Contentstack-import plugin test [--module=assets]', () => {
33+
customTest
34+
.stdout({ print: PRINT_LOGS || false })
35+
.command(RegionSetCommand, [REGION_MAP[stackDetails[stack].REGION_NAME]])
36+
.command(LoginCommand, [`-u=${username}`, `-p=${password}`])
37+
.it('should work without any errors', (_, done) => {
38+
done();
39+
});
5040

51-
customTest
52-
.command(AddTokenCommand, [
53-
'-a',
54-
stackDetails[stack].EXPORT_ALIAS_NAME,
55-
'-k',
56-
stackDetails[stack].EXPORT_STACK_API_KEY,
57-
'--management',
58-
'--token',
59-
stackDetails[stack].EXPORT_MANAGEMENT_TOKEN,
60-
'-y',
61-
])
62-
.it(`Adding token for ${stack}`, (_, done) => {
63-
done();
64-
});
41+
customTest
42+
.command(AddTokenCommand, [
43+
'-a',
44+
stackDetails[stack].EXPORT_ALIAS_NAME,
45+
'-k',
46+
stackDetails[stack].EXPORT_STACK_API_KEY,
47+
'--management',
48+
'--token',
49+
stackDetails[stack].EXPORT_MANAGEMENT_TOKEN,
50+
'-y',
51+
])
52+
.it(`Adding token for ${stack}`, (_, done) => {
53+
done();
54+
});
6555

66-
customTest
67-
.command(AddTokenCommand, [
68-
'-a',
69-
stackDetails[stack].ALIAS_NAME,
70-
'-k',
71-
stackDetails[stack].STACK_API_KEY,
72-
'--management',
73-
'--token',
74-
stackDetails[stack].MANAGEMENT_TOKEN,
75-
'-y',
76-
])
77-
.it(`Adding token for ${stack}`, (_, done) => {
78-
done();
79-
});
56+
customTest
57+
.command(AddTokenCommand, [
58+
'-a',
59+
stackDetails[stack].ALIAS_NAME,
60+
'-k',
61+
stackDetails[stack].STACK_API_KEY,
62+
'--management',
63+
'--token',
64+
stackDetails[stack].MANAGEMENT_TOKEN,
65+
'-y',
66+
])
67+
.it(`Adding token for ${stack}`, (_, done) => {
68+
done();
69+
});
8070

81-
customTest
82-
.stdout({ print: PRINT_LOGS || false })
83-
.command(ExportCommand, [
84-
'--alias',
85-
stackDetails[stack].EXPORT_ALIAS_NAME,
86-
'--data-dir',
87-
basePath,
88-
'--module',
89-
'assets',
90-
])
91-
.it('should work without any errors', (_, done) => {
92-
done();
93-
});
71+
customTest
72+
.stdout({ print: PRINT_LOGS || false })
73+
.command(ExportCommand, [
74+
'--alias',
75+
stackDetails[stack].EXPORT_ALIAS_NAME,
76+
'--data-dir',
77+
basePath,
78+
'--module',
79+
'assets',
80+
])
81+
.it('should work without any errors', (_, done) => {
82+
done();
83+
});
9484

95-
describe('Import assets using cm:stacks:import command', () => {
96-
test
97-
.stdout({ print: PRINT_LOGS || false })
98-
.command([
99-
'cm:stacks:import',
100-
'--alias',
101-
stackDetails[stack].ALIAS_NAME,
102-
'--data-dir',
103-
importBasePath,
104-
'--module',
105-
'assets',
106-
])
107-
.it('should work without any errors', async (_, done) => {
108-
let importedAssetsCount = 0;
109-
let importedAssetsFolderCount = 0;
110-
const { assetCount, folderCount } = await getAssetAndFolderCount(stackDetails[stack]);
111-
try {
112-
if (fs.existsSync(assetsFolderPath)) {
113-
importedAssetsFolderCount = uniqBy(
114-
JSON.parse(fs.readFileSync(assetsFolderPath, 'utf-8')),
115-
'uid',
116-
).length;
117-
}
118-
if (fs.existsSync(assetsJson)) {
119-
importedAssetsCount = Object.keys(JSON.parse(fs.readFileSync(assetsJson, 'utf-8'))).length;
120-
}
121-
} catch (error) {
122-
console.trace(error);
123-
}
124-
expect(assetCount).to.be.an('number').eq(importedAssetsCount);
125-
expect(folderCount).to.be.an('number').eq(importedAssetsFolderCount);
126-
done();
127-
});
128-
});
85+
describe('Import assets using cm:stacks:import command', () => {
86+
test
87+
.stdout({ print: PRINT_LOGS || false })
88+
.command([
89+
'cm:stacks:import',
90+
'--alias',
91+
stackDetails[stack].ALIAS_NAME,
92+
'--data-dir',
93+
importBasePath,
94+
'--module',
95+
'assets',
96+
])
97+
.it('should work without any errors', async (_, done) => {
98+
let importedAssetsCount = 0;
99+
let importedAssetsFolderCount = 0;
100+
const { assetCount, folderCount } = await getAssetAndFolderCount(stackDetails[stack]);
101+
try {
102+
if (fs.existsSync(assetsFolderPath)) {
103+
importedAssetsFolderCount = uniqBy(
104+
JSON.parse(fs.readFileSync(assetsFolderPath, 'utf-8')),
105+
'uid',
106+
).length;
107+
}
108+
if (fs.existsSync(assetsJson)) {
109+
importedAssetsCount = Object.keys(JSON.parse(fs.readFileSync(assetsJson, 'utf-8'))).length;
110+
}
111+
} catch (error) {
112+
console.trace(error);
113+
}
114+
expect(assetCount).to.be.an('number').eq(importedAssetsCount);
115+
expect(folderCount).to.be.an('number').eq(importedAssetsFolderCount);
116+
done();
117+
});
118+
});
129119

130-
after(async () => {
131-
await cleanUp(path.join(__dirname, '..', '..', `${IMPORT_PATH}_${stack}`));
132-
// await deleteStack({ apiKey: stackDetails[stack].STACK_API_KEY, authToken: configHandler.get('authtoken') });
133-
defaultConfig.management_token = null;
134-
defaultConfig.branch = null;
135-
defaultConfig.branches = [];
136-
defaultConfig.moduleName = null;
137-
});
138-
});
139-
}
120+
after(async () => {
121+
await cleanUp(path.join(__dirname, '..', '..', `${IMPORT_PATH}_${stack}`));
122+
// await deleteStack({ apiKey: stackDetails[stack].STACK_API_KEY, authToken: configHandler.get('authtoken') });
123+
defaultConfig.management_token = null;
124+
defaultConfig.branch = null;
125+
defaultConfig.branches = [];
126+
defaultConfig.moduleName = null;
127+
});
128+
});
129+
}
140130
};

0 commit comments

Comments
 (0)