Skip to content

Commit

Permalink
chore(cli): backport import statement changes (aws#14306)
Browse files Browse the repository at this point in the history
A change on v2-main branch - 1972691 - removed the main index file of
this library.

This required some additional changes to internal import statements.
Backport these changes to reduce merge conflicts.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
Niranjan Jayakar authored and hollanddd committed Aug 26, 2021
1 parent f1439dc commit b7e1de6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 7 deletions.
3 changes: 2 additions & 1 deletion packages/aws-cdk/bin/cdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import * as cxapi from '@aws-cdk/cx-api';
import * as colors from 'colors/safe';
import * as yargs from 'yargs';

import { ToolkitInfo, BootstrapSource, Bootstrapper } from '../lib';
import { SdkProvider } from '../lib/api/aws-auth';
import { BootstrapSource, Bootstrapper } from '../lib/api/bootstrap';
import { CloudFormationDeployments } from '../lib/api/cloudformation-deployments';
import { CloudExecutable } from '../lib/api/cxapp/cloud-executable';
import { execProgram } from '../lib/api/cxapp/exec';
import { ToolkitInfo } from '../lib/api/toolkit-info';
import { StackActivityProgress } from '../lib/api/util/cloudformation/stack-activity-monitor';
import { CdkToolkit } from '../lib/cdk-toolkit';
import { RequireApproval } from '../lib/diff';
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/test/api/deploy-stack.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deployStack, ToolkitInfo } from '../../lib';
import { deployStack, ToolkitInfo } from '../../lib/api';
import { DEFAULT_FAKE_TEMPLATE, testStack } from '../util';
import { MockedObject, mockResolvedEnvironment, MockSdk, MockSdkProvider, SyncHandlerSubsetOf } from '../util/mock-sdk';

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/test/api/sdk-provider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import * as AWS from 'aws-sdk';
import type { ConfigurationOptions } from 'aws-sdk/lib/config-base';
import * as promptly from 'promptly';
import * as uuid from 'uuid';
import { PluginHost } from '../../lib';
import { ISDK, Mode, SDK, SdkProvider } from '../../lib/api/aws-auth';
import * as logging from '../../lib/logging';
import { PluginHost } from '../../lib/plugin';
import * as bockfs from '../bockfs';
import { withMocked } from '../util';
import { FakeSts, RegisterRoleOptions, RegisterUserOptions } from './fake-sts';
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/test/api/toolkit-info.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ToolkitInfo } from '../../lib';
import { ToolkitInfo } from '../../lib/api';
import { errorWithCode, mockBootstrapStack, MockSdk } from '../util/mock-sdk';


Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/test/assets.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AssetMetadataEntry } from '@aws-cdk/cloud-assembly-schema';
import { ToolkitInfo } from '../lib';
import { ToolkitInfo } from '../lib/api';
import { addMetadataAssetsToManifest } from '../lib/assets';
import { AssetManifestBuilder } from '../lib/util/asset-manifest-builder';
import { testStack } from './util';
Expand Down
3 changes: 2 additions & 1 deletion packages/aws-cdk/test/util/mock-sdk.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as cxapi from '@aws-cdk/cx-api';
import * as AWS from 'aws-sdk';
import { Account, ISDK, SDK, SdkProvider, ToolkitInfo } from '../../lib';
import { Account, ISDK, SDK, SdkProvider } from '../../lib/api/aws-auth';
import { ToolkitInfo } from '../../lib/api/toolkit-info';
import { CloudFormationStack } from '../../lib/api/util/cloudformation';

const FAKE_CREDENTIALS = new AWS.Credentials({ accessKeyId: 'ACCESS', secretAccessKey: 'SECRET', sessionToken: 'TOKEN ' });
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/test/util/mock-toolkitinfo.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ISDK, ToolkitInfo } from '../../lib';
import { ISDK, ToolkitInfo } from '../../lib/api';
import { CloudFormationStack } from '../../lib/api/util/cloudformation';

export interface MockToolkitInfoProps {
Expand Down

0 comments on commit b7e1de6

Please sign in to comment.