Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli-core/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ export type AmplifyErrorType =
| 'IterativeRollbackError'
| 'LambdaFunctionInvokeError'
| 'LambdaLayerDeleteError'
| 'LambdaLayerNotFoundError'
| 'MigrationError'
| 'MissingAmplifyMetaFileError'
| 'MissingExpectedParameterError'
Expand Down