Custom upload fixes (#2852)

Author: niclim

package.json

@@ -2,7 +2,7 @@
   "name": "openapi-workspaces",
   "license": "MIT",
   "private": true,
-  "version": "0.55.0",
+  "version": "0.55.1",
   "workspaces": [
     "projects/json-pointer-helpers",
     "projects/openapi-io",

projects/fastify-capture/package.json

@@ -2,7 +2,7 @@
   "name": "@useoptic/fastify-capture",
   "license": "MIT",
   "packageManager": "yarn@4.1.1",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

projects/json-pointer-helpers/package.json

@@ -2,7 +2,7 @@
   "name": "@useoptic/json-pointer-helpers",
   "license": "MIT",
   "packageManager": "yarn@4.1.1",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

projects/openapi-io/package.json

@@ -2,7 +2,7 @@
   "name": "@useoptic/openapi-io",
   "license": "MIT",
   "packageManager": "yarn@4.1.1",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

projects/openapi-utilities/package.json

@@ -2,7 +2,7 @@
   "name": "@useoptic/openapi-utilities",
   "license": "MIT",
   "packageManager": "yarn@4.1.1",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

projects/optic/package.json

@@ -2,7 +2,7 @@
   "name": "@useoptic/optic",
   "license": "MIT",
   "packageManager": "yarn@4.1.1",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

projects/optic/src/commands/diff/diff-all.ts

@@ -653,7 +653,11 @@ const getDiffAllAction =
       );
       process.exitCode = 1;
       return;
-    } else if (options.upload && !config.isAuthenticated) {
+    } else if (
+      options.upload &&
+      !config.isAuthenticated &&
+      !customOptions.customUpload
+    ) {
       logger.error(
         chalk.bold.red(
           'Error: Must be logged in to upload results. Run optic login to authenticate.'

projects/optic/src/commands/diff/diff.ts

@@ -309,7 +309,11 @@ const getDiffAction =
       // For json output we only want to render json
       logger.setLevel('silent');
     }
-    if (options.upload && !config.isAuthenticated) {
+    if (
+      options.upload &&
+      !config.isAuthenticated &&
+      !customOptions.customUpload
+    ) {
       logger.error(
         chalk.bold.red(
           'Error: Must be logged in to upload results. Run optic login to authenticate.'

projects/optic/src/utils/spec-loaders.ts

@@ -53,18 +53,21 @@ export type ParseResult =
   | (ParseOpenAPIResult<FlatOpenAPIV2.Document> & {
       isEmptySpec: boolean;
       from: 'git' | 'file' | 'url' | 'empty' | 'cloud';
+      fileContext: SpecFromInput;
       version: '2.x.x';
       context: ParseResultContext;
     })
   | (ParseOpenAPIResult<FlatOpenAPIV3.Document> & {
       isEmptySpec: boolean;
       from: 'git' | 'file' | 'url' | 'empty' | 'cloud';
+      fileContext: SpecFromInput;
       version: '3.0.x';
       context: ParseResultContext;
     })
   | (ParseOpenAPIResult<FlatOpenAPIV3_1.Document> & {
       isEmptySpec: boolean;
       from: 'git' | 'file' | 'url' | 'empty' | 'cloud';
+      fileContext: SpecFromInput;
       version: '3.1.x';
       context: ParseResultContext;
     });
@@ -209,6 +212,7 @@ async function parseSpecAndDereference(
       const sourcemap = createNullSpecSourcemap(spec);
       return {
         jsonLike: spec,
+        fileContext: input,
         sourcemap,
         from: 'empty',
         version: '3.0.x',
@@ -225,6 +229,7 @@ async function parseSpecAndDereference(
       );
       return {
         jsonLike,
+        fileContext: input,
         sourcemap,
         version: checkOpenAPIVersion(jsonLike),
         from: 'cloud',
@@ -255,6 +260,7 @@ async function parseSpecAndDereference(
         ...parseResult,
         version: checkOpenAPIVersion(parseResult.jsonLike),
         from: 'git',
+        fileContext: input,
         isEmptySpec: false,
         context: {
           vcs: 'git',
@@ -273,7 +279,7 @@ async function parseSpecAndDereference(
       return {
         ...parseResult,
         version: checkOpenAPIVersion(parseResult.jsonLike),
-
+        fileContext: input,
         from: 'url',
         isEmptySpec: false,
         context: null,
@@ -303,6 +309,7 @@ async function parseSpecAndDereference(
 
       return {
         ...parseResult,
+        fileContext: input,
         version: checkOpenAPIVersion(parseResult.jsonLike),
         from: 'file',
         isEmptySpec: false,

projects/rulesets-base/package.json

@@ -2,7 +2,7 @@
   "name": "@useoptic/rulesets-base",
   "license": "MIT",
   "packageManager": "yarn@4.1.1",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [