revert: aws-amplify#12351 (aws-amplify#12412)

sdstolworthy · aws-eddy · commit 09d9a3bc6c80 · 2023-04-07T18:43:16.000-04:00
diff --git a/packages/amplify-category-function/src/__tests__/provider-utils/awscloudformation/utils/lambda-layer-cloud-formation-template.test.ts b/packages/amplify-category-function/src/__tests__/provider-utils/awscloudformation/utils/lambda-layer-cloud-formation-template.test.ts
@@ -1,4 +1,4 @@
-import { AmplifyError, pathManager, stateManager } from '@aws-amplify/amplify-cli-core';
+import { pathManager, stateManager } from '@aws-amplify/amplify-cli-core';
 import { ServiceName } from '../../../../provider-utils/awscloudformation/utils/constants';
 import { generateLayerCfnObj } from '../../../../provider-utils/awscloudformation/utils/lambda-layer-cloudformation-template';
 import { isMultiEnvLayer } from '../../../../provider-utils/awscloudformation/utils/layerHelpers';
@@ -106,17 +106,6 @@ describe('test layer CFN generation functions', () => {
     expect(Object.keys(layerCfn.Resources).length).toBe(2); // 1 LayerVersion, 1 LayerVersionPermission
   });
 
-  it('should throw an error when the logical name is not found', () => {
-    try {
-      generateLayerCfnObj(false, parameters_stub, []);
-    } catch {
-      expect(AmplifyError).toHaveBeenCalledWith('LambdaLayerNotFoundError', {
-        message: 'No versions were found for the Lambda Layer. Were they deleted on the AWS Lambda Console?',
-      });
-    }
-    expect.assertions(1);
-  });
-
   it('should generate the expected CFN for an existing LL resource and new version', () => {
     const layerCfn = generateLayerCfnObj(true, parameters_stub, [fakeLayerCfnMeta]);
     validateParameters(layerCfn);
diff --git a/packages/amplify-category-function/src/__tests__/utils/layerCloudState.test.ts b/packages/amplify-category-function/src/__tests__/utils/layerCloudState.test.ts
diff --git a/packages/amplify-category-function/src/provider-utils/awscloudformation/utils/lambda-layer-cloudformation-template.ts b/packages/amplify-category-function/src/provider-utils/awscloudformation/utils/lambda-layer-cloudformation-template.ts
@@ -1,4 +1,4 @@
-import { AmplifyError, stateManager } from '@aws-amplify/amplify-cli-core';
+import { stateManager } from '@aws-amplify/amplify-cli-core';
 import { DeletionPolicy, Fn, IntrinsicFunction, Refs } from 'cloudform-types';
 import Lambda from 'cloudform-types/types/lambda';
 import _ from 'lodash';
@@ -30,12 +30,7 @@ export function generateLayerCfnObj(isNewVersion: boolean, parameters: LayerPara
     layerCloudState.latestVersionLogicalId = logicalName;
     versionList.unshift({ LogicalName: logicalName, legacyLayer: false });
   } else {
-    logicalName = _.first(versionList)?.LogicalName;
-    if (!logicalName) {
-      throw new AmplifyError('LambdaLayerNotFoundError', {
-        message: 'No versions were found for the Lambda Layer. Were they deleted on the AWS Lambda Console?',
-      });
-    }
+    logicalName = _.first(versionList).LogicalName;
   }
 
   const outputObj = {
diff --git a/packages/amplify-category-function/src/provider-utils/awscloudformation/utils/layerCloudState.ts b/packages/amplify-category-function/src/provider-utils/awscloudformation/utils/layerCloudState.ts
@@ -1,4 +1,4 @@
-import { AmplifyError, $TSContext, exitOnNextTick, spinner } from '@aws-amplify/amplify-cli-core';
+import { $TSContext, exitOnNextTick, spinner } from '@aws-amplify/amplify-cli-core';
 import { LayerCfnLogicalNamePrefix } from './constants';
 // eslint-disable-next-line import/no-cycle
 import { isMultiEnvLayer } from './layerHelpers';
@@ -41,12 +41,6 @@ export class LayerCloudState {
         spinner.stop();
         return [];
       }
-      if (layerVersionList.length === 0) {
-        const missingLayers = layerStacks.map(({ LogicalResourceId }) => `    * ${LogicalResourceId}\n`);
-        throw new AmplifyError('LambdaLayerNotFoundError', {
-          message: `No versions were found for the Lambda Layer. Were they deleted on the AWS Lambda Console?\n\nThe following layers were not found:\n${missingLayers}`,
-        });
-      }
 
       layerVersionList.forEach((layerVersion: LayerVersionMetadata) => {
         let layerLogicalIdSuffix: string;
diff --git a/packages/amplify-cli-core/API.md b/packages/amplify-cli-core/API.md
@@ -120,7 +120,7 @@ export class AmplifyError extends AmplifyException {
 }
 
 // @public (undocumented)
-export type AmplifyErrorType = 'AmplifyStudioError' | 'AmplifyStudioLoginError' | 'AmplifyStudioNotEnabledError' | 'ApiCategorySchemaNotFoundError' | 'AuthImportError' | 'BackendConfigValidationError' | 'BucketAlreadyExistsError' | 'BucketNotFoundError' | 'CategoryNotEnabledError' | 'CloudFormationTemplateError' | 'CommandNotSupportedError' | 'ConfigurationError' | 'CustomPoliciesFormatError' | 'DebugConfigValueNotSetError' | 'DeploymentError' | 'DeploymentInProgressError' | 'DestructiveMigrationError' | 'DiagnoseReportUploadError' | 'DirectoryAlreadyExistsError' | 'DirectoryError' | 'DuplicateLogicalIdError' | 'EnvironmentConfigurationError' | 'EnvironmentNameError' | 'EnvironmentNotInitializedError' | 'ExportError' | 'FeatureFlagsValidationError' | 'FileSystemPermissionsError' | 'FrameworkNotSupportedError' | 'FunctionTooLargeError' | 'GraphQLError' | 'InputValidationError' | 'InvalidAmplifyAppIdError' | 'InvalidCustomResourceError' | 'InvalidDirectiveError' | 'InvalidGSIMigrationError' | 'InvalidMigrationError' | 'InvalidOverrideError' | 'InvalidStackError' | 'InvalidTransformerError' | 'IterativeRollbackError' | 'LambdaFunctionInvokeError' | 'LambdaLayerDeleteError' | 'LambdaLayerNotFoundError' | 'MigrationError' | 'MissingAmplifyMetaFileError' | 'MissingExpectedParameterError' | 'MissingOverridesInstallationRequirementsError' | 'MockProcessError' | 'ModelgenError' | 'NestedProjectInitError' | 'NotImplementedError' | 'NoUpdateBackendError' | 'OpenSslCertificateError' | 'PackagingLambdaFunctionError' | 'ParameterNotFoundError' | 'PermissionsError' | 'PluginMethodNotFoundError' | 'PluginNotFoundError' | 'PluginPolicyAddError' | 'ProfileConfigurationError' | 'ProjectAppIdResolveError' | 'ProjectInitError' | 'ProjectNotFoundError' | 'ProjectNotInitializedError' | 'PushResourcesError' | 'RegionNotAvailableError' | 'RemoveNotificationAppError' | 'ResourceAlreadyExistsError' | 'ResourceCountLimitExceedError' | 'ResourceDoesNotExistError' | 'ResourceInUseError' | 'ResourceNotReadyError' | 'SchemaNotFoundError' | 'SchemaValidationError' | 'SearchableMockProcessError' | 'SearchableMockUnavailablePortError' | 'SearchableMockUnsupportedPlatformError' | 'StackNotFoundError' | 'StackStateError' | 'StorageImportError' | 'TransformerContractError' | 'UnknownDirectiveError' | 'UnsupportedLockFileTypeError' | 'UserInputError';
+export type AmplifyErrorType = 'AmplifyStudioError' | 'AmplifyStudioLoginError' | 'AmplifyStudioNotEnabledError' | 'ApiCategorySchemaNotFoundError' | 'AuthImportError' | 'BackendConfigValidationError' | 'BucketAlreadyExistsError' | 'BucketNotFoundError' | 'CategoryNotEnabledError' | 'CloudFormationTemplateError' | 'CommandNotSupportedError' | 'ConfigurationError' | 'CustomPoliciesFormatError' | 'DebugConfigValueNotSetError' | 'DeploymentError' | 'DeploymentInProgressError' | 'DestructiveMigrationError' | 'DiagnoseReportUploadError' | 'DirectoryAlreadyExistsError' | 'DirectoryError' | 'DuplicateLogicalIdError' | 'EnvironmentConfigurationError' | 'EnvironmentNameError' | 'EnvironmentNotInitializedError' | 'ExportError' | 'FeatureFlagsValidationError' | 'FileSystemPermissionsError' | 'FrameworkNotSupportedError' | 'FunctionTooLargeError' | 'GraphQLError' | 'InputValidationError' | 'InvalidAmplifyAppIdError' | 'InvalidCustomResourceError' | 'InvalidDirectiveError' | 'InvalidGSIMigrationError' | 'InvalidMigrationError' | 'InvalidOverrideError' | 'InvalidStackError' | 'InvalidTransformerError' | 'IterativeRollbackError' | 'LambdaFunctionInvokeError' | 'LambdaLayerDeleteError' | 'MigrationError' | 'MissingAmplifyMetaFileError' | 'MissingExpectedParameterError' | 'MissingOverridesInstallationRequirementsError' | 'MockProcessError' | 'ModelgenError' | 'NestedProjectInitError' | 'NotImplementedError' | 'NoUpdateBackendError' | 'OpenSslCertificateError' | 'PackagingLambdaFunctionError' | 'ParameterNotFoundError' | 'PermissionsError' | 'PluginMethodNotFoundError' | 'PluginNotFoundError' | 'PluginPolicyAddError' | 'ProfileConfigurationError' | 'ProjectAppIdResolveError' | 'ProjectInitError' | 'ProjectNotFoundError' | 'ProjectNotInitializedError' | 'PushResourcesError' | 'RegionNotAvailableError' | 'RemoveNotificationAppError' | 'ResourceAlreadyExistsError' | 'ResourceCountLimitExceedError' | 'ResourceDoesNotExistError' | 'ResourceInUseError' | 'ResourceNotReadyError' | 'SchemaNotFoundError' | 'SchemaValidationError' | 'SearchableMockProcessError' | 'SearchableMockUnavailablePortError' | 'SearchableMockUnsupportedPlatformError' | 'StackNotFoundError' | 'StackStateError' | 'StorageImportError' | 'TransformerContractError' | 'UnknownDirectiveError' | 'UnsupportedLockFileTypeError' | 'UserInputError';
 
 // @public (undocumented)
 export enum AmplifyEvent {
diff --git a/packages/amplify-cli-core/src/errors/amplify-exception.ts b/packages/amplify-cli-core/src/errors/amplify-exception.ts
@@ -136,7 +136,6 @@ export type AmplifyErrorType =
   | 'IterativeRollbackError'
   | 'LambdaFunctionInvokeError'
   | 'LambdaLayerDeleteError'
-  | 'LambdaLayerNotFoundError'
   | 'MigrationError'
   | 'MissingAmplifyMetaFileError'
   | 'MissingExpectedParameterError'

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ export class AmplifyError extends AmplifyException {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`// @public (undocumented)`
`123`		-export type AmplifyErrorType = 'AmplifyStudioError' \| 'AmplifyStudioLoginError' \| 'AmplifyStudioNotEnabledError' \| 'ApiCategorySchemaNotFoundError' \| 'AuthImportError' \| 'BackendConfigValidationError' \| 'BucketAlreadyExistsError' \| 'BucketNotFoundError' \| 'CategoryNotEnabledError' \| 'CloudFormationTemplateError' \| 'CommandNotSupportedError' \| 'ConfigurationError' \| 'CustomPoliciesFormatError' \| 'DebugConfigValueNotSetError' \| 'DeploymentError' \| 'DeploymentInProgressError' \| 'DestructiveMigrationError' \| 'DiagnoseReportUploadError' \| 'DirectoryAlreadyExistsError' \| 'DirectoryError' \| 'DuplicateLogicalIdError' \| 'EnvironmentConfigurationError' \| 'EnvironmentNameError' \| 'EnvironmentNotInitializedError' \| 'ExportError' \| 'FeatureFlagsValidationError' \| 'FileSystemPermissionsError' \| 'FrameworkNotSupportedError' \| 'FunctionTooLargeError' \| 'GraphQLError' \| 'InputValidationError' \| 'InvalidAmplifyAppIdError' \| 'InvalidCustomResourceError' \| 'InvalidDirectiveError' \| 'InvalidGSIMigrationError' \| 'InvalidMigrationError' \| 'InvalidOverrideError' \| 'InvalidStackError' \| 'InvalidTransformerError' \| 'IterativeRollbackError' \| 'LambdaFunctionInvokeError' \| 'LambdaLayerDeleteError' \| 'LambdaLayerNotFoundError' \| 'MigrationError' \| 'MissingAmplifyMetaFileError' \| 'MissingExpectedParameterError' \| 'MissingOverridesInstallationRequirementsError' \| 'MockProcessError' \| 'ModelgenError' \| 'NestedProjectInitError' \| 'NotImplementedError' \| 'NoUpdateBackendError' \| 'OpenSslCertificateError' \| 'PackagingLambdaFunctionError' \| 'ParameterNotFoundError' \| 'PermissionsError' \| 'PluginMethodNotFoundError' \| 'PluginNotFoundError' \| 'PluginPolicyAddError' \| 'ProfileConfigurationError' \| 'ProjectAppIdResolveError' \| 'ProjectInitError' \| 'ProjectNotFoundError' \| 'ProjectNotInitializedError' \| 'PushResourcesError' \| 'RegionNotAvailableError' \| 'RemoveNotificationAppError' \| 'ResourceAlreadyExistsError' \| 'ResourceCountLimitExceedError' \| 'ResourceDoesNotExistError' \| 'ResourceInUseError' \| 'ResourceNotReadyError' \| 'SchemaNotFoundError' \| 'SchemaValidationError' \| 'SearchableMockProcessError' \| 'SearchableMockUnavailablePortError' \| 'SearchableMockUnsupportedPlatformError' \| 'StackNotFoundError' \| 'StackStateError' \| 'StorageImportError' \| 'TransformerContractError' \| 'UnknownDirectiveError' \| 'UnsupportedLockFileTypeError' \| 'UserInputError';
	`123`	+export type AmplifyErrorType = 'AmplifyStudioError' \| 'AmplifyStudioLoginError' \| 'AmplifyStudioNotEnabledError' \| 'ApiCategorySchemaNotFoundError' \| 'AuthImportError' \| 'BackendConfigValidationError' \| 'BucketAlreadyExistsError' \| 'BucketNotFoundError' \| 'CategoryNotEnabledError' \| 'CloudFormationTemplateError' \| 'CommandNotSupportedError' \| 'ConfigurationError' \| 'CustomPoliciesFormatError' \| 'DebugConfigValueNotSetError' \| 'DeploymentError' \| 'DeploymentInProgressError' \| 'DestructiveMigrationError' \| 'DiagnoseReportUploadError' \| 'DirectoryAlreadyExistsError' \| 'DirectoryError' \| 'DuplicateLogicalIdError' \| 'EnvironmentConfigurationError' \| 'EnvironmentNameError' \| 'EnvironmentNotInitializedError' \| 'ExportError' \| 'FeatureFlagsValidationError' \| 'FileSystemPermissionsError' \| 'FrameworkNotSupportedError' \| 'FunctionTooLargeError' \| 'GraphQLError' \| 'InputValidationError' \| 'InvalidAmplifyAppIdError' \| 'InvalidCustomResourceError' \| 'InvalidDirectiveError' \| 'InvalidGSIMigrationError' \| 'InvalidMigrationError' \| 'InvalidOverrideError' \| 'InvalidStackError' \| 'InvalidTransformerError' \| 'IterativeRollbackError' \| 'LambdaFunctionInvokeError' \| 'LambdaLayerDeleteError' \| 'MigrationError' \| 'MissingAmplifyMetaFileError' \| 'MissingExpectedParameterError' \| 'MissingOverridesInstallationRequirementsError' \| 'MockProcessError' \| 'ModelgenError' \| 'NestedProjectInitError' \| 'NotImplementedError' \| 'NoUpdateBackendError' \| 'OpenSslCertificateError' \| 'PackagingLambdaFunctionError' \| 'ParameterNotFoundError' \| 'PermissionsError' \| 'PluginMethodNotFoundError' \| 'PluginNotFoundError' \| 'PluginPolicyAddError' \| 'ProfileConfigurationError' \| 'ProjectAppIdResolveError' \| 'ProjectInitError' \| 'ProjectNotFoundError' \| 'ProjectNotInitializedError' \| 'PushResourcesError' \| 'RegionNotAvailableError' \| 'RemoveNotificationAppError' \| 'ResourceAlreadyExistsError' \| 'ResourceCountLimitExceedError' \| 'ResourceDoesNotExistError' \| 'ResourceInUseError' \| 'ResourceNotReadyError' \| 'SchemaNotFoundError' \| 'SchemaValidationError' \| 'SearchableMockProcessError' \| 'SearchableMockUnavailablePortError' \| 'SearchableMockUnsupportedPlatformError' \| 'StackNotFoundError' \| 'StackStateError' \| 'StorageImportError' \| 'TransformerContractError' \| 'UnknownDirectiveError' \| 'UnsupportedLockFileTypeError' \| 'UserInputError';
`124`	`124`
`125`	`125`	`// @public (undocumented)`
`126`	`126`	`export enum AmplifyEvent {`