@grafana/openapi-to-k6 0.3.1 → 0.4.1

package/.github/workflows/publish.yaml

@@ -9,12 +9,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
-      contents: write
+      contents: read
+      packages: write
+      id-token: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: grafana/shared-workflows/actions/get-vault-secrets@a37de51f3d713a30a9e4b21bcdfbd38170020593 # get-vault-secrets/v1.3.0
+        with:
+          # Secrets placed in the ci/repo/grafana/<repo>/<path> path in Vault
+          # Also stored in 1Password as "k6 Cloud CI/CD Secrets" (Vault is write-only)
+          repo_secrets: |
+            NPM_TOKEN=npm:token
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: '21'
           registry-url: 'https://registry.npmjs.org'
@@ -22,20 +30,38 @@ jobs:
           cache: 'npm'
           cache-dependency-path: 'package-lock.json'
       - run: npm ci
-      - name: Update version in package.json
+      - name: Validate version matches release tag
+        env:
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
         run: |
-          NEW_VERSION=${{ github.event.release.tag_name }}
-          npm version $NEW_VERSION --no-git-tag-version
+          # Remove 'v' prefix from tag if present (e.g., v1.2.3 -> 1.2.3)
+          EXPECTED_VERSION="${RELEASE_TAG#v}"
+
+          # Get version from package.json
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+
+          echo "Release tag: $RELEASE_TAG"
+          echo "Expected version: $EXPECTED_VERSION"
+          echo "Package.json version: $PACKAGE_VERSION"
+
+          if [ "$PACKAGE_VERSION" != "$EXPECTED_VERSION" ]; then
+            echo "Error: package.json version ($PACKAGE_VERSION) does not match release tag ($RELEASE_TAG)"
+            exit 1
+          fi
+
+          echo "✓ Version validation passed"
+
       - name: Update generated examples
         run: npm run update-examples
-      - name: Commit updated package.json
+      - name: Verify examples are up to date
         run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add package.json package-lock.json examples/
-          git commit -m "Update package.json version to ${{ github.event.release.tag_name }}"
-          git push origin HEAD:main
+          if [ "$(git diff --ignore-space-at-eol --text examples/ | wc -l)" -gt "0" ]; then
+            echo "Error: Generated examples are out of date. Please run 'npm run update-examples' and commit the changes before creating a release."
+            git diff --ignore-space-at-eol --text examples/
+            exit 1
+          fi
+          echo "✓ Examples are up to date"
       - run: npm run build
       - run: npm publish --access public
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ env.NPM_TOKEN }}

package/.github/workflows/tests.yaml

@@ -3,14 +3,19 @@ name: Run Tests
 on:
   push:
     branches:
-      - "**"
+      - main
+  pull_request:
 
 jobs:
   test:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: '21'
           cache: 'npm'
@@ -20,9 +25,13 @@ jobs:
       - run: npm test
   e2e-test:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: '21'
           cache: 'npm'
@@ -35,22 +44,26 @@ jobs:
           npm run dev -- ./tests/e2e/schema.json ./tests/e2e/tags/sdk.ts --disable-analytics --mode tags
           npm run dev -- ./tests/e2e/schema.json ./tests/e2e/single-tag-filter/sdk.ts --disable-analytics --mode single --only-tags ItemsHeader
       - name: Start Mockoon CLI
-        uses: mockoon/cli-action@v2
+        uses: mockoon/cli-action@971589e873f22f7c9604e4236d6dfae3164efa6c # v2 - https://github.com/mockoon/cli-action/commit/971589e873f22f7c9604e4236d6dfae3164efa6c
         with:
           # Mockoon local data file or URL
           data-file: './tests/e2e/schema.json'
           port: 3000
-      - uses: grafana/setup-k6-action@v1
-      - uses: grafana/run-k6-action@v1
+      - uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2 # v1
+      - uses: grafana/run-k6-action@a15e2072ede004e8d46141e33d7f7dad8ad08d9d # v1
         with:
           path: './tests/e2e/*/k6Script.ts'
           flags: '--compatibility-mode=experimental_enhanced'
           inspect-flags: '--compatibility-mode=experimental_enhanced'
   run-examples:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        with:
+          persist-credentials: false
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
         with:
           node-version: '21'
           cache: 'npm'

package/.nvmrc

@@ -1 +1 @@
-v20
+24

package/CODEOWNERS

@@ -0,0 +1,2 @@
+* @grafana/k6-cloud-provisioning
+

