refactor(cli): rename logs to logs-monitor

We are about to move this module into a different package, and the target package is gitignoring any directory called `logs`. We could just fix the gitignore, but the module name is very inacurate anyway. Therefore we are renaming it.

Also moves `rwlock` from `api/utils` to `api`. This was an oversight and doesn't warrant a separate PR.

Finally moves some test files into their correct corresponding directories.

Author: mrgrain

packages/aws-cdk/lib/api/cxapp/exec.ts

@@ -14,9 +14,9 @@ import { PROJECT_CONFIG, USER_DEFAULTS } from '../../cli/user-configuration';
 import { versionNumber } from '../../cli/version';
 import { splitBySize } from '../../util';
 import type { SdkProvider } from '../aws-auth';
+import type { ILock } from '../rwlock';
+import { RWLock } from '../rwlock';
 import type { Settings } from '../settings';
-import type { ILock } from '../util/rwlock';
-import { RWLock } from '../util/rwlock';
 
 export interface ExecProgramResult {
   readonly assembly: cxapi.CloudAssembly;

…cdk/lib/api/logs/find-cloudwatch-logs.ts …api/logs-monitor/find-cloudwatch-logs.tspackages/aws-cdk/lib/api/logs/find-cloudwatch-logs.ts renamed to packages/aws-cdk/lib/api/logs-monitor/find-cloudwatch-logs.ts packages/aws-cdk/lib/api/logs/find-cloudwatch-logs.ts renamed to packages/aws-cdk/lib/api/logs-monitor/find-cloudwatch-logs.ts

@@ -1,6 +1,6 @@
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import { ToolkitError } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api';
+import { ToolkitError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
 
 /**
  * A single-writer/multi-reader lock on a directory

packages/aws-cdk/lib/api/logs/index.ts …es/aws-cdk/lib/api/logs-monitor/index.tspackages/aws-cdk/lib/api/logs/index.ts renamed to packages/aws-cdk/lib/api/logs-monitor/index.ts packages/aws-cdk/lib/api/logs/index.ts renamed to packages/aws-cdk/lib/api/logs-monitor/index.ts

@@ -29,8 +29,8 @@ import type { DeploymentMethod, SuccessfulDeployStackResult, Deployments } from
 import { createDiffChangeSet } from '../api/deployments/cfn-api';
 import { GarbageCollector } from '../api/garbage-collection/garbage-collector';
 import { HotswapMode, HotswapPropertyOverrides, EcsHotswapProperties } from '../api/hotswap/common';
-import { findCloudWatchLogGroups } from '../api/logs/find-cloudwatch-logs';
-import { CloudWatchLogEventMonitor } from '../api/logs/logs-monitor';
+import { findCloudWatchLogGroups } from '../api/logs-monitor/find-cloudwatch-logs';
+import { CloudWatchLogEventMonitor } from '../api/logs-monitor/logs-monitor';
 import { ResourceImporter, removeNonImportResources, ResourceMigrator } from '../api/resource-import';
 import { tagsForStack, type Tag } from '../api/tags';
 import type { AssetBuildNode, AssetPublishNode, Concurrency, StackNode, WorkGraph } from '../api/work-graph';

…ges/aws-cdk/lib/api/logs/logs-monitor.ts …cdk/lib/api/logs-monitor/logs-monitor.tspackages/aws-cdk/lib/api/logs/logs-monitor.ts renamed to packages/aws-cdk/lib/api/logs-monitor/logs-monitor.ts packages/aws-cdk/lib/api/logs/logs-monitor.ts renamed to packages/aws-cdk/lib/api/logs-monitor/logs-monitor.ts

@@ -25,9 +25,9 @@ import type { DeploymentMethod } from '../api/deployments';
 import { Deployments } from '../api/deployments';
 import { HotswapMode } from '../api/hotswap/common';
 import { PluginHost } from '../api/plugin';
+import type { ILock } from '../api/rwlock';
 import type { Settings } from '../api/settings';
 import { ToolkitInfo } from '../api/toolkit-info';
-import type { ILock } from '../api/util/rwlock';
 import { contextHandler as context } from '../commands/context';
 import { docs } from '../commands/docs';
 import { doctor } from '../commands/doctor';

packages/aws-cdk/lib/api/util/rwlock.ts packages/aws-cdk/lib/api/rwlock.tspackages/aws-cdk/lib/api/util/rwlock.ts renamed to packages/aws-cdk/lib/api/rwlock.ts

@@ -3,8 +3,8 @@ import {
   CfnEvaluationException,
   EvaluateCloudFormationTemplate,
   Template,
-} from '../../lib/api/cloudformation';
-import { MockSdk, mockCloudFormationClient, restoreSdkMocksToDefault } from '../_helpers/mock-sdk';
+} from '../../../lib/api/cloudformation';
+import { MockSdk, mockCloudFormationClient, restoreSdkMocksToDefault } from '../../_helpers/mock-sdk';
 
 const sdk = new MockSdk();
 

packages/aws-cdk/lib/cli/cdk-toolkit.ts

@@ -1,8 +1,8 @@
 import 'aws-sdk-client-mock-jest';
 
 import { ListStackResourcesCommand } from '@aws-sdk/client-cloudformation';
-import { LazyListStackResources } from '../../lib/api/cloudformation';
-import { MockSdk, mockCloudFormationClient } from '../_helpers/mock-sdk';
+import { LazyListStackResources } from '../../../lib/api/cloudformation';
+import { MockSdk, mockCloudFormationClient } from '../../_helpers/mock-sdk';
 
 describe('Lazy ListStackResources', () => {
   test('correctly caches calls to the CloudFormation API', async () => {

packages/aws-cdk/lib/cli/cli.ts

@@ -1,6 +1,6 @@
 import { ListExportsCommand } from '@aws-sdk/client-cloudformation';
-import { LazyLookupExport } from '../../lib/api/cloudformation';
-import { MockSdk, mockCloudFormationClient, restoreSdkMocksToDefault } from '../_helpers/mock-sdk';
+import { LazyLookupExport } from '../../../lib/api/cloudformation';
+import { MockSdk, mockCloudFormationClient, restoreSdkMocksToDefault } from '../../_helpers/mock-sdk';
 
 describe('LazyLookupExport', () => {
   const mockSdk = new MockSdk();