-
Notifications
You must be signed in to change notification settings - Fork 65
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
Generating import file for postman #770
Draft
Tokesh
wants to merge
11
commits into
opensearch-project:main
Choose a base branch
from
Tokesh:postman-generation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+332
−0
Draft
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
f561040
feat: generating import file for postman
Tokesh fdfb6db
chore: added changelog and getUrl method
Tokesh 14292d4
chore: fix content type
Tokesh 11427e8
chore: fixed few linter errors
Tokesh c1cf7fe
chore: deleting file
Tokesh 0ba8a74
chore: linter fix
Tokesh 836930e
fix: added full path to divide folders
Tokesh f17ed0a
deleting comments
Tokesh 10e35af
divide them to another module
Tokesh 47021bc
chore: deleted empty lines
Tokesh c1f37d2
feat: added all parameters to generate json file
Tokesh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ aoss | |
APIV | ||
cbor | ||
evals | ||
formdata | ||
lucene | ||
millis | ||
mxyz | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,132 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
import fs from 'fs' | ||
import { read_yaml, to_ndjson } from '../helpers' | ||
import { basename, resolve } from 'path' | ||
import _ from 'lodash' | ||
import { StoryEvaluations, StoryFile } from 'tester/types/eval.types' | ||
import { Logger } from 'Logger' | ||
import StoryParser from './StoryParser' | ||
import { PostmanManager } from './PostmanManager' | ||
import { APPLICATION_JSON } from './MimeTypes' | ||
import { Parameter } from 'tester/types/story.types' | ||
|
||
export default class ExportChapters { | ||
private readonly _story_files: Record<string, StoryFile[]> = {} | ||
private readonly _logger: Logger | ||
private readonly _postman_manager: PostmanManager | ||
|
||
constructor (logger: Logger, postman_manager: PostmanManager) { | ||
this._logger = logger | ||
this._postman_manager = postman_manager | ||
} | ||
|
||
async run (story_path: string): Promise<{ results: StoryEvaluations, failed: boolean }> { | ||
let failed = false | ||
const story_files = this.story_files(story_path) | ||
const results: StoryEvaluations = { evaluations: [] } | ||
|
||
for (const story_file of story_files) { | ||
for(const chapter of story_file.story.chapters) { | ||
const [headers, content_type] = this.#serialize_headers(chapter.request?.headers, chapter.request?.content_type) | ||
let params = {}, url_path = {}; | ||
if(chapter.parameters !== undefined) { | ||
[url_path, params] = this.#parse_url(chapter.path, chapter.parameters) | ||
} | ||
const request_data = chapter.request?.payload !== undefined ? this.#serialize_payload( | ||
chapter.request.payload, | ||
content_type | ||
) : {} | ||
this._postman_manager.add_to_collection('url', chapter.method, chapter.path, headers, params, request_data, content_type, story_file.full_path); | ||
} | ||
this._logger.info(`Evaluating ${story_file.display_path} ...`) | ||
} | ||
this._postman_manager.save_collection() | ||
|
||
return { results, failed } | ||
} | ||
|
||
story_files(story_path: string): StoryFile[] { | ||
if (this._story_files[story_path] !== undefined) return this._story_files[story_path] | ||
this._story_files[story_path] = this.#sort_story_files(this.#collect_story_files(resolve(story_path), '', '')) | ||
return this._story_files[story_path] | ||
} | ||
|
||
#collect_story_files (folder: string, file: string, prefix: string): StoryFile[] { | ||
const path = file === '' ? folder : `${folder}/${file}` | ||
const next_prefix = prefix === '' ? file : `${prefix}/${file}` | ||
if (file.startsWith('.') || file == 'docker-compose.yml' || file == 'Dockerfile' || file.endsWith('.py')) { | ||
return [] | ||
} else if (fs.statSync(path).isFile()) { | ||
const story = StoryParser.parse(read_yaml(path)) | ||
return [{ | ||
display_path: next_prefix === '' ? basename(path) : next_prefix, | ||
full_path: path, | ||
story | ||
}] | ||
} else { | ||
return _.compact(fs.readdirSync(path).flatMap(next_file => { | ||
return this.#collect_story_files(path, next_file, next_prefix) | ||
})) | ||
} | ||
} | ||
|
||
#sort_story_files (story_files: StoryFile[]): StoryFile[] { | ||
return story_files.sort(({ display_path: a }, { display_path: b }) => { | ||
const a_depth = a.split('/').length | ||
const b_depth = b.split('/').length | ||
if (a_depth !== b_depth) return a_depth - b_depth | ||
return a.localeCompare(b) | ||
}) | ||
} | ||
|
||
#serialize_headers(headers?: Record<string, any>, content_type?: string): [Record<string, any> | undefined, string] { | ||
headers = _.cloneDeep(headers) | ||
content_type = content_type ?? APPLICATION_JSON | ||
if (!headers) return [headers, content_type] | ||
_.forEach(headers, (v, k) => { | ||
if (k.toLowerCase() == 'content-type') { | ||
content_type = v.toString() | ||
if (headers) delete headers[k] | ||
} | ||
}) | ||
return [headers, content_type] | ||
} | ||
|
||
#serialize_payload(payload: any, content_type: string): any { | ||
if (payload === undefined) return undefined | ||
switch (content_type) { | ||
case 'application/x-ndjson': return to_ndjson(payload as any[]) | ||
default: return payload | ||
} | ||
} | ||
|
||
resolve_params (parameters: Record<string, Parameter>): Record<string, Parameter> { | ||
const resolved_params: Record<string, Parameter> = {} | ||
for (const [param_name, param_value] of Object.entries(parameters ?? {})) { | ||
if (typeof param_value === 'string') { | ||
resolved_params[param_name] = param_value | ||
} else { | ||
resolved_params[param_name] = param_value | ||
} | ||
} | ||
return resolved_params | ||
} | ||
|
||
#parse_url (path: string, parameters: Record<string, Parameter>): [string, Record<string, Parameter>] { | ||
const path_params = new Set<string>() | ||
const parsed_path = path.replace(/{(\w+)}/g, (_, key) => { | ||
path_params.add(key as string) | ||
return parameters[key] as string | ||
}) | ||
const query_params = Object.fromEntries(Object.entries(parameters).filter(([key]) => !path_params.has(key))) | ||
return [parsed_path, query_params] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
export const APPLICATION_CBOR = 'application/cbor' | ||
export const APPLICATION_JSON = 'application/json' | ||
export const APPLICATION_SMILE = 'application/smile' | ||
export const APPLICATION_YAML = 'application/yaml' | ||
export const TEXT_PLAIN = 'text/plain' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
import fs from 'fs'; | ||
|
||
export class PostmanManager { | ||
private readonly collection: any; | ||
private readonly collection_path: string; | ||
|
||
constructor(collection_path: string = './postman_collection.json') { | ||
this.collection_path = collection_path; | ||
this.collection = { | ||
info: { | ||
name: "OpenSearch tests", | ||
schema: "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", | ||
}, | ||
item: [], | ||
}; | ||
} | ||
|
||
add_to_collection( | ||
url: string | undefined, | ||
method: string, | ||
path: string, | ||
headers: Record<string, any> | undefined, | ||
params: Record<string, any>, | ||
body: any, | ||
content_type: string, | ||
full_path?: string | ||
): void { | ||
const folders: string[] = []; | ||
|
||
if (full_path) { | ||
const pathParts = full_path.split('/').filter(Boolean); | ||
|
||
const startIndex = pathParts.indexOf('tests'); | ||
|
||
if (startIndex !== -1) { | ||
folders.push(...pathParts.slice(startIndex + 1)); | ||
} | ||
} | ||
|
||
let currentFolder = this.collection.item; | ||
|
||
folders.forEach(folder => { | ||
let existingFolder = currentFolder.find((item: any) => item.name === folder); | ||
|
||
if (!existingFolder) { | ||
existingFolder = { name: folder, item: [] }; | ||
currentFolder.push(existingFolder); | ||
} | ||
|
||
currentFolder = existingFolder.item; | ||
}); | ||
|
||
const item = { | ||
name: path, | ||
request: { | ||
method, | ||
header: Object.entries(headers ?? {}).map(([key, value]) => ({ key, value })), | ||
url: { | ||
raw: `${url}${path}`, | ||
host: url, | ||
path: path.split('/').filter(Boolean), | ||
query: Object.entries(params).map(([key, value]) => ({ key, value: String(value) })), | ||
}, | ||
body: body ? { mode: content_type === 'application/json' ? 'raw' : 'formdata', raw: JSON.stringify(body) } : undefined, | ||
}, | ||
}; | ||
|
||
const exists = currentFolder.some((existingItem: any) => existingItem.name === item.name); | ||
if (!exists) { | ||
currentFolder.push(item); | ||
} | ||
} | ||
|
||
save_collection(): void { | ||
fs.writeFileSync(this.collection_path, JSON.stringify(this.collection, null, 2)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
import _ from "lodash"; | ||
import { ParsedChapter, ParsedStory } from "tester/types/parsed_story.types"; | ||
import { Chapter, Story } from "tester/types/story.types"; | ||
|
||
export default class StoryParser { | ||
static parse(story: Story): ParsedStory { | ||
return { | ||
...story, | ||
chapters: this.#expand_chapters(story.chapters), | ||
} | ||
} | ||
|
||
static #chapter_methods(methods: string[] | string): string[] { | ||
return [...(Array.isArray(methods) ? methods : [methods])] | ||
} | ||
|
||
static #expand_chapters(chapters?: Chapter[]): ParsedChapter[] { | ||
if (chapters === undefined) return [] | ||
return _.flatMap(_.map(chapters, (chapter) => { | ||
return _.map(this.#chapter_methods(chapter.method), (method) => { | ||
let synopsis = chapter.synopsis && Array.isArray(chapter.method) ? | ||
`${chapter.synopsis} [${method}]` : | ||
chapter.synopsis | ||
return { | ||
...chapter, | ||
synopsis, | ||
method | ||
} | ||
}) | ||
})) as ParsedChapter[] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* The OpenSearch Contributors require contributions made to | ||
* this file be licensed under the Apache-2.0 license or a | ||
* compatible open source license. | ||
*/ | ||
|
||
import { Logger, LogLevel } from '../Logger' | ||
import { Command, Option } from '@commander-js/extra-typings' | ||
import { | ||
AWS_ACCESS_KEY_ID_OPTION, | ||
AWS_REGION_OPTION, | ||
AWS_SECRET_ACCESS_KEY_OPTION, | ||
AWS_SERVICE_OPTION, | ||
AWS_SESSION_TOKEN_OPTION, | ||
get_opensearch_opts_from_cli, | ||
OPENSEARCH_CERT_OPTION, | ||
OPENSEARCH_INSECURE_OPTION, | ||
OPENSEARCH_KEY_OPTION, | ||
OPENSEARCH_PASSWORD_OPTION, | ||
OPENSEARCH_URL_OPTION, | ||
OPENSEARCH_USERNAME_OPTION, | ||
OpenSearchHttpClient | ||
} from '../OpenSearchHttpClient' | ||
import * as process from 'node:process' | ||
import ChapterReader from 'tester/ChapterReader' | ||
import SupplementalChapterEvaluator from 'tester/SupplementalChapterEvaluator' | ||
import StoryValidator from 'tester/StoryValidator' | ||
import StoryEvaluator from 'tester/StoryEvaluator' | ||
import { ConsoleResultLogger } from 'tester/ResultLogger' | ||
import TestRunner from 'tester/TestRunner' | ||
import ExportChapters from './ExportChapters' | ||
import { PostmanManager } from './PostmanManager' | ||
|
||
const command = new Command() | ||
.description('Run test stories against the OpenSearch spec.') | ||
.addOption(new Option('--tests, --tests-path <path>', 'path to the root folder of the tests').default('./tests/default')) | ||
.allowExcessArguments(false) | ||
.parse() | ||
|
||
|
||
const opts = command.opts() | ||
const logger = new Logger(LogLevel.warn) | ||
const postman_manager = new PostmanManager() | ||
const runner = new ExportChapters(logger, postman_manager) | ||
|
||
runner.run(opts.testsPath) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think lodash
isEmpty
can this this cleaner, maybe just_.isEmpty(this._opts?.url) ? DEFAULT_URL : this._opts?.url
.