package/README.md

@@ -5,83 +5,80 @@
     width="600"
     style="pointer-events: none;" />
   <br />
-  <hr/>
-  <p align="center">⚠️</p>
-<b>This tool is currently in the experimental stage. Expect bugs, incomplete features, and breaking changes as development progresses. Use at your own risk, and please report any issues or feedback to help us improve.</b>
-<hr/>
 </div>
 
 ## Overview
 
-The _openapi-to-k6_ repository is a tool designed to ease the process of writing k6 scripts.
-It generates a TypeScript client from OpenAPI specification which can be imported in your k6 script to
-easily call your endpoints and have auto completion in your IDE.
+The _openapi-to-k6_ repository is a tool designed to simplify the process of writing k6 scripts.
+It generates a TypeScript client from an OpenAPI specification that you can import in your k6 script to
+easily call your endpoints and have auto-completion in your IDE.
 
-This allows developers to easily create performance tests for their APIs based on their existing
+This lets developers easily create performance tests for their APIs based on their existing
 OpenAPI documentation.
 
 Along with the client, it also generates a sample k6 script as an example of how to use the client.
 
 The generated client exports a class with methods for each endpoint in the OpenAPI specification. You can create
-a instance of the class and use the methods to call the endpoints.
-
-To take a look at a few examples of how the generated client looks and sample script looks, check out the [examples](./examples) directory.
+an instance of the class and use the methods to call the endpoints.
 
+To see examples of the generated client and sample script, check out the [examples](./examples) directory.
 
 ## Getting started
 
-1. Install the tool globally via
+1. Install the tool globally via:
 
     ```shell
     npm install -g @grafana/openapi-to-k6
     ```
 
-2. To start using the tool either give path to your OpenAPI schema file or provide a URL to your Open
-   API schema and the output path where you want to generate the client files.
+2. To start using the tool, either give the path to your OpenAPI schema file or provide a URL to your OpenAPI schema and the output path where you want to generate the client files:
 
     ```shell
     openapi-to-k6 <path-to-openapi-schema | url-to-openapi-schema> <output path>
     ```
 
-    This will the generate a TypeScript client and a sample k6 script in the corresponding directory.
+    This will generate a TypeScript client and a sample k6 script in the corresponding directory.
 
     You can also supply the optional flag `--include-sample-script` to also generate a sample k6 script
     along with the client.
 
-💡 _Note_: The tool supports both JSON and YAML format for OpenAPI schema.
+💡 _Note_: The tool supports both JSON and YAML format for OpenAPI schemas.
 
 ### Options
 
-Following are some of the configuration options supported by the tool.
+The following are some of the configuration options supported by the tool:
 
-1. `--mode` or `-m`: Specify the mode to use for generating the client. Following are available options:
-   1. `single`: This is the default mode used is nothing is specified. It generated the TypeScript client as a single file with all the types and implementation in a single file.
+1. `--mode` or `-m`: Specify the mode to use for generating the client. The following options are available:
+   1. `single`: This is the default mode used if nothing is specified. It generates the TypeScript client as a single file with all the types and implementation in a single file.
    2. `split`: This mode splits the types and implementation into separate files.
-   3. `tags`: This modes splits your OpenAPI schema based on the tags and generates a separate client for each tag. If a route has no tag set, it will be available in `default.ts` file.
+   3. `tags`: This modes splits your OpenAPI schema based on the tags and generates a separate client for each tag. If a route has no tag set, it will be available in the `default.ts` file.
 
    To check how the output looks for each mode, check out the [examples](./examples) directory.
+
 2. `--only-tags`: Filter the generated client to only include routes with specific tags from your OpenAPI schema. Multiple tags can be specified to include routes matching any of those tags. Routes without tags will be excluded. This is useful for generating focused clients that only contain the endpoints you need.
