migrate

Signed-off-by: Francis <colifran@amazon.com>
aws · Dec 8, 2023 · 721c59f · 721c59f
1 parent ca3be84
commit 721c59f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/aws-cdk-lib/aws-iam/lib/oidc-provider.ts b/packages/aws-cdk-lib/aws-iam/lib/oidc-provider.ts
@@ -1,14 +1,12 @@
-import * as path from 'path';
 import { Construct } from 'constructs';
 import {
   Arn,
   CustomResource,
-  CustomResourceProvider,
-  CustomResourceProviderRuntime,
   IResource,
   Resource,
   Token,
 } from '../../core';
+import { OidcProvider } from '../../custom-resource-handlers/dist/aws-iam/oidc-provider.generated';
 
 const RESOURCE_TYPE = 'Custom::AWSCDKOpenIdConnectProvider';
 
@@ -162,9 +160,7 @@ export class OpenIdConnectProvider extends Resource implements IOpenIdConnectPro
   }
 
   private getOrCreateProvider() {
-    return CustomResourceProvider.getOrCreateProvider(this, RESOURCE_TYPE, {
-      codeDirectory: path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-iam', 'oidc-handler'),
-      runtime: CustomResourceProviderRuntime.NODEJS_18_X,
+    return OidcProvider.getOrCreateProvider(this, RESOURCE_TYPE, {
       policyStatements: [
         {
           Effect: 'Allow',

diff --git a/packages/aws-cdk-lib/core/lib/private/cfn-utils-provider.ts b/packages/aws-cdk-lib/core/lib/private/cfn-utils-provider.ts
@@ -1,14 +1,18 @@
+import * as path from 'path';
 import { Construct } from 'constructs';
 import { CfnUtilsResourceType } from './cfn-utils-provider/consts';
-import { CdkCfnUtilsProvider } from '../../../custom-resource-handlers/dist/core/cfn-utils-provider.generated';
 import { CustomResource } from '../custom-resource';
+import { CustomResourceProvider, CustomResourceProviderRuntime } from '../custom-resource-provider';
 
 /**
  * A custom resource provider for CFN utilities such as `CfnJson`.
  */
 export class CfnUtilsProvider extends Construct {
   public static getOrCreate(scope: Construct) {
-    return CdkCfnUtilsProvider.getOrCreate(scope, 'AWSCDKCfnUtilsProvider', {});
+    return CustomResourceProvider.getOrCreate(scope, 'AWSCDKCfnUtilsProvider', {
+      runtime: CustomResourceProviderRuntime.NODEJS_18_X,
+      codeDirectory: path.join(__dirname, '..', '..', '..', 'custom-resource-handlers', 'dist', 'core', 'cfn-utils-provider'),
+    });
   }
 }