Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
319 changes: 145 additions & 174 deletions .github/actions/check-public-api/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build-packages/check-pr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@vercel/ncc": "^0.38.3",
"depcheck": "^1.4.7",
"eslint": "^8.57.1",
"mock-fs": "^5.3.0",
"mock-fs": "^5.5.0",
"prettier": "^3.5.0",
"typescript": "~5.7.3"
}
Expand Down
2 changes: 1 addition & 1 deletion build-packages/check-public-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@sap-cloud-sdk/generator-common": "^3.22.2",
"@types/mock-fs": "^4.13.4",
"glob": "^11.0.1",
"mock-fs": "^5.3.0"
"mock-fs": "^5.5.0"
},
"devDependencies": {
"@vercel/ncc": "^0.38.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/connectivity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"jsonwebtoken": "^9.0.2"
},
"devDependencies": {
"mock-fs": "^5.3.0",
"mock-fs": "^5.5.0",
"nock": "^14.0.1",
"typescript": "~5.7.3"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/connectivity/src/http-agent/http-agent.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ describe('createAgent', () => {
};

expect(async () => getAgentConfigAsync(destination)).rejects.toThrowError(
"The format of the provided certificate 'cert.jks' is not supported. Supported formats are: p12, pfx. You can convert Java Keystores (.jks, .keystore) into PKCS#12 keystores using the JVM's keytool CLI: keytool -importkeystore -srckeystore your-keystore.jks -destkeystore your-keystore.p12 -deststoretype pkcs12"
"The format of the provided certificate 'cert.jks' is not supported. Supported formats are: p12, pfx, pem. You can convert Java Keystores (.jks, .keystore) into PKCS#12 keystores using the JVM's keytool CLI: keytool -importkeystore -srckeystore your-keystore.jks -destkeystore your-keystore.p12 -deststoretype pkcs12"
);
});

Expand Down
2 changes: 1 addition & 1 deletion packages/generator-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
},
"devDependencies": {
"@types/yargs": "^17.0.33",
"mock-fs": "^5.3.0"
"mock-fs": "^5.5.0"
}
}
2 changes: 1 addition & 1 deletion packages/generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"devDependencies": {
"execa": "^5.0.0",
"mock-fs": "^5.3.0",
"mock-fs": "^5.5.0",
"prettier": "^3.5.0"
}
}
2 changes: 2 additions & 0 deletions packages/generator/src/generator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const pathTestService = resolve(
const pathToGeneratorCommon = resolve(__dirname, '../../generator-common');
const pathRootNodeModules = resolve(__dirname, '../../../node_modules');

jest.setTimeout(60000); // Set timeout to 60 seconds as runners appear to be slow

describe('generator', () => {
const prettierSpy = jest.spyOn(prettier, 'format');

Expand Down
2 changes: 1 addition & 1 deletion packages/openapi-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"mock-fs": "^5.3.0",
"mock-fs": "^5.5.0",
"prettier": "^3.5.0",
"typescript": "~5.7.3"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/test-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@sap-cloud-sdk/util": "^3.24.0"
},
"devDependencies": {
"mock-fs": "^5.3.0",
"mock-fs": "^5.5.0",
"typescript": "~5.7.3"
}
}
2 changes: 1 addition & 1 deletion packages/util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
"devDependencies": {
"nock": "^14.0.1",
"typescript": "~5.7.3",
"mock-fs": "^5.3.0"
"mock-fs": "^5.5.0"
}
}
27 changes: 16 additions & 11 deletions packages/util/src/logger/cloud-sdk-logger.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,17 +307,22 @@ describe('Cloud SDK Logger', () => {
'logs verbose nowhere because the level is higher than info'
);
expect(consoleSpy).not.toBeCalled();
const log = await fs.promises.readFile('test.log', { encoding: 'utf-8' });
expect(log).toMatch(
/logs error only in test.log because the level is less than info/
);
expect(log).toMatch(
/logs info only in test.log because the level is equal to info/
);
expect(log).not.toMatch(
/logs verbose nowhere because the level is higher than info/
);
mock.restore();

logger.on('close', async () => {
const log = await fs.promises.readFile('test.log', {
encoding: 'utf-8'
});
expect(log).toMatch(
/logs error only in test.log because the level is less than info/
);
expect(log).toMatch(
/logs info only in test.log because the level is equal to info/
);
expect(log).not.toMatch(
/logs verbose nowhere because the level is higher than info/
);
mock.restore();
});
});
it('should accept an array with multiple transports', () => {
const httpTransport = new transports.Http();
Expand Down
2 changes: 1 addition & 1 deletion test-packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"fs-extra": "^11.3.0",
"http-proxy-middleware": "^3.0.3",
"json-schema-faker": "^0.5.8",
"mock-fs": "^5.3.0",
"mock-fs": "^5.5.0",
"moment": "^2.30.1",
"openapi-backend": "^5.11.1",
"pm2": "^5.4.3",
Expand Down
2 changes: 1 addition & 1 deletion test-packages/e2e-tests/test/odata-generator-cli.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ describe('OData generator CLI', () => {
expect(entities).toContain('TestEntity.ts');
expect(entities).toContain('TestEntity.js');
expect(entities).toContain('package.json');
});
}, 60000);
});
2 changes: 1 addition & 1 deletion test-packages/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"moment": "^2.30.1",
"execa": "^5.0.0",
"jsonwebtoken": "^9.0.2",
"mock-fs": "^5.3.0",
"mock-fs": "^5.5.0",
"nock": "^14.0.1",
"winston": "^3.17.0"
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6935,10 +6935,10 @@ mkdirp@^3.0.1:
resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==

mock-fs@^5.3.0:
version "5.3.0"
resolved "https://registry.npmjs.org/mock-fs/-/mock-fs-5.3.0.tgz#7dfc95ce5528aff8e10fa117161b91d8129e0e9e"
integrity sha512-IMvz1X+RF7vf+ur7qUenXMR7/FSKSIqS3HqFHXcyNI7G0FbpFO8L5lfsUJhl+bhK1AiulVHWKUSxebWauPA+xQ==
mock-fs@^5.5.0:
version "5.5.0"
resolved "https://registry.npmjs.org/mock-fs/-/mock-fs-5.5.0.tgz#94a46d299aaa588e735a201cbe823c876e91f385"
integrity sha512-d/P1M/RacgM3dB0sJ8rjeRNXxtapkPCUnMGmIN0ixJ16F/E4GUZCvWcSGfWGz8eaXYvn1s9baUwNjI4LOPEjiA==

mock-json-schema@^1.0.7:
version "1.1.1"
Expand Down
Loading