-e.g. `openapi-to-k6 <path-to-openapi-schema> <output path> --only-tags ItemsHeader` will generate a client with only the routes that have the `ItemsHeader` tag. Multiple tags can be specified by using multiple `--only-tags` flags or by separating them with spaces.
-3. `--disable-analytics`: Disable anonymous usage analytics reporting which helping making the tool better. You can also set an environment variable `DISABLE_ANALYTICS=true` to disable the analytics.
+
+   For example: `openapi-to-k6 <path-to-openapi-schema> <output path> --only-tags ItemsHeader` will generate a client with only the routes that have the `ItemsHeader` tag. You can specify multiple tags by using multiple `--only-tags` flags or by separating them with spaces: `--only-tags tag1 --only-tags tag2`.
+
+3. `--disable-analytics`: Disable anonymous usage analytics reporting. You can also set an environment variable `DISABLE_ANALYTICS=true` to disable analytics.
 4. `--include-sample-script`: Generate a sample k6 script. The generated sample script uses the examples defined in the OpenAPI schema requests to make the script usable out of the box. If the examples are not defined, it will use Faker to generate random data.
 5. `--verbose` or `-v` : Enable verbose logging to see more detailed logging output.
 6. `--help` or `-h` : Show help message.
 
 ## Developing locally
 
-1. Clone the repository
+1. Clone the repository:
 
 ```shell
 git clone https://github.com/grafana/openapi-to-k6
 ```
 
-2. Install dependencies
+2. Install dependencies:
 
 ```shell
 npm install
 ```
 
-3. Run the sdk generator from source
+3. Run the SDK generator from source:
 
 ```shell
 npm run dev <path-to-openapi-schema> <output path>
@@ -89,51 +86,49 @@ npm run dev <path-to-openapi-schema> <output path>
 
 This will generate the SDK files in the corresponding directory.
 
-4. Import them in you k6 script and run the script using the following command
+4. Import them in your k6 script and run the script using the following command:
 
 ```shell
-k6 run --compatibility-mode=experimental_enhanced <path-to-k6-script>.ts
+k6 run <path-to-k6-script>.ts
 ```
 
-Note: `--compatibility-mode` is needed to use a typescript file as K6 script. To know more about it, click [here](https://grafana.com/docs/k6/latest/using-k6/javascript-typescript-compatibility-mode/).
-
 ## Running E2E tests
 
-We have some end-to-end tests to ensure the generated SDK works as expected. To run these tests, you can use the following command:
+We have some end-to-end tests to ensure the generated SDK works as expected. To run these tests:
 
-1. Navigate to the test directory
+1. Navigate to the test directory:
 
 ```shell
 cd tests/e2e/
 ```
 
 2. Use Mockoon CLI to start the mock server which will create a mock server for the endpoints defined in the OpenAPI specification.
-This will run the mock server in a docker container in background.
+This will run the mock server in a Docker container in background:
 
 ```shell
 docker run -v ./schema.json:/tmp/schema.json -p 3000:3000 mockoon/cli:latest -d /tmp/schema.json
 ```
 
-3. Assuming you have already followed previous steps and have the environment set up, you can generate the SDK by using
+3. Assuming you have already followed previous steps and have the environment set up, you can generate the SDK by using:
 
 ```shell
 npm run dev -- ./schema.json ./sdk.ts
 ```
 
-4. Run the K6 script
+4. Run the k6 script:
 
 ```shell
