Skip to content

Commit

Permalink
chore: eslint import-sort updates
Browse files Browse the repository at this point in the history
  • Loading branch information
hoonoh committed Dec 8, 2021
1 parent 78063bf commit 3ee4969
Show file tree
Hide file tree
Showing 16 changed files with 55 additions and 454 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
ignorePatterns: ['husky/*']

env:
es6: true
node: true
Expand All @@ -26,6 +24,7 @@ plugins:
- unused-imports
- '@typescript-eslint'
- prettier
- simple-import-sort

rules:
import/extensions: 0
Expand All @@ -34,6 +33,8 @@ rules:
no-console: 0
no-param-reassign: 0
prettier/prettier: error
simple-import-sort/imports: 2
simple-import-sort/exports: 2

# eslint-plugin-unused-imports
'@typescript-eslint/no-unused-vars': off
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,16 @@
"eslint-plugin-import": "2.25.3",
"eslint-plugin-jest": "25.3.0",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"eslint-plugin-unused-imports": "2.0.0",
"husky": "7.0.4",
"import-sort-style-module": "6.0.0",
"jest": "27.3.1",
"jest-junit": "13.0.0",
"jest-mock-console": "1.2.3",
"lodash": "4.17.21",
"nock": "13.2.1",
"ora": "5.4.1",
"prettier": "2.5.0",
"prettier-plugin-import-sort": "0.0.7",
"prompts": "2.4.2",
"semantic-release": "18.0.1",
"table": "6.7.3",
Expand Down
3 changes: 1 addition & 2 deletions scripts/generate-ec2-info.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { writeFileSync } from 'fs';
import { resolve } from 'path';

import prettier from 'prettier';
import { defaultRegions } from '../src/constants/regions';

import { defaultRegions } from '../src/constants/regions';
import { getEc2Info } from '../src/lib/core';

