chore: clean and rebuild yarn.lock file, update associated code (#473)

aws-amplify · May 31, 2022 · 9e7a187 · 9e7a187
1 parent a6020df
commit 9e7a187
Show file tree

Hide file tree

Showing 5 changed files with 2,710 additions and 2,935 deletions.
diff --git a/packages/amplify-graphql-transformer-core/src/errors/index.ts b/packages/amplify-graphql-transformer-core/src/errors/index.ts
@@ -76,17 +76,17 @@ export class TransformerContractError extends Error {
  */
 export class InvalidMigrationError extends Error {
   fix: string;
-  cause: string;
-  constructor(message: string, cause: string, fix: string) {
+  causedBy: string;
+  constructor(message: string, causedBy: string, fix: string) {
     super(message);
     Object.setPrototypeOf(this, InvalidMigrationError.prototype);
     this.name = 'InvalidMigrationError';
     this.fix = fix;
-    this.cause = cause;
+    this.causedBy = causedBy;
   }
 }
 InvalidMigrationError.prototype.toString = function () {
-  return `${this.message}\nCause: ${this.cause}\nHow to fix: ${this.fix}`;
+  return `${this.message}\nCause: ${this.causedBy}\nHow to fix: ${this.fix}`;
 };
 
 export class InvalidDirectiveError extends Error {

diff --git a/packages/amplify-util-mock/src/__tests__/api/lambda-arn-to-config.test.ts b/packages/amplify-util-mock/src/__tests__/api/lambda-arn-to-config.test.ts
@@ -7,7 +7,9 @@ jest.mock('amplify-cli-core', () => ({
   pathManager: {
     getAmplifyPackageLibDirPath: jest.fn().mockReturnValue('test/path'),
   },
-  getTransformerVersion: jest.fn().mockReturnValue(2),
+  ApiCategoryFacade: {
+    getTransformerVersion: jest.fn().mockReturnValue(2),
+  },
   getGraphQLTransformerFunctionDocLink: jest.fn().mockReturnValue('mockdocs'),
   stateManager: {
     getMeta: jest.fn().mockReturnValue({

diff --git a/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts b/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts
@@ -1,5 +1,5 @@
 import { keys } from 'lodash';
-import { $TSAny, $TSContext, stateManager, getTransformerVersion, getGraphQLTransformerFunctionDocLink } from 'amplify-cli-core';
+import { $TSAny, $TSContext, stateManager, getGraphQLTransformerFunctionDocLink, ApiCategoryFacade } from 'amplify-cli-core';
 import _ = require('lodash');
 import { ServiceName } from 'amplify-category-function';
 import { loadLambdaConfig } from '../utils/lambda/load-lambda-config';
@@ -9,7 +9,7 @@ import { ProcessedLambdaFunction } from '../CFNParser/stack/types';
  * Attempts to match an arn object against the array of lambdas configured in the project
  */
 export const lambdaArnToConfig = async (context: $TSContext, arn: $TSAny): Promise<ProcessedLambdaFunction> => {
-  const version = await getTransformerVersion(context);
+  const version = await ApiCategoryFacade.getTransformerVersion(context);
   const doclink = getGraphQLTransformerFunctionDocLink(version);
   const errorSuffix = `\nSee ${doclink} for information on how to configure Lambda resolvers.`;
   let searchString = '';

diff --git a/packages/graphql-transformer-core/src/errors.ts b/packages/graphql-transformer-core/src/errors.ts
@@ -95,19 +95,19 @@ export class DestructiveMigrationError extends Error {
  * Thrown by the sanity checker when a user is trying to make a migration that is known to not work.
  */
 export class InvalidMigrationError extends Error {
-  constructor(message: string, public cause: string, public fix: string) {
+  constructor(message: string, public causedBy: string, public fix: string) {
     super(message);
     Object.setPrototypeOf(this, new.target.prototype);
     this.name = 'InvalidMigrationError';
   }
-  toString = () => `${this.message}\nCause: ${this.cause}\nHow to fix: ${this.fix}`;
+  toString = () => `${this.message}\nCause: ${this.causedBy}\nHow to fix: ${this.fix}`;
 }
 
 export class InvalidGSIMigrationError extends InvalidMigrationError {
   fix: string;
-  cause: string;
-  constructor(message: string, cause: string, fix: string) {
-    super(message, cause, fix);
+  causedBy: string;
+  constructor(message: string, causedBy: string, fix: string) {
+    super(message, causedBy, fix);
     this.name = 'InvalidGSIMigrationError';
   }
 }