-k6 run --compatibility-mode=experimental_enhanced ./K6Script.ts
+k6 run ./K6Script.ts
 ```
 
 ## Packaging
 
-1. Run the command `npm run build` to package the project together for distribution.
+1. Run the command `npm run build` to package the project for distribution.
 2. Install the compiled package locally by using `npm install .` or `npm install -g .`.
-3. Use the CLI `k6-sdkgen <path-to-openapi-schema> <output path>`
+3. Use the CLI: `k6-sdkgen <path-to-openapi-schema> <output path>`.
 
 ## Releasing
 
-To release a new version of the tool, create a new release on GitHub with the new version number as tag (e.g. `0.1.0` ) and the release notes. After the release is created, the GitHub actions will automatically package the tool and publish it to npm.
+To release a new version of the tool, create a new release on GitHub with the new version number as a tag (for example, `0.1.0`) and the release notes. After the release is created, GitHub Actions will automatically package the tool and publish it to npm.
 
-Special mention for the the open-source library [Orval](https://orval.dev/) which is used for the generation of the TypeScript client.
+Special mention to the the open-source library [Orval](https://orval.dev/) which is used for the generation of the TypeScript client.

package/catalog-info.yaml

@@ -0,0 +1,13 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: openapi-to-k6
+  title: openapi-to-k6
+  description: |
+    A CLI tool to convert an OpenAPI schema to a TypeScript client to use with k6.
+  annotations:
+    github.com/project-slug: grafana/openapi-to-k6
+spec:
+  type: tool
+  owner: group:default/k6-cloud-provisioning
+  lifecycle: production

package/dist/generator/k6Client.js

@@ -29,8 +29,10 @@ function _generateResponseTypeDefinition(response) {
     return `{
     response: Response
     data: ${responseDataType}
+    operationId: string
 }`;
 }
+const INTERNAL_URL_TOKEN = 'k6url';
 function _getRequestParametersMergerFunctionImplementation() {
     return `/**
  * Merges the provided request parameters with default parameters for the client.
@@ -108,7 +110,7 @@ const _getK6RequestOptions = (verbOptions) => {
     // Sample output
     // 'GET', 'http://test.com/route', <body>, <options>
     return `"${verb.toUpperCase()}",
-        url.toString(),
+        ${INTERNAL_URL_TOKEN}.toString(),
         ${fetchBodyOption},
         ${requestParametersValue}`;
 };
@@ -157,7 +159,7 @@ const getK6Dependencies = () => [
     },
 ];
 const generateK6Implementation = (verbOptions, { route }, analyticsData) => {
-    const { queryParams, operationName, response, body, props, verb, formData, formUrlEncoded, } = verbOptions;
+    const { queryParams, operationName, operationId, response, body, props, verb, formData, formUrlEncoded, } = verbOptions;
     if (analyticsData) {
         analyticsData.generatedRequestsCount[verb] += 1;
     }
@@ -172,7 +174,7 @@ const generateK6Implementation = (verbOptions, { route }, analyticsData) => {
     if (queryParams) {
         url += '+`?${new URLSearchParams(params).toString()}`';
     }
-    const urlGeneration = `const url = new URL(${url});`;
+    const urlGeneration = `const ${INTERNAL_URL_TOKEN} = new URL(${url});`;
     const options = _getK6RequestOptions(verbOptions);
     return `${operationName}(\n    ${(0, core_1.toObjectString)(props, 'implementation')} requestParameters?: Params): ${_generateResponseTypeDefinition(response)} {\n${bodyForm}
         ${urlGeneration}
@@ -187,7 +189,8 @@ const generateK6Implementation = (verbOptions, { route }, analyticsData) => {
         }
       return {
         response,
-        data
+        data,
+        operationId: '${(0, core_1.jsStringEscape)(operationId)}'
       }
     }
   `;

package/examples/basic_schema/single/simpleAPI.ts

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Simple API
  * Service version: 1.0.0
@@ -34,15 +34,16 @@ export class SimpleAPIClient {
   getExample(requestParameters?: Params): {
     response: Response
     data: GetExample200
+    operationId: string
   } {
-    const url = new URL(this.cleanBaseUrl + `/example`)
+    const k6url = new URL(this.cleanBaseUrl + `/example`)
     const mergedRequestParameters = this._mergeRequestParameters(
       requestParameters || {},
       this.commonRequestParameters
     )
     const response = http.request(
       'GET',
-      url.toString(),
+      k6url.toString(),
       undefined,
       mergedRequestParameters
     )
@@ -56,6 +57,7 @@ export class SimpleAPIClient {
     return {
       response,
       data,
+      operationId: 'GetExample',
     }
   }
 

package/examples/basic_schema/split/simpleAPI.schemas.ts

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Simple API
  * Service version: 1.0.0

package/examples/basic_schema/split/simpleAPI.ts

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Simple API
  * Service version: 1.0.0
@@ -31,15 +31,16 @@ export class SimpleAPIClient {
   getExample(requestParameters?: Params): {
     response: Response
     data: GetExample200
+    operationId: string
   } {
-    const url = new URL(this.cleanBaseUrl + `/example`)
+    const k6url = new URL(this.cleanBaseUrl + `/example`)
     const mergedRequestParameters = this._mergeRequestParameters(
       requestParameters || {},
       this.commonRequestParameters
     )
     const response = http.request(
       'GET',
-      url.toString(),
+      k6url.toString(),
       undefined,
       mergedRequestParameters
     )
@@ -53,6 +54,7 @@ export class SimpleAPIClient {
     return {
       response,
       data,
+      operationId: 'GetExample',
     }
   }
 

package/examples/basic_schema/tags/default.ts

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Simple API
  * Service version: 1.0.0
@@ -31,15 +31,16 @@ export class DefaultClient {
   getExample(requestParameters?: Params): {
     response: Response
     data: GetExample200
+    operationId: string
   } {
-    const url = new URL(this.cleanBaseUrl + `/example`)
+    const k6url = new URL(this.cleanBaseUrl + `/example`)
     const mergedRequestParameters = this._mergeRequestParameters(
       requestParameters || {},
       this.commonRequestParameters
     )
     const response = http.request(
       'GET',
-      url.toString(),
+      k6url.toString(),
       undefined,
       mergedRequestParameters
     )
@@ -53,6 +54,7 @@ export class DefaultClient {
     return {
       response,
       data,
+      operationId: 'GetExample',
     }
   }
 

package/examples/basic_schema/tags/simpleAPI.schemas.ts

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Simple API
  * Service version: 1.0.0

package/examples/form_data_schema/single/formDataAPI.ts

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Form Data API
  * Service version: 1.0.0
@@ -8,16 +8,6 @@ import { FormData } from 'https://jslib.k6.io/formdata/0.0.2/index.js'
 import { URL } from 'https://jslib.k6.io/url/1.0.0/index.js'
 import http from 'k6/http'
 import type { Params, Response } from 'k6/http'
-export type PostUpload400 = {
-  success?: boolean
-  error?: string
-}
-
-export type PostUpload200 = {
-  success?: boolean
-  message?: string
-}
-
 export type PostUploadBody = {
   /** File to upload */
   file: Blob
