Skip to content

Commit bea96e2

Browse files
davidgamerodavidgamero
committed
Switch tsconfig to NodeNext module resolution
Change module/moduleResolution from ES2022/bundler to NodeNext/NodeNext and target from ES2022 to ES2020. - Add .js extensions to all relative imports across 59 source/test files (required by NodeNext module resolution) - Add vitest/globals to tsconfig types array for global test API declarations
1 parent cce7b00 commit bea96e2

31 files changed

Lines changed: 185 additions & 178 deletions

‎src/actions/deploy.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import * as core from '@actions/core'
2-
import * as models from '../types/kubernetesTypes'
3-
import * as KubernetesConstants from '../types/kubernetesTypes'
4-
import {Kubectl, Resource} from '../types/kubectl'
2+
import * as models from '../types/kubernetesTypes.js'
3+
import * as KubernetesConstants from '../types/kubernetesTypes.js'
4+
import {Kubectl, Resource} from '../types/kubectl.js'
55
import {
66
getResources,
77
updateManifestFiles
8-
} from '../utilities/manifestUpdateUtils'
8+
} from '../utilities/manifestUpdateUtils.js'
99
import {
1010
annotateAndLabelResources,
1111
checkManifestStability,
1212
deployManifests
13-
} from '../strategyHelpers/deploymentHelper'
14-
import {DeploymentStrategy} from '../types/deploymentStrategy'
15-
import {parseTrafficSplitMethod} from '../types/trafficSplitMethod'
16-
import {ClusterType} from '../inputUtils'
13+
} from '../strategyHelpers/deploymentHelper.js'
14+
import {DeploymentStrategy} from '../types/deploymentStrategy.js'
15+
import {parseTrafficSplitMethod} from '../types/trafficSplitMethod.js'
16+
import {ClusterType} from '../inputUtils.js'
1717
export const ResourceTypeManagedCluster =
1818
'Microsoft.ContainerService/managedClusters'
1919
export const ResourceTypeFleet = 'Microsoft.ContainerService/fleets'

‎src/actions/promote.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
import * as core from '@actions/core'
2-
import * as canaryDeploymentHelper from '../strategyHelpers/canary/canaryHelper'
3-
import * as SMICanaryDeploymentHelper from '../strategyHelpers/canary/smiCanaryHelper'
4-
import * as PodCanaryHelper from '../strategyHelpers/canary/podCanaryHelper'
2+
import * as canaryDeploymentHelper from '../strategyHelpers/canary/canaryHelper.js'
3+
import * as SMICanaryDeploymentHelper from '../strategyHelpers/canary/smiCanaryHelper.js'
4+
import * as PodCanaryHelper from '../strategyHelpers/canary/podCanaryHelper.js'
55
import {
66
getResources,
77
updateManifestFiles
8-
} from '../utilities/manifestUpdateUtils'
9-
import {annotateAndLabelResources} from '../strategyHelpers/deploymentHelper'
10-
import * as models from '../types/kubernetesTypes'
11-
import * as KubernetesManifestUtility from '../utilities/manifestStabilityUtils'
8+
} from '../utilities/manifestUpdateUtils.js'
9+
import {annotateAndLabelResources} from '../strategyHelpers/deploymentHelper.js'
10+
import * as models from '../types/kubernetesTypes.js'
11+
import * as KubernetesManifestUtility from '../utilities/manifestStabilityUtils.js'
1212
import {
1313
deleteGreenObjects,
1414
getManifestObjects,
1515
NONE_LABEL_VALUE
16-
} from '../strategyHelpers/blueGreen/blueGreenHelper'
16+
} from '../strategyHelpers/blueGreen/blueGreenHelper.js'
1717

18-
import {BlueGreenManifests} from '../types/blueGreenTypes'
19-
import {DeployResult} from '../types/deployResult'
18+
import {BlueGreenManifests} from '../types/blueGreenTypes.js'
19+
import {DeployResult} from '../types/deployResult.js'
2020

