@friggframework/devtools 2.0.0--canary.545.e256e95.0 → 2.0.0--canary.553.dc5f898.0

package/frigg-cli/utils/repo-detection.js

@@ -37,70 +37,17 @@ async function isFriggRepository(directory) {
             friggDependencies: []
         };
 
-        // Check for @friggframework/core v2.0+ specifically (REQUIRED for Frigg apps)
-        // Check both root package.json and backend/package.json for workspace projects
+        // Check for @friggframework dependencies
         const allDeps = {
             ...packageJson.dependencies,
-            ...packageJson.devDependencies
+            ...packageJson.devDependencies,
+            ...packageJson.peerDependencies
         };
 
-        // Check root package.json for core dependency
-        let coreVersion = allDeps['@friggframework/core'];
-        let hasFriggCore = coreVersion && (
-            coreVersion === 'next' ||
-            coreVersion.includes('2.0.0') ||
-            coreVersion.includes('next') ||
-            coreVersion.startsWith('^2.') ||
-            coreVersion.startsWith('~2.') ||
-            coreVersion.startsWith('2.')
-        );
-
-        // If not in root, check backend/package.json for workspace projects
-        if (!hasFriggCore) {
-            const backendPackagePath = path.join(directory, 'backend', 'package.json');
-            if (fs.existsSync(backendPackagePath)) {
-                try {
-                    const backendPackageJson = await fs.readJson(backendPackagePath);
-                    const backendDeps = {
-                        ...backendPackageJson.dependencies,
-                        ...backendPackageJson.devDependencies
-                    };
-                    coreVersion = backendDeps['@friggframework/core'];
-                    hasFriggCore = coreVersion && (
-                        coreVersion === 'next' ||
-                        coreVersion.includes('2.0.0') ||
-                        coreVersion.includes('next') ||
-                        coreVersion.startsWith('^2.') ||
-                        coreVersion.startsWith('~2.') ||
-                        coreVersion.startsWith('2.')
-                    );
-                } catch (error) {
-                    // Ignore errors reading backend package.json
-                }
-            }
-        }
-
-        if (hasFriggCore) {
-            indicators.hasFriggDependencies = true;
-            indicators.friggDependencies.push('@friggframework/core');
-        }
-
-        // Also track other Frigg dependencies for reference
         for (const dep in allDeps) {
-            if (dep.startsWith('@friggframework/') && dep !== '@friggframework/core') {
-                const version = allDeps[dep];
-                const isV2Plus = version && (
-                    version === 'next' ||
-                    version.includes('2.0.0') ||
-                    version.includes('next') ||
-                    version.startsWith('^2.') ||
-                    version.startsWith('~2.') ||
-                    version.startsWith('2.')
-                );
-
-                if (isV2Plus) {
-                    indicators.friggDependencies.push(dep);
-                }
+            if (dep.startsWith('@friggframework/')) {
+                indicators.hasFriggDependencies = true;
+                indicators.friggDependencies.push(dep);
             }
         }
 
@@ -189,33 +136,42 @@ async function isFriggRepository(directory) {
             }
         }
 
