Skip to content

Commit 56988c8

Browse files
akash1810dependabot[bot]
authored andcommitted
chore: Fix new import/order lint errors
This version of eslint-plugin-import prefers `import` statements to appear before `import type`. This change fixes these linting errors. See: - import-js/eslint-plugin-import#2021
1 parent 876efcd commit 56988c8

Some content is hidden

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

78 files changed

+137
-137
lines changed

src/constructs/acm/certificate.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SynthUtils } from "@aws-cdk/assert";
22
import { Stage } from "../../constants";
3-
import type { SynthedStack } from "../../utils/test";
43
import { simpleGuStackForTesting } from "../../utils/test";
54
import { GuCertificate } from "./certificate";
5+
import type { SynthedStack } from "../../utils/test";
66

77
describe("The GuCertificate class", () => {
88
it("should create a new certificate when hosted zone ids are provided", () => {

src/constructs/acm/certificate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Certificate, CertificateValidation } from "@aws-cdk/aws-certificatemanager";
2-
import type { CertificateProps } from "@aws-cdk/aws-certificatemanager/lib/certificate";
32
import { HostedZone } from "@aws-cdk/aws-route53";
43
import { RemovalPolicy } from "@aws-cdk/core";
54
import { Stage } from "../../constants";
65
import { GuStatefulMigratableConstruct } from "../../utils/mixin";
7-
import type { GuStack } from "../core";
86
import { AppIdentity } from "../core/identity";
7+
import type { GuStack } from "../core";
98
import type { GuMigratingResource } from "../core/migrating";
9+
import type { CertificateProps } from "@aws-cdk/aws-certificatemanager/lib/certificate";
1010

1111
export type GuCertificateProps = Record<Stage, GuDnsValidatedCertificateProps> & GuMigratingResource;
1212
export type GuCertificatePropsWithApp = GuCertificateProps & AppIdentity;

src/constructs/autoscaling/asg.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { InstanceType, UserData, Vpc } from "@aws-cdk/aws-ec2";
55
import { ApplicationProtocol } from "@aws-cdk/aws-elasticloadbalancingv2";
66
import { Stack } from "@aws-cdk/core";
77
import { Stage } from "../../constants";
8-
import type { Resource, SynthedStack } from "../../utils/test";
98
import { findResourceByTypeAndLogicalId, simpleGuStackForTesting } from "../../utils/test";
10-
import type { AppIdentity } from "../core/identity";
119
import { GuSecurityGroup } from "../ec2";
1210
import { GuAllowPolicy, GuInstanceRole } from "../iam";
1311
import { GuApplicationTargetGroup } from "../loadbalancing";
14-
import type { GuAutoScalingGroupProps } from "./asg";
1512
import { GuAutoScalingGroup } from "./";
13+
import type { Resource, SynthedStack } from "../../utils/test";
14+
import type { AppIdentity } from "../core/identity";
15+
import type { GuAutoScalingGroupProps } from "./asg";
1616

1717
describe("The GuAutoScalingGroup", () => {
1818
const vpc = Vpc.fromVpcAttributes(new Stack(), "VPC", {

src/constructs/autoscaling/asg.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import type { AutoScalingGroupProps, CfnAutoScalingGroup } from "@aws-cdk/aws-autoscaling";
21
import { AutoScalingGroup } from "@aws-cdk/aws-autoscaling";
3-
import type { ISecurityGroup, MachineImage, MachineImageConfig } from "@aws-cdk/aws-ec2";
42
import { InstanceType, OperatingSystemType, UserData } from "@aws-cdk/aws-ec2";
5-
import type { ApplicationTargetGroup } from "@aws-cdk/aws-elasticloadbalancingv2";
63
import { Stage } from "../../constants";
74
import { GuStatefulMigratableConstruct } from "../../utils/mixin";
8-
import type { GuStack } from "../core";
95
import { GuAmiParameter, GuInstanceTypeParameter } from "../core";
106
import { AppIdentity } from "../core/identity";
11-
import type { GuMigratingResource } from "../core/migrating";
127
import { GuHttpsEgressSecurityGroup, GuWazuhAccess } from "../ec2";
138
import { GuInstanceRole } from "../iam";
9+
import type { GuStack } from "../core";
10+
import type { GuMigratingResource } from "../core/migrating";
11+
import type { AutoScalingGroupProps, CfnAutoScalingGroup } from "@aws-cdk/aws-autoscaling";
12+
import type { ISecurityGroup, MachineImage, MachineImageConfig } from "@aws-cdk/aws-ec2";
13+
import type { ApplicationTargetGroup } from "@aws-cdk/aws-elasticloadbalancingv2";
1414

1515
// Since we want to override the types of what gets passed in for the below props,
1616
// we need to use Omit<T, U> to remove them from the interface this extends

src/constructs/autoscaling/user-data.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { Stage } from "../../constants";
55
import { simpleGuStackForTesting } from "../../utils/test";
66
import { GuPrivateConfigBucketParameter } from "../core";
77
import { GuAutoScalingGroup } from "./asg";
8-
import type { GuUserDataPropsWithApp } from "./user-data";
98
import { GuUserData } from "./user-data";
9+
import type { GuUserDataPropsWithApp } from "./user-data";
1010

1111
describe("GuUserData", () => {
1212
const vpc = Vpc.fromVpcAttributes(new Stack(), "VPC", {

src/constructs/autoscaling/user-data.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import type { S3DownloadOptions } from "@aws-cdk/aws-ec2";
21
import { UserData } from "@aws-cdk/aws-ec2";
32
import { Bucket } from "@aws-cdk/aws-s3";
4-
import type { GuDistributableForEc2 } from "../../types/distributable";
53
import { GuDistributable } from "../../types/distributable";
4+
import { GuDistributionBucketParameter } from "../core";
5+
import type { GuDistributableForEc2 } from "../../types/distributable";
66
import type { GuPrivateS3ConfigurationProps } from "../../utils/ec2";
77
import type { GuStack } from "../core";
8-
import { GuDistributionBucketParameter } from "../core";
98
import type { AppIdentity } from "../core/identity";
9+
import type { S3DownloadOptions } from "@aws-cdk/aws-ec2";
1010

1111
export type GuUserDataPropsWithApp = GuUserDataProps & AppIdentity;
1212
export interface GuUserDataProps {

src/constructs/cloudwatch/alarm.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import "@aws-cdk/assert/jest";
22
import { SynthUtils } from "@aws-cdk/assert";
33
import { ComparisonOperator } from "@aws-cdk/aws-cloudwatch";
44
import { Runtime } from "@aws-cdk/aws-lambda";
5-
import type { SynthedStack } from "../../utils/test";
65
import { simpleGuStackForTesting } from "../../utils/test";
76
import { GuLambdaFunction } from "../lambda";
87
import { GuAlarm } from "./alarm";
8+
import type { SynthedStack } from "../../utils/test";
99

1010
describe("The GuAlarm class", () => {
1111
it("should create a CloudWatch alarm", () => {

src/constructs/cloudwatch/alarm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { AlarmProps } from "@aws-cdk/aws-cloudwatch";
21
import { Alarm } from "@aws-cdk/aws-cloudwatch";
32
import { SnsAction } from "@aws-cdk/aws-cloudwatch-actions";
4-
import type { ITopic } from "@aws-cdk/aws-sns";
53
import { Topic } from "@aws-cdk/aws-sns";
64
import { Stage } from "../../constants";
75
import type { GuStack, GuStageDependentValue } from "../core";
6+
import type { AlarmProps } from "@aws-cdk/aws-cloudwatch";
7+
import type { ITopic } from "@aws-cdk/aws-sns";
88

99
export interface GuAlarmProps extends AlarmProps {
1010
snsTopicName: string;

src/constructs/cloudwatch/ec2-alarms.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { SynthUtils } from "@aws-cdk/assert";
33
import { Vpc } from "@aws-cdk/aws-ec2";
44
import { Stack } from "@aws-cdk/core";
55
import { simpleGuStackForTesting } from "../../utils/test";
6-
import type { AppIdentity } from "../core/identity";
76
import { GuApplicationLoadBalancer } from "../loadbalancing";
87
import { Gu5xxPercentageAlarm } from "./ec2-alarms";
8+
import type { AppIdentity } from "../core/identity";
99

1010
const vpc = Vpc.fromVpcAttributes(new Stack(), "VPC", {
1111
vpcId: "test",

src/constructs/cloudwatch/ec2-alarms.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { ComparisonOperator, MathExpression, TreatMissingData } from "@aws-cdk/aws-cloudwatch";
22
import { HttpCodeElb, HttpCodeTarget } from "@aws-cdk/aws-elasticloadbalancingv2";
33
import { Duration } from "@aws-cdk/core";
4+
import { GuAlarm } from "./alarm";
45
import type { GuStack } from "../core";
56
import type { AppIdentity } from "../core/identity";
67
import type { GuApplicationLoadBalancer } from "../loadbalancing";
78
import type { GuAlarmProps } from "./alarm";
8-
import { GuAlarm } from "./alarm";
99

1010
export interface Gu5xxPercentageMonitoringProps
1111
extends Omit<GuAlarmProps, "evaluationPeriods" | "metric" | "period" | "threshold" | "treatMissingData"> {

0 commit comments

Comments
 (0)