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
22 changes: 0 additions & 22 deletions src/host-iptables-network.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { execaResult, mockedExeca, setupHostIptablesTestSuite } from './test-helpers/host-iptables-test-setup';
import { cleanupFirewallNetwork } from './host-iptables-network';
import { ensureFirewallNetwork } from './host-iptables';
import { iptablesSharedTestHelpers } from './host-iptables-shared';

Expand Down Expand Up @@ -61,25 +60,4 @@ describe('host-iptables (network)', () => {
], { env: expect.any(Object) });
});
});

describe('cleanupFirewallNetwork', () => {
it('should remove the firewall network', async () => {
mockedExeca.mockResolvedValue(execaResult({
stdout: '',
stderr: '',
exitCode: 0,
}));

await cleanupFirewallNetwork();

expect(mockedExeca).toHaveBeenCalledWith('docker', ['network', 'rm', 'awf-net'], { reject: false, env: expect.any(Object) });
});

it('should not throw on errors (best-effort cleanup)', async () => {
mockedExeca.mockRejectedValue(new Error('network removal error'));

// Should not throw
await expect(cleanupFirewallNetwork()).resolves.not.toThrow();
});
});
});
17 changes: 0 additions & 17 deletions src/host-iptables-network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,3 @@ export async function ensureFirewallNetwork(): Promise<{
proxyIp: '172.30.0.30',
};
}

/**
* Removes the firewall network.
*
* @internal Test-only helper for cleaning up the dedicated firewall network.
*/
export async function cleanupFirewallNetwork(): Promise<void> {
logger.debug(`Removing firewall network '${NETWORK_NAME}'...`);

try {
await execa('docker', ['network', 'rm', NETWORK_NAME], { reject: false, env: getLocalDockerEnv() });
logger.debug('Firewall network removed');
} catch (error) {
logger.debug('Error removing firewall network:', error);
// Don't throw - cleanup should be best-effort
}
}
Loading