Skip to content

Commit 6274e22

Browse files
authored
refactor(toolkit-lib): remove shared-private.ts and update references (#531)
This PR removes the shared-private.ts file and updates all references to it across the toolkit-lib package. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license
1 parent fbc28d7 commit 6274e22

File tree

12 files changed

+14
-30
lines changed

12 files changed

+14
-30
lines changed

packages/@aws-cdk/toolkit-lib/lib/api/aws-auth/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { SDKv3CompatibleCredentialProvider } from '@aws-cdk/cli-plugin-contract';
2-
import type { SdkProviderServices } from '../shared-private';
3-
import { AwsCliCompatible } from '../shared-private';
2+
import { AwsCliCompatible } from './awscli-compatible';
3+
import type { SdkProviderServices } from './sdk-provider';
44

55
/**
66
* Options for the default SDK provider

packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/prepare-source.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import * as cxschema from '@aws-cdk/cloud-assembly-schema';
66
import * as cxapi from '@aws-cdk/cx-api';
77
import * as fs from 'fs-extra';
88
import { lte } from 'semver';
9-
import type { SdkProvider, IoHelper } from '../../../api/shared-private';
109
import type { ToolkitServices } from '../../../toolkit/private';
1110
import { ToolkitError } from '../../../toolkit/toolkit-error';
1211
import { splitBySize, versionNumber } from '../../../util';
12+
import type { SdkProvider } from '../../aws-auth/private';
13+
import type { IoHelper } from '../../io/private';
1314
import { IO } from '../../io/private';
1415
import type { IReadLock, IWriteLock } from '../../rwlock';
1516
import { RWLock } from '../../rwlock';

packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/stack-assembly.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import '../../../private/dispose-polyfill';
22
import { major } from 'semver';
33
import { ToolkitError } from '../../../toolkit/toolkit-error';
4-
import type { IoHelper } from '../../shared-private';
4+
import type { IoHelper } from '../../io/private';
55
import { BaseStackAssembly, ExtendedStackSelection as CliExtendedStackSelection } from '../stack-assembly';
66
import { StackCollection } from '../stack-collection';
77
import type { StackSelector } from '../stack-selector';

packages/@aws-cdk/toolkit-lib/lib/api/shared-private.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

packages/@aws-cdk/toolkit-lib/lib/toolkit/private/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11

2+
import type { SdkProvider } from '../../api/aws-auth/private';
23
import type { ICloudAssemblySource } from '../../api/cloud-assembly';
34
import { StackAssembly } from '../../api/cloud-assembly/private';
5+
import type { IoHelper } from '../../api/io/private';
46
import type { PluginHost } from '../../api/plugin';
5-
import type { SdkProvider, IoHelper } from '../../api/shared-private';
67

78
/**
89
* Helper struct to pass internal services around.

packages/@aws-cdk/toolkit-lib/test/actions/bootstrap.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { bold } from 'chalk';
1212

1313
import type { BootstrapOptions } from '../../lib/actions/bootstrap';
1414
import { BootstrapEnvironments, BootstrapSource, BootstrapStackParameters } from '../../lib/actions/bootstrap';
15-
import { SdkProvider } from '../../lib/api/shared-private';
15+
import { SdkProvider } from '../../lib/api/aws-auth/private';
1616
import { Toolkit } from '../../lib/toolkit/toolkit';
1717
import { TestIoHost, builderFixture, disposableCloudAssemblySource } from '../_helpers';
1818
import {

packages/@aws-cdk/toolkit-lib/test/actions/diff.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { DiffMethod } from '../../lib/actions/diff';
44
import * as awsauth from '../../lib/api/aws-auth/private';
55
import { StackSelectionStrategy } from '../../lib/api/cloud-assembly';
66
import * as deployments from '../../lib/api/deployments';
7-
import { cfnApi } from '../../lib/api/shared-private';
7+
import * as cfnApi from '../../lib/api/deployments/cfn-api';
88
import { Toolkit } from '../../lib/toolkit';
99
import { builderFixture, disposableCloudAssemblySource, TestIoHost } from '../_helpers';
1010
import { MockSdk, restoreSdkMocksToDefault, setDefaultSTSMocks } from '../_helpers/mock-sdk';

packages/@aws-cdk/toolkit-lib/test/actions/refactor.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { GetTemplateCommand, ListStacksCommand } from '@aws-sdk/client-cloudformation';
22
import { StackSelectionStrategy, Toolkit } from '../../lib';
3-
import { SdkProvider } from '../../lib/api/shared-private';
3+
import { SdkProvider } from '../../lib/api/aws-auth/private';
44
import { builderFixture, TestIoHost } from '../_helpers';
55
import { mockCloudFormationClient, MockSdk } from '../_helpers/mock-sdk';
66

packages/@aws-cdk/toolkit-lib/test/api/cloud-assembly/source-builder.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as path from 'path';
22
import * as fs from 'fs-extra';
33
import { RWLock } from '../../../lib/api/rwlock';
4-
import { contextproviders } from '../../../lib/api/shared-private';
4+
import * as contextproviders from '../../../lib/context-providers';
55
import { Toolkit } from '../../../lib/toolkit/toolkit';
66
import { ToolkitError } from '../../../lib/toolkit/toolkit-error';
77
import { appFixture, appFixtureConfig, autoCleanOutDir, builderFixture, builderFunctionFromFixture, cdkOutFixture, TestIoHost } from '../../_helpers';

packages/@aws-cdk/toolkit-lib/test/api/deployments/cloudformation-deployments.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import {
1414
import { GetParameterCommand } from '@aws-sdk/client-ssm';
1515
import { CloudFormationStack } from '../../../lib/api/cloudformation';
1616
import { Deployments } from '../../../lib/api/deployments';
17+
import * as cfnApi from '../../../lib/api/deployments/cfn-api';
1718
import { deployStack } from '../../../lib/api/deployments/deploy-stack';
1819
import { HotswapMode } from '../../../lib/api/hotswap';
19-
import { cfnApi } from '../../../lib/api/shared-private';
2020
import { ToolkitInfo } from '../../../lib/api/toolkit-info';
2121
import { testStack } from '../../_helpers/assembly';
2222
import {

packages/@aws-cdk/toolkit-lib/test/toolkit/base-credentials.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { SdkProvider } from '../../lib/api/aws-auth/private';
12
import { BaseCredentials } from '../../lib/api/aws-auth/types';
2-
import { SdkProvider } from '../../lib/api/shared-private';
33
import { Toolkit } from '../../lib/toolkit/toolkit';
44
import { appFixture, TestIoHost } from '../_helpers';
55
import { MockSdk } from '../_helpers/mock-sdk';

packages/@aws-cdk/toolkit-lib/test/toolkit/plugins.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { PluginProviderResult } from '@aws-cdk/cli-plugin-contract';
22
import { StackSelectionStrategy } from '../../lib';
3-
import { SdkProvider } from '../../lib/api/shared-private';
3+
import { SdkProvider } from '../../lib/api/aws-auth/private';
44
import { Toolkit } from '../../lib/toolkit/toolkit';
55
import { appFixture, TestIoHost } from '../_helpers';
66
import { MockSdk } from '../_helpers/mock-sdk';

0 commit comments

Comments
 (0)