2121
import {
2222
promoteBlueGreenIngress,
2323
promoteBlueGreenService,
2424
promoteBlueGreenSMI
25-
} from '../strategyHelpers/blueGreen/promote'
25+
} from '../strategyHelpers/blueGreen/promote.js'
2626

2727
import {
2828
routeBlueGreenService,
2929
routeBlueGreenIngressUnchanged,
3030
routeBlueGreenSMI
31-
} from '../strategyHelpers/blueGreen/route'
31+
} from '../strategyHelpers/blueGreen/route.js'
3232

33-
import {cleanupSMI} from '../strategyHelpers/blueGreen/smiBlueGreenHelper'
34-
import {Kubectl, Resource} from '../types/kubectl'
35-
import {DeploymentStrategy} from '../types/deploymentStrategy'
33+
import {cleanupSMI} from '../strategyHelpers/blueGreen/smiBlueGreenHelper.js'
34+
import {Kubectl, Resource} from '../types/kubectl.js'
35+
import {DeploymentStrategy} from '../types/deploymentStrategy.js'
3636
import {
3737
parseTrafficSplitMethod,
3838
TrafficSplitMethod
39-
} from '../types/trafficSplitMethod'
40-
import {parseRouteStrategy, RouteStrategy} from '../types/routeStrategy'
41-
import {ClusterType} from '../inputUtils'
39+
} from '../types/trafficSplitMethod.js'
40+
import {parseRouteStrategy, RouteStrategy} from '../types/routeStrategy.js'
41+
import {ClusterType} from '../inputUtils.js'
4242

4343
export async function promote(
4444
kubectl: Kubectl,

‎src/actions/reject.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import * as core from '@actions/core'
2-
import * as canaryDeploymentHelper from '../strategyHelpers/canary/canaryHelper'
3-
import * as SMICanaryDeploymentHelper from '../strategyHelpers/canary/smiCanaryHelper'
4-
import {Kubectl} from '../types/kubectl'
5-
import {BlueGreenManifests} from '../types/blueGreenTypes'
2+
import * as canaryDeploymentHelper from '../strategyHelpers/canary/canaryHelper.js'
3+
import * as SMICanaryDeploymentHelper from '../strategyHelpers/canary/smiCanaryHelper.js'
4+
import {Kubectl} from '../types/kubectl.js'
5+
import {BlueGreenManifests} from '../types/blueGreenTypes.js'
66
import {
77
rejectBlueGreenIngress,
88
rejectBlueGreenService,
99
rejectBlueGreenSMI
10-
} from '../strategyHelpers/blueGreen/reject'
11-
import {getManifestObjects} from '../strategyHelpers/blueGreen/blueGreenHelper'
12-
import {DeploymentStrategy} from '../types/deploymentStrategy'
10+
} from '../strategyHelpers/blueGreen/reject.js'
11+
import {getManifestObjects} from '../strategyHelpers/blueGreen/blueGreenHelper.js'
12+
import {DeploymentStrategy} from '../types/deploymentStrategy.js'
1313
import {
1414
parseTrafficSplitMethod,
1515
TrafficSplitMethod
16-
} from '../types/trafficSplitMethod'
17-
import {parseRouteStrategy, RouteStrategy} from '../types/routeStrategy'
16+
} from '../types/trafficSplitMethod.js'
17+
import {parseRouteStrategy, RouteStrategy} from '../types/routeStrategy.js'
1818