-        // STRICT VALIDATION: A directory is considered a Frigg app repository ONLY if:
-        // 1. Has @friggframework/core v2.0+ as a direct dependency (MANDATORY)
-        // 2. Has actual Frigg app structure (index.js with Definition OR backend/serverless.yml)
-        // 3. Is NOT a framework package itself (no @friggframework/* package name)
-
-        // Check for Frigg app structure indicators
-        const hasRootIndexJs = fs.existsSync(path.join(directory, 'index.js'));
-        const hasBackendIndexJs = fs.existsSync(path.join(directory, 'backend', 'index.js'));
-        const hasBackendServerless = fs.existsSync(path.join(directory, 'backend', 'serverless.yml'));
-        const hasAppStructure = hasRootIndexJs || hasBackendIndexJs || hasBackendServerless;
+        // A directory is considered a Frigg repo if it has:
+        // 1. Frigg dependencies (MANDATORY - most reliable indicator) OR
+        // 2. Frigg-specific configuration files OR
+        // 3. Frigg-specific directories OR
+        // 4. Frigg-specific scripts in package.json OR
+        // 5. Serverless config with explicit Frigg references AND proper structure
+        // 
+        // For Zapier apps, we require explicit Frigg indicators
+        const hasFriggIndicators = indicators.hasFriggDependencies || 
+                                  indicators.hasFriggConfig || 
+                                  indicators.hasFriggDirectories ||
+                                  indicators.hasFriggScripts ||
+                                  hasFriggServerlessIndicators;
+
+        // Determine if it's a Frigg repository
+        let isFriggRepo = false;
+        
+        if (isZapierApp) {
+            // For Zapier apps, require explicit Frigg dependencies or config
+            isFriggRepo = indicators.hasFriggDependencies || indicators.hasFriggConfig;
+        } else {
+            // For non-Zapier apps, any Frigg indicator is sufficient
+            isFriggRepo = hasFriggIndicators;
+        }
 