@@ -27,6 +17,16 @@ export type PostUploadBody = {
   userId: string
 }
 
+export type PostUpload200 = {
+  success?: boolean
+  message?: string
+}
+
+export type PostUpload400 = {
+  success?: boolean
+  error?: string
+}
+
 /**
  * This is the base client to use for interacting with the API.
  */
@@ -53,6 +53,7 @@ export class FormDataAPIClient {
   ): {
     response: Response
     data: PostUpload200
+    operationId: string
   } {
     const formData = new FormData()
     formData.append('file', postUploadBody.file)
@@ -61,12 +62,12 @@ export class FormDataAPIClient {
     }
     formData.append('userId', postUploadBody.userId)
 
-    const url = new URL(this.cleanBaseUrl + `/upload`)
+    const k6url = new URL(this.cleanBaseUrl + `/upload`)
     const mergedRequestParameters = this._mergeRequestParameters(
       requestParameters || {},
       this.commonRequestParameters
     )
-    const response = http.request('POST', url.toString(), formData.body(), {
+    const response = http.request('POST', k6url.toString(), formData.body(), {
       ...mergedRequestParameters,
       headers: {
         ...mergedRequestParameters?.headers,
@@ -83,6 +84,7 @@ export class FormDataAPIClient {
     return {
       response,
       data,
+      operationId: 'PostUpload',
     }
   }
 

package/examples/form_data_schema/split/formDataAPI.schemas.ts

@@ -1,19 +1,9 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Form Data API
  * Service version: 1.0.0
  */
-export type PostUpload400 = {
-  success?: boolean
-  error?: string
-}
-
-export type PostUpload200 = {
-  success?: boolean
-  message?: string
-}
-
 export type PostUploadBody = {
   /** File to upload */
   file: Blob
@@ -22,3 +12,13 @@ export type PostUploadBody = {
   /** User ID associated with the upload */
   userId: string
 }
+
+export type PostUpload200 = {
+  success?: boolean
+  message?: string
+}
+
+export type PostUpload400 = {
+  success?: boolean
+  error?: string
+}

package/examples/form_data_schema/split/formDataAPI.ts

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.3.1
+ * Automatically generated by @grafana/openapi-to-k6: 0.4.1
  * Do not edit manually.
  * Form Data API
  * Service version: 1.0.0
@@ -36,6 +36,7 @@ export class FormDataAPIClient {
   ): {
     response: Response
     data: PostUpload200
+    operationId: string
   } {
     const formData = new FormData()
     formData.append('file', postUploadBody.file)
@@ -44,12 +45,12 @@ export class FormDataAPIClient {
     }
     formData.append('userId', postUploadBody.userId)
 
-    const url = new URL(this.cleanBaseUrl + `/upload`)
+    const k6url = new URL(this.cleanBaseUrl + `/upload`)
     const mergedRequestParameters = this._mergeRequestParameters(
       requestParameters || {},
       this.commonRequestParameters
     )
-    const response = http.request('POST', url.toString(), formData.body(), {
+    const response = http.request('POST', k6url.toString(), formData.body(), {
       ...mergedRequestParameters,
       headers: {
         ...mergedRequestParameters?.headers,
@@ -66,6 +67,7 @@ export class FormDataAPIClient {
     return {
       response,
       data,
+      operationId: 'PostUpload',
     }
   }