Skip to content

chore(cts): update dependencies on cts generation for javascript #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 16, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class AlgoliaCtsGenerator extends DefaultCodegen {
private String language;
private String client;
private String packageName;
private Boolean updateVersions;

/**
* Configures the type of generator.
Expand Down Expand Up @@ -63,6 +64,7 @@ public void processOpts() {
language = (String) additionalProperties.get("language");
client = (String) additionalProperties.get("client");
packageName = (String) additionalProperties.get("packageName");
updateVersions = "true".equals(additionalProperties.get("updateVersions"));

try {
JsonNode config = Json
Expand All @@ -84,6 +86,14 @@ public void processOpts() {
clientName + testConfig.extension
)
);

if (updateVersions) {
if (language.equals("javascript")) {
supportingFiles.add(
new SupportingFile("package.mustache", ".", "package.json")
);
}
}
} catch (IOException e) {
e.printStackTrace();
System.exit(1);
Expand Down
11 changes: 8 additions & 3 deletions scripts/cts/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@ import type { Generator } from '../types';

import { generateClientTests } from './client/generate';

async function ctsGenerate(gen: Generator, verbose: boolean): Promise<void> {
async function ctsGenerate(
gen: Generator,
updateVersions: boolean,
verbose: boolean
): Promise<void> {
createSpinner(`generating CTS for ${gen.key}`, verbose).start().info();
const spinner = createSpinner(
{ text: 'generating requests tests', indent: 4 },
verbose
).start();
await run(
`yarn openapi-generator-cli --custom-generator=generators/build/libs/algolia-java-openapi-generator-1.0.0.jar generate \
-g algolia-cts -i specs/bundled/${gen.client}.yml --additional-properties="language=${gen.language},client=${gen.client},packageName=${gen.additionalProperties.packageName}"`,
-g algolia-cts -i specs/bundled/${gen.client}.yml --additional-properties="language=${gen.language},client=${gen.client},packageName=${gen.additionalProperties.packageName},updateVersions=${updateVersions}"`,
{ verbose }
);
spinner.succeed();
Expand All @@ -29,6 +33,7 @@ async function ctsGenerate(gen: Generator, verbose: boolean): Promise<void> {

export async function ctsGenerateMany(
generators: Generator[],
updateVersions: boolean,
verbose: boolean
): Promise<void> {
await buildCustomGenerators(verbose);
Expand All @@ -38,7 +43,7 @@ export async function ctsGenerateMany(
if (!getTestOutputFolder(gen.language)) {
continue;
}
await ctsGenerate(gen, verbose);
await ctsGenerate(gen, updateVersions, verbose);
}

const langs = [...new Set(generators.map((gen) => gen.language))];
Expand Down
4 changes: 3 additions & 1 deletion scripts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,19 @@ ctsCommand
)
.option('-v, --verbose', 'make the generation verbose')
.option('-i, --interactive', 'open prompt to query parameters')
.option('-u, --update-versions', 'update versions of CTS')
.action(
async (
language: Language | 'all' | undefined,
client: string[],
{ verbose, interactive }
{ verbose, interactive, updateVersions }
) => {
language = await promptLanguage(language, interactive);
client = await promptClient(client, interactive);

await ctsGenerateMany(
generatorList({ language, client }),
updateVersions,
Boolean(verbose)
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "javascript-tests",
"version": "1.0.0",
"scripts": {
"test": "jest"
},
"dependencies": {
"@experimental-api-clients-automation/algoliasearch-lite": "0.2.0",
"@experimental-api-clients-automation/client-abtesting": "0.2.0",
"@experimental-api-clients-automation/client-analytics": "0.2.0",
"@experimental-api-clients-automation/client-common": "0.2.0",
"@experimental-api-clients-automation/client-insights": "0.2.0",
"@experimental-api-clients-automation/client-personalization": "0.2.0",
"@experimental-api-clients-automation/client-predict": "0.2.0",
"@experimental-api-clients-automation/client-query-suggestions": "0.2.0",
"@experimental-api-clients-automation/client-search": "0.2.0",
"@experimental-api-clients-automation/client-sources": "0.2.0",
"@experimental-api-clients-automation/recommend": "0.2.0",
"@experimental-api-clients-automation/requester-node-http": "0.2.0"
},
"devDependencies": {
"@types/jest": "27.4.1",
"@types/node": "16.11.26",
"jest": "27.5.1",
"ts-jest": "27.1.4",
"ts-node": "10.7.0",
"typescript": "4.6.3"
}
}