Skip to content

Commit 17b12f2

Browse files
rix0rrrrix0rrr
authored
chore: switch to using @cdklabs/eslint-plugin (#31682)
We've moved the rules to a separate package. Switch over to using that package. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 642a944 commit 17b12f2

File tree

117 files changed

+102
-1385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+102
-1385
lines changed

Diff for: ‎lerna.json

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"packages/@aws-cdk/*/lambda-packages/*",
1212
"tools/@aws-cdk/cdk-build-tools",
1313
"tools/@aws-cdk/cdk-release",
14-
"tools/@aws-cdk/eslint-plugin",
1514
"tools/@aws-cdk/node-bundle",
1615
"tools/@aws-cdk/pkglint",
1716
"tools/@aws-cdk/pkgtools",

Diff for: ‎package.json

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
"packages/@aws-cdk/*/lambda-packages/*",
8080
"tools/@aws-cdk/cdk-build-tools",
8181
"tools/@aws-cdk/cdk-release",
82-
"tools/@aws-cdk/eslint-plugin",
8382
"tools/@aws-cdk/node-bundle",
8483
"tools/@aws-cdk/pkglint",
8584
"tools/@aws-cdk/pkgtools",

Diff for: ‎packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -535,15 +535,15 @@ export class TestFixture extends ShellHelper {
535535
// Bootstrap stacks have buckets that need to be cleaned
536536
const bucketNames = stacksToDelete.map(stack => outputFromStack('BucketName', stack)).filter(defined);
537537
// Parallelism will be reasonable
538-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
538+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
539539
await Promise.all(bucketNames.map(b => this.aws.emptyBucket(b)));
540540
// The bootstrap bucket has a removal policy of RETAIN by default, so add it to the buckets to be cleaned up.
541541
this.bucketsToDelete.push(...bucketNames);
542542

543543
// Bootstrap stacks have ECR repositories with images which should be deleted
544544
const imageRepositoryNames = stacksToDelete.map(stack => outputFromStack('ImageRepositoryName', stack)).filter(defined);
545545
// Parallelism will be reasonable
546-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
546+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
547547
await Promise.all(imageRepositoryNames.map(r => this.aws.deleteImageRepository(r)));
548548

549549
await this.aws.deleteStacks(

Diff for: ‎packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ test('somewhat balance', async () => {
5151

5252
const keys = Object.keys(counters) as Array<keyof typeof counters> ;
5353
const pool = ResourcePool.withResources(POOL_NAME, keys);
54-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
54+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
5555
await Promise.all(Array.from(range(N)).map(() =>
5656
pool.using(async (x) => {
5757
counters[x] += 1;

Diff for: ‎packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable @aws-cdk/no-literal-partition */
1+
/* eslint-disable @cdklabs/no-literal-partition */
22
import * as fs from 'fs';
33
import * as path from 'path';
44
import { DescribeStackResourcesCommand, DescribeStacksCommand } from '@aws-sdk/client-cloudformation';

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-custom-resources-node-18.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { App, CfnOutput, CustomResource, CustomResourceProvider, CustomResourceP
1010
import { Construct } from 'constructs';
1111
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
1212

13-
/* eslint-disable @aws-cdk/no-core-construct */
13+
/* eslint-disable @cdklabs/no-core-construct */
1414

1515
class TestStack extends Stack {
1616
constructor(scope: Construct, id: string) {

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-custom-resources.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { App, CfnOutput, CustomResource, CustomResourceProvider, Stack, Token }
1010
import { Construct } from 'constructs';
1111
import { STANDARD_CUSTOM_RESOURCE_PROVIDER_RUNTIME } from '../../config';
1212

13-
/* eslint-disable @aws-cdk/no-core-construct */
13+
/* eslint-disable @cdklabs/no-core-construct */
1414

1515
class TestStack extends Stack {
1616
constructor(scope: Construct, id: string) {

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stack.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { App, CfnParameter, NestedStack, Stack } from 'aws-cdk-lib';
66
import { Construct } from 'constructs';
77
import { STANDARD_NODEJS_RUNTIME } from '../../config';
88

9-
/* eslint-disable @aws-cdk/no-core-construct */
9+
/* eslint-disable @cdklabs/no-core-construct */
1010

1111
interface MyNestedStackProps {
1212
readonly subscriber?: sqs.Queue;

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stacks-assets.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { App, NestedStack, Stack } from 'aws-cdk-lib';
44
import { Construct } from 'constructs';
55
import { STANDARD_NODEJS_RUNTIME } from '../../config';
66

7-
/* eslint-disable @aws-cdk/no-core-construct */
7+
/* eslint-disable @cdklabs/no-core-construct */
88

99
class MyNestedStack extends NestedStack {
1010
constructor(scope: Construct, id: string) {

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.nested-stacks-multi.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as sns from 'aws-cdk-lib/aws-sns';
22
import { App, NestedStack, Stack } from 'aws-cdk-lib';
33
import { Construct } from 'constructs';
44

5-
/* eslint-disable @aws-cdk/no-core-construct */
5+
/* eslint-disable @cdklabs/no-core-construct */
66

77
class YourNestedStack extends NestedStack {
88
constructor(scope: Construct, id: string) {

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/test-origin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class TestOrigin extends OriginBase {
1111

1212
export class TestOriginGroup implements IOrigin {
1313
constructor(private readonly primaryDomainName: string, private readonly secondaryDomainName: string) { }
14-
/* eslint-disable @aws-cdk/no-core-construct */
14+
/* eslint-disable @cdklabs/no-core-construct */
1515
public bind(scope: Construct, options: OriginBindOptions): OriginBindConfig {
1616
const primaryOrigin = new TestOrigin(this.primaryDomainName);
1717
const secondaryOrigin = new TestOrigin(this.secondaryDomainName);

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/asset.4d5b294c39db24ed94c9ed774f730bf5be973c88a429f9754ea6461ae81fc3a7/__entrypoint__.js renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/asset.ea1d80e97fa5c08dbdf4ef5f6705b6bf49d07fbc05e7b4917b12359a44437b9d/__entrypoint__.js

File renamed without changes.

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/asset.4d5b294c39db24ed94c9ed774f730bf5be973c88a429f9754ea6461ae81fc3a7/index.js renamed to ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/asset.ea1d80e97fa5c08dbdf4ef5f6705b6bf49d07fbc05e7b4917b12359a44437b9d/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/cdk-s3-bucket-auto-delete-objects.assets.json

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/cdk-s3-bucket-auto-delete-objects.template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
"S3Bucket": {
208208
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
209209
},
210-
"S3Key": "4d5b294c39db24ed94c9ed774f730bf5be973c88a429f9754ea6461ae81fc3a7.zip"
210+
"S3Key": "ea1d80e97fa5c08dbdf4ef5f6705b6bf49d07fbc05e7b4917b12359a44437b9d.zip"
211211
},
212212
"Timeout": 900,
213213
"MemorySize": 128,

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/integ.bucket-auto-delete-objects.js.snapshot/manifest.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎packages/@aws-cdk-testing/framework-integ/test/aws-s3/test/put-objects-handler/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent
2323
async function putObjects(bucketName: string, n = 5) {
2424
// Put n objects in parallel
2525
// Bounded by human input
26-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
26+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
2727
await Promise.all([...Array(n).keys()]
2828
.map(key => s3.putObject({
2929
Bucket: bucketName,

Diff for: ‎packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query-provider/privileges.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ export async function handler(props: UserTablePrivilegesHandlerProps & ClusterPr
3333

3434
async function revokePrivileges(username: string, tablePrivileges: TablePrivilege[], clusterProps: ClusterProps) {
3535
// Limited by human input
36-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
36+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
3737
await Promise.all(tablePrivileges.map(({ tableName, actions }) => {
3838
return executeStatement(`REVOKE ${actions.join(', ')} ON ${tableName} FROM ${username}`, clusterProps);
3939
}));
4040
}
4141

4242
async function grantPrivileges(username: string, tablePrivileges: TablePrivilege[], clusterProps: ClusterProps) {
4343
// Limited by human input
44-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
44+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
4545
await Promise.all(tablePrivileges.map(({ tableName, actions }) => {
4646
return executeStatement(`GRANT ${actions.join(', ')} ON ${tableName} TO ${username}`, clusterProps);
4747
}));

Diff for: ‎packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query-provider/table.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ async function updateTable(
211211
}
212212

213213
// Limited by human input
214-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
214+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
215215
await Promise.all(alterationStatements.map(statement => executeStatement(statement, tableAndClusterProps)));
216216

217217
if (isTableV2) {

Diff for: ‎packages/@aws-cdk/cloudformation-diff/lib/iam/statement.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export function parseLambdaPermission(x: any): Statement {
170170
statement.Principal = '*';
171171
} else if (/^\d{12}$/.test(x.Principal)) {
172172
// Account number
173-
// eslint-disable-next-line @aws-cdk/no-literal-partition
173+
// eslint-disable-next-line @cdklabs/no-literal-partition
174174
statement.Principal = { AWS: `arn:aws:iam::${x.Principal}:root` };
175175
} else {
176176
// Assume it's a service principal

Diff for: ‎packages/@aws-cdk/custom-resource-handlers/lib/core/cross-region-ssm-reader-handler/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent
5151
*/
5252
async function addTags(ssm: SSM, parameters: string[], keyName: string): Promise<void> {
5353
const limit = pLimit(10);
54-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
54+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
5555
await Promise.all(parameters.map((name) => limit(async () => {
5656
try {
5757
return await ssm.addTagsToResource({
@@ -73,7 +73,7 @@ async function addTags(ssm: SSM, parameters: string[], keyName: string): Promise
7373
*/
7474
async function removeTags(ssm: SSM, parameters: string[], keyName: string): Promise<void> {
7575
const limit = pLimit(10);
76-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
76+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
7777
await Promise.all(parameters.map(name => limit(async() => {
7878
try {
7979
return await ssm.removeTagsFromResource({

Diff for: ‎packages/@aws-cdk/integ-runner/lib/runner/runner-base.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable @aws-cdk/no-literal-partition */
1+
/* eslint-disable @cdklabs/no-literal-partition */
22
import * as path from 'path';
33
import { CdkCliWrapper, ICdk } from '@aws-cdk/cdk-cli-wrapper';
44
import { TestCase, DefaultCdkOptions } from '@aws-cdk/cloud-assembly-schema';

Diff for: ‎packages/@aws-cdk/integ-runner/lib/workers/integ-snapshot-worker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export async function runSnapshotTests(
2121
});
2222

2323
// The worker pool is already limited
24-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
24+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
2525
const failedTests: IntegTestWorkerConfig[][] = await Promise.all(
2626
tests.map((test) => pool.exec('snapshotTestWorker', [test.info /* Dehydrate class -> data */, options], {
2727
on: (x) => {

Diff for: ‎packages/@aws-cdk/integ-runner/lib/workers/integ-test-worker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export async function runIntegrationTestsInParallel(
156156

157157
const workers = accountWorkers.map((worker) => runTest(worker));
158158
// Workers are their own concurrency limits
159-
// eslint-disable-next-line @aws-cdk/promiseall-no-unbounded-parallelism
159+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
160160
await Promise.all(workers);
161161
return results;
162162
}

Diff for: ‎packages/aws-cdk-lib/aws-appconfig/lib/application.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable @aws-cdk/no-literal-partition */
1+
/* eslint-disable @cdklabs/no-literal-partition */
22
import { Construct } from 'constructs';
33
import { CfnApplication } from './appconfig.generated';
44
import { HostedConfiguration, HostedConfigurationOptions, SourcedConfiguration, SourcedConfigurationOptions } from './configuration';

Diff for: ‎packages/aws-cdk-lib/aws-cloudformation/test/nested-stack.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { App, CfnParameter, CfnResource, ContextProvider, LegacyStackSynthesizer
99
import * as cxapi from '../../cx-api';
1010
import { NestedStack } from '../lib/nested-stack';
1111

12-
/* eslint-disable @aws-cdk/no-core-construct */
12+
/* eslint-disable @cdklabs/no-core-construct */
1313
/* eslint-disable max-len */
1414

1515
describeDeprecated('NestedStack', () => {

Diff for: ‎packages/aws-cdk-lib/aws-cloudformation/test/resource.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as sns from '../../aws-sns';
66
import * as cdk from '../../core';
77
import { CustomResource, CustomResourceProvider } from '../lib';
88

9-
/* eslint-disable @aws-cdk/no-core-construct */
9+
/* eslint-disable @cdklabs/no-core-construct */
1010
/* eslint-disable quote-props */
1111

1212
describeDeprecated('custom resources honor removalPolicy', () => {

Diff for: ‎packages/aws-cdk-lib/aws-cloudfront/test/test-origin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class TestOrigin extends OriginBase {
1111

1212
export class TestOriginGroup implements IOrigin {
1313
constructor(private readonly primaryDomainName: string, private readonly secondaryDomainName: string) { }
14-
/* eslint-disable @aws-cdk/no-core-construct */
14+
/* eslint-disable @cdklabs/no-core-construct */
1515
public bind(scope: Construct, options: OriginBindOptions): OriginBindConfig {
1616
const primaryOrigin = new TestOrigin(this.primaryDomainName);
1717
const secondaryOrigin = new TestOrigin(this.secondaryDomainName);

Diff for: ‎packages/aws-cdk-lib/aws-eks/lib/alb-controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ export class AlbController extends Construct {
369369
// This is safe to disable because we're actually replacing the literal partition with a reference to
370370
// the stack partition (which is hardcoded into the JSON files) to prevent issues such as
371371
// aws/aws-cdk#22520.
372-
// eslint-disable-next-line @aws-cdk/no-literal-partition
372+
// eslint-disable-next-line @cdklabs/no-literal-partition
373373
const rewriteResource = (s: string) => s.replace('arn:aws:', `arn:${Aws.PARTITION}:`);
374374

375375
if (!resources) {

Diff for: ‎packages/aws-cdk-lib/aws-eks/lib/managed-nodegroup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ export class Nodegroup extends Resource implements INodegroup {
455455
// https://docs.aws.amazon.com/eks/latest/userguide/cni-iam-role.html
456456
if (props.cluster.ipFamily == IpFamily.IP_V6) {
457457
ngRole.addToPrincipalPolicy(new PolicyStatement({
458-
// eslint-disable-next-line @aws-cdk/no-literal-partition
458+
// eslint-disable-next-line @cdklabs/no-literal-partition
459459
resources: ['arn:aws:ec2:*:*:network-interface/*'],
460460
actions: [
461461
'ec2:AssignIpv6Addresses',

Diff for: ‎packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-listener.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export abstract class BaseListener extends Resource implements IListener {
9999
loadBalancerType: options.loadBalancerType,
100100
} as cxschema.LoadBalancerListenerContextQuery,
101101
dummyValue: {
102-
// eslint-disable-next-line @aws-cdk/no-literal-partition
102+
// eslint-disable-next-line @cdklabs/no-literal-partition
103103
listenerArn: `arn:aws:elasticloadbalancing:us-west-2:123456789012:listener/${options.loadBalancerType}/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2`,
104104
listenerPort: 80,
105105
securityGroupIds: ['sg-123456789012'],

Diff for: ‎packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export abstract class BaseLoadBalancer extends Resource {
147147
} as cxschema.LoadBalancerContextQuery,
148148
dummyValue: {
149149
ipAddressType: cxapi.LoadBalancerIpAddressType.DUAL_STACK,
150-
// eslint-disable-next-line @aws-cdk/no-literal-partition
150+
// eslint-disable-next-line @cdklabs/no-literal-partition
151151
loadBalancerArn: `arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/${options.loadBalancerType}/my-load-balancer/50dc6c495c0c9188`,
152152
loadBalancerCanonicalHostedZoneId: 'Z3DZXE0EXAMPLE',
153153
loadBalancerDnsName: 'my-load-balancer-1234567890.us-west-2.elb.amazonaws.com',

Diff for: ‎packages/aws-cdk-lib/aws-events/test/rule.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ describe('rule', () => {
11941194
});
11951195

11961196
class SomeTarget implements IRuleTarget {
1197-
// eslint-disable-next-line @aws-cdk/no-core-construct
1197+
// eslint-disable-next-line @cdklabs/no-core-construct
11981198
public constructor(private readonly id?: string, private readonly resource?: IConstruct) {
11991199
}
12001200

Diff for: ‎packages/aws-cdk-lib/aws-secretsmanager/lib/secret-rotation.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export class SecretRotationApplication {
131131

132132
constructor(applicationId: string, semanticVersion: string, options?: SecretRotationApplicationOptions) {
133133
// partitions are handled explicitly via applicationArnForPartition()
134-
// eslint-disable-next-line @aws-cdk/no-literal-partition
134+
// eslint-disable-next-line @cdklabs/no-literal-partition
135135
this.applicationId = `arn:aws:serverlessrepo:us-east-1:297356227824:applications/${applicationId}`;
136136
this.semanticVersion = semanticVersion;
137137
this.applicationName = applicationId;

Diff for: ‎packages/aws-cdk-lib/core/lib/arn.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export enum ArnFormat {
1515
* even if it contains slashes,
1616
* like in 'arn:aws:s3:::bucket/object.zip'.
1717
*/
18-
// eslint-disable-next-line @aws-cdk/no-literal-partition
18+
// eslint-disable-next-line @cdklabs/no-literal-partition
1919
NO_RESOURCE_NAME = 'arn:aws:service:region:account:resource',
2020

2121
/**
@@ -26,7 +26,7 @@ export enum ArnFormat {
2626
* even if it contains slashes,
2727
* like in 'arn:aws:apigateway:region:account:resource:/test/mydemoresource/*'.
2828
*/
29-
// eslint-disable-next-line @aws-cdk/no-literal-partition
29+
// eslint-disable-next-line @cdklabs/no-literal-partition
3030
COLON_RESOURCE_NAME = 'arn:aws:service:region:account:resource:resourceName',
3131

3232
/**
@@ -37,7 +37,7 @@ export enum ArnFormat {
3737
* even if it contains colons,
3838
* like in 'arn:aws:cognito-sync:region:account:identitypool/us-east-1:1a1a1a1a-ffff-1111-9999-12345678:bla'.
3939
*/
40-
// eslint-disable-next-line @aws-cdk/no-literal-partition
40+
// eslint-disable-next-line @cdklabs/no-literal-partition
4141
SLASH_RESOURCE_NAME = 'arn:aws:service:region:account:resource/resourceName',
4242

4343
/**
@@ -47,7 +47,7 @@ export enum ArnFormat {
4747
* Like in: 'arn:aws:service:region:account:/resource/resourceName'.
4848
* Note that the leading slash is _not_ included in the parsed 'resource' part.
4949
*/
50-
// eslint-disable-next-line @aws-cdk/no-literal-partition
50+
// eslint-disable-next-line @cdklabs/no-literal-partition
5151
SLASH_RESOURCE_SLASH_RESOURCE_NAME = 'arn:aws:service:region:account:/resource/resourceName',
5252
}
5353

Diff for: ‎packages/aws-cdk-lib/cx-api/build-tools/update-vnext.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { MAGIC_V2NEXT } from '../lib/private/flag-modeling';
88
async function main() {
99
const featuresSourceFile = path.join(__dirname, '..', 'lib', 'features.ts');
1010

11-
// eslint-disable-next-line @aws-cdk/no-invalid-path
11+
// eslint-disable-next-line @cdklabs/no-invalid-path
1212
let currentv2: string | undefined = JSON.parse(await fs.readFile(path.join(__dirname, '..', '..', '..', '..', 'version.v2.json'), { encoding: 'utf-8' })).version;
1313
currentv2 = currentv2?.match(/^[0-9\.]+/)?.[0]; // Make sure to only retain the actual version number, not any '-rc.X' suffix
1414

0 commit comments

Comments
 (0)