-        // Determine if it's a Frigg repository with STRICT criteria
-        const isFriggRepo = indicators.hasFriggDependencies && hasAppStructure;
+        // Additional validation for edge cases
+        if (isZapierApp && !indicators.hasFriggDependencies && !indicators.hasFriggConfig) {
+            return { isFriggRepo: false, repoInfo: null };
+        }
 
         if (isFriggRepo) {
-            // IMPORTANT: If backend/ has a Frigg app structure, use backend/ as the path
-            // This handles workspace projects where the actual app is in backend/
-            let actualPath = directory;
-            if (hasBackendIndexJs || hasBackendServerless) {
-                actualPath = path.join(directory, 'backend');
-            }
-
             return {
                 isFriggRepo: true,
                 repoInfo: {
                     name: packageJson.name || path.basename(directory),
-                    path: actualPath,
+                    path: directory,
                     version: packageJson.version,
                     framework: detectFramework(directory, existingFrontendDirs),
                     hasBackend: fs.existsSync(path.join(directory, 'backend')),
@@ -289,16 +245,12 @@ async function discoverFriggRepositories(options = {}) {
         searchPaths = [
             process.cwd(),
             path.join(os.homedir(), 'Documents'),
-            path.join(os.homedir(), 'Documents', 'GitHub'),  // Common GitHub Desktop location
             path.join(os.homedir(), 'Projects'),
             path.join(os.homedir(), 'Development'),
             path.join(os.homedir(), 'dev'),
-            path.join(os.homedir(), 'Code'),
-            path.join(os.homedir(), 'GitHub'),  // Alternative GitHub location
-            path.join(os.homedir(), 'repos'),   // Common repos folder
-            path.join(os.homedir(), 'src')      // Common source folder
+            path.join(os.homedir(), 'Code')
         ],
-        maxDepth = 4,  // Increased to handle deeper nested projects (e.g., org/apps/project)
+        maxDepth = 3,
         excludePatterns = ['node_modules', '.git', 'dist', 'build', '.next', 'coverage']
     } = options;
 

package/infrastructure/create-frigg-infrastructure.js

@@ -23,92 +23,6 @@ function isProcessRunning(pid) {
     }
 }
 
-/**
- * Build for a non-AWS provider.
- *
- * When infrastructure.js is invoked (e.g. `node infrastructure.js package`),
- * but the appDefinition specifies a non-AWS provider, we skip the entire
- * serverless/CloudFormation pipeline and instead:
- *   1. Validate the appDefinition against the provider
- *   2. Generate the provider-specific config (e.g. netlify.toml)
- *   3. Generate function entry points
- *
- * This mirrors what the CLI's buildCommand does for non-AWS providers,
- * but works when invoked directly via `node infrastructure.js package`.
- */
-async function buildWithProvider(appDefinition, providerName, backendDir) {
-    const { resolveProvider } = require('@friggframework/core/providers/resolve-provider');
-    const provider = resolveProvider(appDefinition);
-
-    console.log(`Building for ${providerName} provider (skipping AWS infrastructure)...`);
-
-    // 1. Validate
-    if (typeof provider.validate === 'function') {
-        const validation = provider.validate(appDefinition);
-        if (validation.errors?.length > 0) {
-            console.error(`\nValidation errors for ${providerName}:`);
-            for (const error of validation.errors) {
-                console.error(`  - ${error}`);
-            }
-            process.exit(1);
-        }
-        if (validation.warnings?.length > 0) {
-            for (const warning of validation.warnings) {
-                console.warn(`  Warning: ${warning}`);
-            }
-        }
-    }
-
-    // 2. Generate platform config (e.g. netlify.toml)
-    // Written to the project root (one level up from backend/)
-    const projectDir = path.dirname(backendDir);
-    if (typeof provider.generateConfig === 'function') {
-        const config = provider.generateConfig(appDefinition);
-        const configFileNames = { netlify: 'netlify.toml' };
-        const configFileName = configFileNames[providerName] || `${providerName}.config`;
-        const configPath = path.join(projectDir, configFileName);
-
-        fs.writeFileSync(configPath, config, 'utf-8');
-        console.log(`  Written ${configFileName}`);
-    }
-
-    // 3. Generate function entry points
-    if (typeof provider.getFunctionEntryPoints === 'function') {
-        const entryPoints = provider.getFunctionEntryPoints(appDefinition);
-        const functionsDir = path.join(projectDir, 'netlify', 'functions');
-
-        fs.mkdirSync(functionsDir, { recursive: true });
-
-        for (const [filename, content] of Object.entries(entryPoints)) {
-            const filePath = path.join(functionsDir, filename);
-            fs.writeFileSync(filePath, content, 'utf-8');
-        }
-
-        console.log(`  Generated ${Object.keys(entryPoints).length} function entry points`);
-    }
-
-    // 4. Generate lib entry points (re-export shims for runtime dependencies)
-    if (typeof provider.getLibEntryPoints === 'function') {
-        const libEntryPoints = provider.getLibEntryPoints(appDefinition);
-        const libDir = path.join(projectDir, 'netlify', 'lib');
-
-        fs.mkdirSync(libDir, { recursive: true });
-
-        for (const [filename, content] of Object.entries(libEntryPoints)) {
-            const filePath = path.join(libDir, filename);
-            fs.writeFileSync(filePath, content, 'utf-8');
-        }
-
-        console.log(`  Generated ${Object.keys(libEntryPoints).length} lib entry points`);
-    }
-
-    console.log(`\nBuild complete for ${providerName}.`);
-
-    // Return an empty serverless definition — osls will see no functions
-    // and effectively no-op. The real deployment is handled by the provider.
-    return {};
-}
-
 async function createFriggInfrastructure() {
     const backendPath = findNearestBackendPackageJson();
     if (!backendPath) {
@@ -190,13 +104,6 @@ async function createFriggInfrastructure() {
         const backend = require(backendFilePath);
         const appDefinition = backend.Definition;
 
-        // Check if a non-AWS provider is configured.
-        // If so, run the provider's build pipeline instead of AWS CloudFormation.
-        const providerName = appDefinition.provider || 'aws';
-        if (providerName !== 'aws') {
-            return buildWithProvider(appDefinition, providerName, backendDir);
-        }
-
         const definition = await composeServerlessDefinition(
             appDefinition,
         );

package/infrastructure/docs/iam-policy-templates.md

@@ -160,7 +160,7 @@ Consider separate policies for different environments:
 ### Validation
 Test your policy by deploying a simple Frigg app:
 ```bash
-frigg init test-deployment
+npx create-frigg-app test-deployment
 cd test-deployment
 frigg deploy
 ```

package/infrastructure/domains/integration/integration-builder.js

@@ -316,6 +316,7 @@ class IntegrationBuilder extends InfrastructureBuilder {
                     sqs: {
                         arn: { 'Fn::GetAtt': [`${this.capitalizeFirst(integrationName)}Queue`, 'Arn'] },
                         batchSize: 1,
+                        functionResponseType: 'ReportBatchItemFailures',
                     },
                 },
             ],
@@ -361,10 +362,10 @@ class IntegrationBuilder extends InfrastructureBuilder {
             Type: 'AWS::SQS::Queue',
             Properties: {
                 QueueName: `\${self:custom.${queueReference}}`,
-                MessageRetentionPeriod: 60,
+                MessageRetentionPeriod: 345600, // 4 days (SQS default)
                 VisibilityTimeout: 1800,
                 RedrivePolicy: {
-                    maxReceiveCount: 1,
+                    maxReceiveCount: 3,
                     deadLetterTargetArn: {
                         'Fn::GetAtt': ['InternalErrorQueue', 'Arn'],
                     },

package/infrastructure/domains/integration/integration-builder.test.js

@@ -186,7 +186,7 @@ describe('IntegrationBuilder', () => {
 
             const result = await integrationBuilder.build(appDefinition, {});
 
-            expect(result.resources.TestQueue.Properties.MessageRetentionPeriod).toBe(60);
+            expect(result.resources.TestQueue.Properties.MessageRetentionPeriod).toBe(345600);
             expect(result.resources.TestQueue.Properties.VisibilityTimeout).toBe(1800);
         });
 
@@ -200,7 +200,7 @@ describe('IntegrationBuilder', () => {
             const result = await integrationBuilder.build(appDefinition, {});
 
             expect(result.resources.TestQueue.Properties.RedrivePolicy).toEqual({
-                maxReceiveCount: 1,
+                maxReceiveCount: 3,
                 deadLetterTargetArn: {
                     'Fn::GetAtt': ['InternalErrorQueue', 'Arn'],
                 },
@@ -233,6 +233,7 @@ describe('IntegrationBuilder', () => {
                     sqs: {
                         arn: { 'Fn::GetAtt': ['TestQueue', 'Arn'] },
                         batchSize: 1,
+                        functionResponseType: 'ReportBatchItemFailures',
                     },
                 },
             ]);
@@ -343,6 +344,57 @@ describe('IntegrationBuilder', () => {
             expect(result.functions['my-integration']).toBeDefined();
             expect(result.functions['my-integrationQueueWorker']).toBeDefined();
         });
+
+        // ============================================================
+        // Theory-proving tests: demonstrate current dangerous config
+        // These tests document the root cause of the Modern Midstay bug
+        // where POST_CREATE_SETUP messages were silently lost.
+        // ============================================================
+
+        it('THEORY: MessageRetentionPeriod is too short for delayed messages', async () => {
+            // POST_CREATE_SETUP uses DelaySeconds=35.
+            // With MessageRetentionPeriod=60, the message is only visible
+            // for 25 seconds before SQS silently deletes it.
+            // Messages that expire are NOT sent to DLQ — they vanish.
+            const appDefinition = {
+                integrations: [{ Definition: { name: 'test' } }],
+            };
+
+            const result = await integrationBuilder.build(appDefinition, {});
+            const retention = result.resources.TestQueue.Properties.MessageRetentionPeriod;
+
+            // The max SQS DelaySeconds is 900. Retention must comfortably
+            // exceed this to ensure delayed messages are never silently lost.
+            // Current value (60) fails this check.
+            expect(retention).toBeGreaterThan(900);
+        });
+
+        it('THEORY: maxReceiveCount=1 means zero retries on transient failures', async () => {
+            // A single transient error (network blip, cold start timeout,
+            // rate limit) sends the message straight to DLQ with no retry.
+            const appDefinition = {
+                integrations: [{ Definition: { name: 'test' } }],
+            };
+
+            const result = await integrationBuilder.build(appDefinition, {});
+            const maxReceiveCount = result.resources.TestQueue.Properties.RedrivePolicy.maxReceiveCount;
+
+            // Should allow at least 2 retries (maxReceiveCount >= 3)
+            expect(maxReceiveCount).toBeGreaterThanOrEqual(3);
+        });
+
+        it('THEORY: SQS event source should enable ReportBatchItemFailures', async () => {
+            // Without this, Lambda can't tell SQS which specific messages
+            // failed — it's all-or-nothing for the entire invocation.
+            const appDefinition = {
+                integrations: [{ Definition: { name: 'test' } }],
+            };
+
+            const result = await integrationBuilder.build(appDefinition, {});
+            const sqsEvent = result.functions.testQueueWorker.events[0].sqs;
+
+            expect(sqsEvent.functionResponseType).toBe('ReportBatchItemFailures');
+        });
     });
 
     describe('getDependencies()', () => {

package/infrastructure/domains/networking/vpc-builder.test.js

@@ -1500,9 +1500,10 @@ describe('VpcBuilder', () => {
                 }
             };
             
+            // Discovery results matching ACTUAL Frontify production stack
             const discoveredResources = {
                 fromCloudFormationStack: true,
-                stackName: 'frigg-app-production',
+                stackName: 'create-frigg-app-production',
                 existingLogicalIds: [
                     'FriggLambdaRouteTable',
                     'FriggNATRoute',  // OLD naming
@@ -1565,9 +1566,10 @@ describe('VpcBuilder', () => {
         });
 
         it('should convert OLD logical IDs to structured discovery stackManaged array', () => {
+            // TDD test: Verify that VPCEndpointS3 in existingLogicalIds gets added to stackManaged
             const flatDiscovery = {
                 fromCloudFormationStack: true,
-                stackName: 'frigg-app-production',
+                stackName: 'create-frigg-app-production',
                 existingLogicalIds: [
                     'VPCEndpointS3',        // OLD naming
                     'VPCEndpointDynamoDB',  // OLD naming

package/infrastructure/domains/networking/vpc-resolver.test.js

@@ -746,7 +746,7 @@ describe('VpcResourceResolver', () => {
                 ],
                 external: [],
                 fromCloudFormation: true,
-                stackName: 'frigg-app-production'
+                stackName: 'create-frigg-app-production'
             };
 
             const decisions = resolver.resolveAll(appDefinition, discovery);

package/infrastructure/domains/shared/resource-discovery.js

@@ -88,8 +88,8 @@ async function gatherDiscoveredResources(appDefinition) {
 
         // Build discovery configuration
         const stage = process.env.SLS_STAGE || 'dev';
-        const stackName = `${appDefinition.name || 'frigg-app'}-${stage}`;
-        const serviceName = appDefinition.name || 'frigg-app';
+        const stackName = `${appDefinition.name || 'create-frigg-app'}-${stage}`;
+        const serviceName = appDefinition.name || 'create-frigg-app';
 
         // Try CloudFormation-first discovery
         const cfDiscovery = new CloudFormationDiscovery(provider, { serviceName, stage });
@@ -158,9 +158,9 @@ async function gatherDiscoveredResources(appDefinition) {
             // KMS keys CAN be shared across stages (encryption keys are safe to reuse)
             const kmsDiscovery = new KmsDiscovery(provider);
             const kmsConfig = {
-                serviceName: appDefinition.name || 'frigg-app',
+                serviceName: appDefinition.name || 'create-frigg-app',
                 stage,
-                keyAlias: `alias/${appDefinition.name || 'frigg-app'}-${stage}-frigg-kms`,
+                keyAlias: `alias/${appDefinition.name || 'create-frigg-app'}-${stage}-frigg-kms`,
             };
             const kmsResult = await kmsDiscovery.discover(kmsConfig);
 
@@ -189,7 +189,7 @@ async function gatherDiscoveredResources(appDefinition) {
         const ssmDiscovery = new SsmDiscovery(provider);
 
         const config = {
-            serviceName: appDefinition.name || 'frigg-app',
+            serviceName: appDefinition.name || 'create-frigg-app',
             stage,
             vpcId: appDefinition.vpc?.vpcId,
             databaseId: appDefinition.database?.postgres?.clusterId ||

package/infrastructure/domains/shared/types/app-definition.js

@@ -106,25 +106,6 @@
  * @property {string} Definition.name - Integration name
  */
 
-/**
- * Admin script definition
- * @typedef {Object} AdminScriptDefinition
- * @property {Object} Definition - Static definition from script class
- * @property {string} Definition.name - Script name identifier
- * @property {string} Definition.version - Script version (semver)
- * @property {string} [Definition.description] - Human-readable description
- * @property {Object} [Definition.schedule] - Schedule configuration
- * @property {boolean} [Definition.schedule.enabled] - Whether scheduling is enabled
- * @property {string} [Definition.schedule.cronExpression] - Cron expression
- */
-
-/**
- * Admin configuration
- * @typedef {Object} AdminConfig
- * @property {boolean} [includeBuiltinScripts] - Whether to include built-in scripts
- * @property {boolean} [enableScheduling] - Whether to enable EventBridge scheduling
- */
-
 /**
  * Complete application definition
  * @typedef {Object} AppDefinition
@@ -141,24 +122,8 @@
  * @property {MigrationDefinition} [migrations] - Database migration configuration
  * @property {WebsocketDefinition} [websockets] - WebSocket API configuration
  * @property {IntegrationDefinition[]} [integrations] - Integration definitions
- * @property {AdminScriptDefinition[]} [adminScripts] - Admin script definitions
- * @property {AdminConfig} [admin] - Admin configuration
  *
  * @property {Object} [environment] - Environment variables
- *
- * @property {ExtensionDefinition[]} [extensions] - Extensions that add custom Prisma models, encrypted fields, admin routes, and bootstrap lifecycle hooks
- */
-
-/**
- * Extension definition for extending Frigg Core with custom models, encryption, routes, and bootstrap
- * @typedef {Object} ExtensionDefinition
- * @property {string} name - Unique identifier for this extension
- * @property {string} [schema] - Absolute path to a .prisma schema fragment
- * @property {Object<string, {fields: string[]}>} [encryption] - Model name → encrypted fields mapping
- * @property {Object} [routes] - Express router configuration
- * @property {string} routes.path - Base URL path for the extension routes
- * @property {Function|Object} routes.handler - Router factory (prisma, appDefinition) → Router, or { router } object
- * @property {Function} [bootstrap] - Async function (prisma, appDefinition) → void, runs post-DB pre-router
  */
 
 /**

package/infrastructure/domains/shared/types/discovery-result.test.js

@@ -219,7 +219,7 @@ describe('Discovery Result Utilities', () => {
                 ],
                 external: [],
                 fromCloudFormation: true,
-                stackName: 'frigg-app-production'
+                stackName: 'create-frigg-app-production'
             };
 
             expect(discovery.fromCloudFormation).toBe(true);

package/infrastructure/domains/shared/utilities/base-definition-factory.js

@@ -165,7 +165,7 @@ function createBaseDefinition(
 
     return {
         frameworkVersion: '>=3.17.0',
-        service: AppDefinition.name || 'frigg-app',
+        service: AppDefinition.name || 'create-frigg-app',
         package: {
             individually: true,
         },
@@ -311,15 +311,6 @@ function createBaseDefinition(
                     { httpApi: { path: '/health/{proxy+}', method: 'GET' } },
                 ],
             },
-            docs: {
-                handler: 'node_modules/@friggframework/core/handlers/routers/docs.handler',
-                skipEsbuild: true,
-                package: skipEsbuildPackageConfig,
-                events: [
-                    { httpApi: { path: '/api/docs', method: 'GET' } },
-                    { httpApi: { path: '/api/openapi.json', method: 'GET' } },
-                ],
-            },
             // Note: dbMigrate removed - MigrationBuilder now handles migration infrastructure
             // See: packages/devtools/infrastructure/domains/database/migration-builder.js
         },

package/infrastructure/domains/shared/utilities/base-definition-factory.test.js

@@ -30,10 +30,10 @@ describe('Base Definition Factory', () => {
             expect(result.provider.stage).toBe('${opt:stage}');
         });
 
-        it('should default service name to frigg-app', () => {
+        it('should default service name to create-frigg-app', () => {
             const result = createBaseDefinition({}, {}, {});
 
-            expect(result.service).toBe('frigg-app');
+            expect(result.service).toBe('create-frigg-app');
         });
 
         it('should use custom provider if specified', () => {

package/infrastructure/infrastructure-composer.js

@@ -17,7 +17,6 @@ const { SsmBuilder } = require('./domains/parameters/ssm-builder');
 const { WebsocketBuilder } = require('./domains/integration/websocket-builder');
 const { IntegrationBuilder } = require('./domains/integration/integration-builder');
 const { SchedulerBuilder } = require('./domains/scheduler/scheduler-builder');
-const { AdminScriptBuilder } = require('./domains/admin-scripts/admin-script-builder');
 
 // Utilities
 const { modifyHandlerPaths } = require('./domains/shared/utilities/handler-path-resolver');
@@ -54,7 +53,6 @@ const composeServerlessDefinition = async (AppDefinition) => {
         new WebsocketBuilder(),
         new IntegrationBuilder(),
         new SchedulerBuilder(), // Add scheduler after IntegrationBuilder (depends on it)
-        new AdminScriptBuilder(),
     ]);
 
     // Build all infrastructure (orchestrator handles validation, dependencies, parallel execution)

package/infrastructure/infrastructure-composer.test.js

@@ -157,7 +157,7 @@ describe('composeServerlessDefinition', () => {
 
             const result = await composeServerlessDefinition(appDefinition);
 
-            expect(result.service).toBe('frigg-app');
+            expect(result.service).toBe('create-frigg-app');
         });
 
         it('should use custom provider when specified', async () => {
@@ -1148,10 +1148,10 @@ describe('composeServerlessDefinition', () => {
                 Type: 'AWS::SQS::Queue',
                 Properties: {
                     QueueName: '${self:custom.TestIntegrationQueue}',
-                    MessageRetentionPeriod: 60,
+                    MessageRetentionPeriod: 345600,
                     VisibilityTimeout: 1800,
                     RedrivePolicy: {
-                        maxReceiveCount: 1,
+                        maxReceiveCount: 3,
                         deadLetterTargetArn: {
                             'Fn::GetAtt': ['InternalErrorQueue', 'Arn']
                         }
@@ -1168,7 +1168,8 @@ describe('composeServerlessDefinition', () => {
                         arn: {
                             'Fn::GetAtt': ['TestIntegrationQueue', 'Arn']
                         },
-                        batchSize: 1
+                        batchSize: 1,
+                        functionResponseType: 'ReportBatchItemFailures'
                     }
                 }],
                 timeout: 600
@@ -1859,7 +1860,7 @@ describe('composeServerlessDefinition', () => {
 
             await expect(composeServerlessDefinition(appDefinition)).resolves.not.toThrow();
             const result = await composeServerlessDefinition(appDefinition);
-            expect(result.service).toBe('frigg-app');
+            expect(result.service).toBe('create-frigg-app');
         });
 
         it('should handle null/undefined integrations', async () => {