Skip to content

Commit a677c2d

Browse files
committed
refactor(toolkit): move context providers
1 parent 98865bc commit a677c2d

File tree

12 files changed

+23
-22
lines changed

12 files changed

+23
-22
lines changed

packages/aws-cdk/lib/context-providers/ami.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/ami.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { AmiContextQuery } from '@aws-cdk/cloud-assembly-schema';
22
import type { IContextProviderMessages } from '.';
3-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
43
import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth';
54
import type { ContextProviderPlugin } from '../api/plugin';
5+
import { ContextProviderError } from '../api/toolkit-error';
66

77
/**
88
* Plugin to search AMIs for the current account

packages/aws-cdk/lib/context-providers/cc-api-provider.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/cc-api-provider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { CcApiContextQuery } from '@aws-cdk/cloud-assembly-schema';
22
import type { ResourceDescription } from '@aws-sdk/client-cloudcontrol';
33
import { ResourceNotFoundException } from '@aws-sdk/client-cloudcontrol';
4-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
5-
import type { ICloudControlClient } from '../api';
6-
import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth';
4+
import type { ICloudControlClient, SdkProvider } from '../api/aws-auth';
5+
import { initContextProviderSdk } from '../api/aws-auth';
76
import type { ContextProviderPlugin } from '../api/plugin';
7+
import { ContextProviderError } from '../api/toolkit-error';
88
import { findJsonValue, getResultObj } from '../util';
99

1010
export class CcApiContextProviderPlugin implements ContextProviderPlugin {

packages/aws-cdk/lib/context-providers/hosted-zones.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/hosted-zones.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { HostedZoneContextQuery } from '@aws-cdk/cloud-assembly-schema';
22
import type { HostedZone } from '@aws-sdk/client-route-53';
33
import type { IContextProviderMessages } from '.';
4-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
5-
import type { IRoute53Client } from '../api';
6-
import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth';
4+
import type { IRoute53Client, SdkProvider } from '../api/aws-auth';
5+
import { initContextProviderSdk } from '../api/aws-auth';
76
import type { ContextProviderPlugin } from '../api/plugin';
7+
import { ContextProviderError } from '../api/toolkit-error';
88

99
export class HostedZoneContextProviderPlugin implements ContextProviderPlugin {
1010
constructor(private readonly aws: SdkProvider, private readonly io: IContextProviderMessages) {

packages/aws-cdk/lib/context-providers/index.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import { LoadBalancerContextProviderPlugin, LoadBalancerListenerContextProviderP
1010
import { SecurityGroupContextProviderPlugin } from './security-groups';
1111
import { SSMContextProviderPlugin } from './ssm-parameters';
1212
import { VpcNetworkContextProviderPlugin } from './vpcs';
13-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
14-
import type { IoHelper } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
15-
import { IO } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
16-
import type { SdkProvider } from '../api';
13+
import type { SdkProvider } from '../api/aws-auth';
1714
import type { Context } from '../api/context';
1815
import { TRANSIENT_CONTEXT_KEY } from '../api/context';
1916
import { replaceEnvPlaceholders } from '../api/environment';
17+
import { IO } from '../api/io/private';
18+
import type { IoHelper } from '../api/io/private';
2019
import { PluginHost } from '../api/plugin';
2120
import type { ContextProviderPlugin } from '../api/plugin';
21+
import { ContextProviderError } from '../api/toolkit-error';
2222
import { formatErrorMessage } from '../util';
2323

2424
type ContextProviderFactory = ((sdk: SdkProvider, io: IContextProviderMessages) => ContextProviderPlugin);

packages/aws-cdk/lib/context-providers/keys.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/keys.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import type { KeyContextQuery } from '@aws-cdk/cloud-assembly-schema';
22
import type { KeyContextResponse } from '@aws-cdk/cx-api';
33
import type { AliasListEntry, ListAliasesCommandOutput } from '@aws-sdk/client-kms';
44
import type { IContextProviderMessages } from '.';
5-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
6-
import type { IKMSClient } from '../api';
7-
import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth';
5+
import type { IKMSClient, SdkProvider } from '../api/aws-auth';
6+
import { initContextProviderSdk } from '../api/aws-auth';
87
import type { ContextProviderPlugin } from '../api/plugin';
8+
import { ContextProviderError } from '../api/toolkit-error';
99

1010
export class KeyContextProviderPlugin implements ContextProviderPlugin {
1111
constructor(private readonly aws: SdkProvider, private readonly io: IContextProviderMessages) {

packages/aws-cdk/lib/context-providers/load-balancers.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/load-balancers.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {
77
LoadBalancerIpAddressType,
88
} from '@aws-cdk/cx-api';
99
import type { LoadBalancer, Listener, TagDescription } from '@aws-sdk/client-elastic-load-balancing-v2';
10-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
11-
import type { IElasticLoadBalancingV2Client } from '../api';
12-
import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth';
10+
import type { IElasticLoadBalancingV2Client, SdkProvider } from '../api/aws-auth';
11+
import { initContextProviderSdk } from '../api/aws-auth';
1312
import type { ContextProviderPlugin } from '../api/plugin';
13+
import { ContextProviderError } from '../api/toolkit-error';
1414

1515
/**
1616
* Provides load balancer context information.

packages/aws-cdk/lib/context-providers/security-groups.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/security-groups.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { SecurityGroupContextQuery } from '@aws-cdk/cloud-assembly-schema';
22
import type { SecurityGroupContextResponse } from '@aws-cdk/cx-api';
33
import type { Filter, SecurityGroup } from '@aws-sdk/client-ec2';
4-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
54
import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth';
65
import type { ContextProviderPlugin } from '../api/plugin';
6+
import { ContextProviderError } from '../api/toolkit-error';
77

88
export class SecurityGroupContextProviderPlugin implements ContextProviderPlugin {
99
constructor(private readonly aws: SdkProvider) {

packages/aws-cdk/lib/context-providers/ssm-parameters.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/context-providers/ssm-parameters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { SSMParameterContextQuery } from '@aws-cdk/cloud-assembly-schema';
22
import type { GetParameterCommandOutput } from '@aws-sdk/client-ssm';
33
import type { IContextProviderMessages } from '.';
4-
import { ContextProviderError } from '../../../@aws-cdk/tmp-toolkit-helpers/src/api';
54
import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth';
65
import type { ContextProviderPlugin } from '../api/plugin';
6+
import { ContextProviderError } from '../api/toolkit-error';
77

88
/**
99
* Plugin to read arbitrary SSM parameter names

0 commit comments

Comments
 (0)