incomplete fix

Author: mrgrain

packages/aws-cdk/test/api/environment/environment-resources.test.ts

@@ -101,12 +101,9 @@ describe('validateversion without bootstrap stack', () => {
       .spyOn(CachedDataSource.prototype as any, 'load')
       .mockImplementation(() => Promise.resolve({ expiration: 0, notices: [] }));
 
-    // mock cli version number
-    jest.spyOn(version, 'versionNumber').mockImplementation(() => '1.0.0');
-
     // THEN
     const ioHost = new FakeIoHost();
-    const notices = Notices.create({ context: new Context(), ioHost });
+    const notices = Notices.create({ context: new Context(), ioHost, cliVersion: '1.0.0' });
     await notices.refresh({ dataSource: { fetch: async () => [] } });
     await expect(envResources().validateVersion(8, '/abc')).resolves.toBeUndefined();
 

packages/aws-cdk/test/context-providers/generic.test.ts

@@ -4,6 +4,9 @@ import * as contextproviders from '../../lib/context-providers';
 import { Context, TRANSIENT_CONTEXT_KEY } from '../../lib/api/context';
 import { MockSdkProvider, setDefaultSTSMocks } from '../util/mock-sdk';
 
+const ioHost = new TestIoHost();
+const ioHelper = ioHost.asHelper();
+
 const mockSDK = new MockSdkProvider();
 setDefaultSTSMocks();
 
@@ -22,7 +25,7 @@ test('errors are reported into the context value', async () => {
   // WHEN
   await contextproviders.provideContextValues([
     { key: 'asdf', props: { account: '1234', region: 'us-east-1' }, provider: TEST_PROVIDER },
-  ], context, mockSDK);
+  ], context, mockSDK, ioHelper);
 
   // THEN - error is now in context
 
@@ -59,7 +62,7 @@ test('lookup role ARN is resolved', async () => {
       },
       provider: TEST_PROVIDER,
     },
-  ], context, mockSDK);
+  ], context, mockSDK, ioHelper);
 
   // THEN - Value gets resolved
   expect(context.get('asdf')).toEqual('some resolved value');
@@ -77,7 +80,7 @@ test('errors are marked transient', async () => {
   // WHEN
   await contextproviders.provideContextValues([
     { key: 'asdf', props: { account: '1234', region: 'us-east-1' }, provider: TEST_PROVIDER },
-  ], context, mockSDK);
+  ], context, mockSDK, ioHelper);
 
   // THEN - error is marked transient
   expect(context.get('asdf')[TRANSIENT_CONTEXT_KEY]).toBeTruthy();
@@ -98,7 +101,7 @@ test('context provider can be registered using PluginHost', async () => {
   // WHEN
   await contextproviders.provideContextValues([
     { key: 'asdf', props: { account: '1234', region: 'us-east-1', pluginName: 'prov' }, provider: PLUGIN_PROVIDER },
-  ], context, mockSDK);
+  ], context, mockSDK, ioHelper);
 
   // THEN - error is marked transient
   expect(called).toEqual(true);
@@ -116,7 +119,7 @@ test('plugin context provider can be called without account/region', async () =>
   // WHEN
   await contextproviders.provideContextValues([
     { key: 'asdf', props: { banana: 'yellow', pluginName: 'prov' } as any, provider: PLUGIN_PROVIDER },
-  ], context, mockSDK);
+  ], context, mockSDK, ioHelper);
 
   // THEN - error is marked transient
   expect(context.get('asdf')).toEqual('yay');