1919
export async function reject(
2020
kubectl: Kubectl,

‎src/inputUtils.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import * as core from '@actions/core'
2-
import {parseAnnotations} from './types/annotations'
3-
import {ResourceTypeFleet, ResourceTypeManagedCluster} from './actions/deploy'
2+
import {parseAnnotations} from './types/annotations.js'
3+
import {
4+
ResourceTypeFleet,
5+
ResourceTypeManagedCluster
6+
} from './actions/deploy.js'
47

58
export const inputAnnotations = parseAnnotations(
69
core.getInput('annotations', {required: false})

‎src/run.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import * as core from '@actions/core'
2-
import {getKubectlPath, Kubectl} from './types/kubectl'
2+
import {getKubectlPath, Kubectl} from './types/kubectl.js'
33
import {
44
deploy,
55
ResourceTypeFleet,
66
ResourceTypeManagedCluster
7-
} from './actions/deploy'
8-
import {ClusterType} from './inputUtils'
9-
import {promote} from './actions/promote'
10-
import {reject} from './actions/reject'
11-
import {Action, parseAction} from './types/action'
12-
import {parseDeploymentStrategy} from './types/deploymentStrategy'
13-
import {getFilesFromDirectoriesAndURLs} from './utilities/fileUtils'
14-
import {PrivateKubectl} from './types/privatekubectl'
15-
import {parseResourceTypeInput} from './inputUtils'
16-
import {parseDuration} from './utilities/durationUtils'
7+
} from './actions/deploy.js'
8+
import {ClusterType} from './inputUtils.js'
9+
import {promote} from './actions/promote.js'
10+
import {reject} from './actions/reject.js'
11+
import {Action, parseAction} from './types/action.js'
12+
import {parseDeploymentStrategy} from './types/deploymentStrategy.js'
13+
import {getFilesFromDirectoriesAndURLs} from './utilities/fileUtils.js'
14+
import {PrivateKubectl} from './types/privatekubectl.js'
15+
import {parseResourceTypeInput} from './inputUtils.js'
16+
import {parseDuration} from './utilities/durationUtils.js'
1717

1818
export async function run() {
1919
// verify kubeconfig is set

‎src/strategyHelpers/blueGreen/blueGreenHelper.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@ import * as core from '@actions/core'
22
import * as fs from 'fs'
33
import * as yaml from 'js-yaml'
44

5-
import {DeployResult} from '../../types/deployResult'
6-
import {K8sObject, K8sDeleteObject} from '../../types/k8sObject'
7-
import {Kubectl} from '../../types/kubectl'
5+
import {DeployResult} from '../../types/deployResult.js'
6+
import {K8sObject, K8sDeleteObject} from '../../types/k8sObject.js'
7+
import {Kubectl} from '../../types/kubectl.js'
88
import {
99
isDeploymentEntity,
1010
isIngressEntity,
1111
isServiceEntity,
1212
KubernetesWorkload
13-
} from '../../types/kubernetesTypes'
13+
} from '../../types/kubernetesTypes.js'
1414
import {
1515
BlueGreenDeployment,
1616
BlueGreenManifests
17-
} from '../../types/blueGreenTypes'
18-
import * as fileHelper from '../../utilities/fileUtils'
19-
import {updateSpecLabels} from '../../utilities/manifestSpecLabelUtils'
20-
import {checkForErrors} from '../../utilities/kubectlUtils'
17+
} from '../../types/blueGreenTypes.js'
18+
import * as fileHelper from '../../utilities/fileUtils.js'
19+
import {updateSpecLabels} from '../../utilities/manifestSpecLabelUtils.js'
20+
import {checkForErrors} from '../../utilities/kubectlUtils.js'
2121
import {
2222
UnsetClusterSpecificDetails,
2323
updateObjectLabels,
2424
updateSelectorLabels
25-
} from '../../utilities/manifestUpdateUtils'
25+
} from '../../utilities/manifestUpdateUtils.js'
2626

2727
export const GREEN_LABEL_VALUE = 'green'
2828
export const NONE_LABEL_VALUE = 'None'

‎src/strategyHelpers/blueGreen/deploy.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import * as core from '@actions/core'
22

3-
import {Kubectl} from '../../types/kubectl'
3+
import {Kubectl} from '../../types/kubectl.js'
44
import {
55
BlueGreenDeployment,
66
BlueGreenManifests
7-
} from '../../types/blueGreenTypes'
7+
} from '../../types/blueGreenTypes.js'
88