(async () => {
Expand Down
1 change: 0 additions & 1 deletion scripts/generate-ec2-types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { writeFileSync } from 'fs';
import { resolve } from 'path';

import prettier from 'prettier';

import { getGlobalSpotPrices } from '../src/lib/core';
Expand Down
4 changes: 1 addition & 3 deletions scripts/generate-regions.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import EC2 from 'aws-sdk/clients/ec2';
import { writeFileSync } from 'fs';
import { resolve } from 'path';

import prettier from 'prettier';

import EC2 from 'aws-sdk/clients/ec2';

// https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services/
// https://a0.awsstatic.com/plc/js/1.0.104/plc/plc-setup.js // find convertRegion -> regionMap
const knownRegionNames: Record<string, string> = {
Expand Down
7 changes: 3 additions & 4 deletions scripts/generate-spot-prices-mock-data.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { readFileSync, writeFileSync } from 'fs';
import { resolve } from 'path';

import EC2 from 'aws-sdk/clients/ec2';
import { readFileSync, writeFileSync } from 'fs';
import { find, uniqWith, xorWith } from 'lodash';
import { resolve } from 'path';
import yargs from 'yargs/yargs';

import { Region, defaultRegions } from '../src/constants/regions';
import { defaultRegions, Region } from '../src/constants/regions';

let allPrices: EC2.SpotPrice[] = [];

Expand Down
9 changes: 4 additions & 5 deletions src/cli.spec.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { spawnSync } from 'child_process';
import { resolve } from 'path';

import mockConsole, { RestoreConsole } from 'jest-mock-console';
import { resolve } from 'path';

import { mockAwsCredentials, mockAwsCredentialsClear } from '../test/mock-credential-endpoints';
import { consoleMockCallJoin } from '../test/utils';
import { main } from './cli';
import { ec2Info, Ec2InstanceInfo } from './constants/ec2-info';
import {
mockDefaultRegionEndpoints,
mockDefaultRegionEndpointsClear,
} from '../test/mock-ec2-endpoints';
import { consoleMockCallJoin } from '../test/utils';
import { main } from './cli';
import { ec2Info, Ec2InstanceInfo } from './constants/ec2-info';

describe('cli', () => {
describe('test by import', () => {
Expand Down
21 changes: 10 additions & 11 deletions src/cli.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
import { sep } from 'path';

import ora from 'ora';
import { sep } from 'path';
import { ColumnUserConfig, Indexable, table } from 'table';
import yargs from 'yargs/yargs';

import { ui } from './lib/ui';
import {
AuthError,
Ec2SpotPriceError,
InstanceFamily,
InstanceFamilyType,
InstanceSize,
InstanceType,
Platform,
PlatformsWildcards,
Region,
allInstances,
allPlatforms,
allRegions,
AuthError,
awsCredentialsCheck,
defaults,
Ec2SpotPriceError,
generateTypeSizeSetsFromFamily,
getGlobalSpotPrices,
InstanceFamily,
instanceFamily,
InstanceFamilyType,
instanceFamilyTypes,
instanceOfPlatforms,
InstanceSize,
instanceSizes,
InstanceType,
Platform,
PlatformsWildcards,
platformWildcards,
Region,
regionNames,
} from './module';

Expand Down
4 changes: 2 additions & 2 deletions src/lib/core.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import EC2 from 'aws-sdk/clients/ec2';
import { AWSError } from 'aws-sdk/lib/error';
import { PromiseResult } from 'aws-sdk/lib/request';
import { ec2Info, Ec2InstanceInfo } from '../constants/ec2-info';

import { ec2Info, Ec2InstanceInfo } from '../constants/ec2-info';
import { InstanceFamilyType, InstanceSize, InstanceType } from '../constants/ec2-types';
import { Platform } from '../constants/platform';
import { Region, defaultRegions } from '../constants/regions';
import { defaultRegions, Region } from '../constants/regions';
import { generateInstantTypesFromFamilyTypeSize } from './utils';

const sortSpotPrice = (p1: EC2.SpotPrice, p2: EC2.SpotPrice): number => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/ui.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {
InstanceSize,
allInstances,
instanceFamily,
instanceFamilyCompute,
instanceFamilyGeneral,
instanceFamilyMemory,
InstanceSize,
} from '../constants/ec2-types';
import { ui } from './ui';

Expand Down
8 changes: 4 additions & 4 deletions src/lib/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import { Choice, prompt } from 'prompts';

import {
InstanceFamily,
InstanceFamilyType,
InstanceSize,
instanceFamily,
InstanceFamilyType,
instanceFamilyTypes,
InstanceSize,
instanceSizes,
} from '../constants/ec2-types';
import { Platform, allPlatforms } from '../constants/platform';
import { Region, allRegions, regionNames } from '../constants/regions';
import { allPlatforms, Platform } from '../constants/platform';
import { allRegions, Region, regionNames } from '../constants/regions';
import { defaults } from './core';
import { generateTypeSizeSetsFromFamily } from './utils';

Expand Down
4 changes: 2 additions & 2 deletions src/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {
allInstances,
InstanceFamily,
instanceFamily,
InstanceFamilyType,
InstanceSize,
InstanceType,
allInstances,
instanceFamily,
} from '../constants/ec2-types';

export const generateTypeSizeSetsFromFamily = (
Expand Down
6 changes: 3 additions & 3 deletions src/module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// export { getGlobalSpotPrices } from './lib/core';
export * from './lib/core';
export * from './lib/credential';
export * from './lib/utils';
export * from './constants/ec2-types';
export * from './constants/platform';
export * from './constants/regions';
export * from './lib/core';
export * from './lib/credential';
export * from './lib/utils';
5 changes: 2 additions & 3 deletions test/mock-credential-endpoints.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import fs from 'fs';
import { sep } from 'path';

import { config } from 'aws-sdk';
import fs from 'fs';
import nock from 'nock';
import { sep } from 'path';

let readFileSyncMock: jest.SpyInstance;

Expand Down
9 changes: 4 additions & 5 deletions test/mock-ec2-endpoints.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { readFileSync } from 'fs';
import { resolve } from 'path';
import { parse } from 'querystring';

import { SpotPrice } from 'aws-sdk/clients/ec2';
import { readFileSync } from 'fs';
import { filter } from 'lodash';
import nock from 'nock';
import { resolve } from 'path';
import { parse } from 'querystring';

import { Region, allRegions, defaultRegions } from '../src/constants/regions';
import { allRegions, defaultRegions, Region } from '../src/constants/regions';
import { mockAwsCredentials, mockAwsCredentialsClear } from './mock-credential-endpoints';

const data = JSON.parse(
Expand Down
Loading

0 comments on commit 3ee4969

Please sign in to comment.