9-
import {RouteStrategy} from '../../types/routeStrategy'
9+
import {RouteStrategy} from '../../types/routeStrategy.js'
1010

1111
import {
1212
deployWithLabel,
1313
getManifestObjects,
1414
GREEN_LABEL_VALUE,
1515
deployObjects
16-
} from './blueGreenHelper'
17-
import {setupSMI} from './smiBlueGreenHelper'
16+
} from './blueGreenHelper.js'
17+
import {setupSMI} from './smiBlueGreenHelper.js'
1818

19-
import {routeBlueGreenForDeploy} from './route'
20-
import {DeployResult} from '../../types/deployResult'
19+
import {routeBlueGreenForDeploy} from './route.js'
20+
import {DeployResult} from '../../types/deployResult.js'
2121

2222
export async function deployBlueGreen(
2323
kubectl: Kubectl,

‎src/strategyHelpers/blueGreen/ingressBlueGreenHelper.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import * as core from '@actions/core'
2-
import {K8sIngress} from '../../types/k8sObject'
2+
import {K8sIngress} from '../../types/k8sObject.js'
33
import {
44
addBlueGreenLabelsAndAnnotations,
55
BLUE_GREEN_VERSION_LABEL,
66
GREEN_LABEL_VALUE,
77
fetchResource
8-
} from './blueGreenHelper'
9-
import {Kubectl} from '../../types/kubectl'
8+
} from './blueGreenHelper.js'
9+
import {Kubectl} from '../../types/kubectl.js'
1010

1111
const BACKEND = 'backend'
1212

‎src/strategyHelpers/blueGreen/promote.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as core from '@actions/core'
22

3-
import {Kubectl} from '../../types/kubectl'
3+
import {Kubectl} from '../../types/kubectl.js'
44

5-
import {BlueGreenDeployment} from '../../types/blueGreenTypes'
6-
import {deployWithLabel, NONE_LABEL_VALUE} from './blueGreenHelper'
5+
import {BlueGreenDeployment} from '../../types/blueGreenTypes.js'
6+
import {deployWithLabel, NONE_LABEL_VALUE} from './blueGreenHelper.js'
77

8-
import {validateIngresses} from './ingressBlueGreenHelper'
9-
import {validateServicesState} from './serviceBlueGreenHelper'
10-
import {validateTrafficSplitsState} from './smiBlueGreenHelper'
8+
import {validateIngresses} from './ingressBlueGreenHelper.js'
9+
import {validateServicesState} from './serviceBlueGreenHelper.js'
10+
import {validateTrafficSplitsState} from './smiBlueGreenHelper.js'
1111

1212
export async function promoteBlueGreenIngress(
1313
kubectl: Kubectl,

‎src/strategyHelpers/blueGreen/reject.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import {K8sDeleteObject} from '../../types/k8sObject'
2-
import {Kubectl} from '../../types/kubectl'
1+
import {K8sDeleteObject} from '../../types/k8sObject.js'
2+
import {Kubectl} from '../../types/kubectl.js'
33
import {
44
BlueGreenDeployment,
55
BlueGreenManifests,
66
BlueGreenRejectResult
7-
} from '../../types/blueGreenTypes'
8-
import {deleteGreenObjects, NONE_LABEL_VALUE} from './blueGreenHelper'
9-
import {routeBlueGreenSMI} from './route'
10-
import {cleanupSMI} from './smiBlueGreenHelper'
11-
import {routeBlueGreenIngressUnchanged, routeBlueGreenService} from './route'
7+
} from '../../types/blueGreenTypes.js'
8+
import {deleteGreenObjects, NONE_LABEL_VALUE} from './blueGreenHelper.js'
9+
import {routeBlueGreenSMI} from './route.js'
10+
import {cleanupSMI} from './smiBlueGreenHelper.js'
11+
import {routeBlueGreenIngressUnchanged, routeBlueGreenService} from './route.js'
1212

1313
export async function rejectBlueGreenIngress(
1414
kubectl: Kubectl,

0 commit comments

Comments
 (0)