feat!: re resource naming changed

Author: yicr

src/index.ts

@@ -1,5 +1,4 @@
-// 　import * as crypto from 'crypto';
-import { ResourceNaming } from '@gammarers/aws-resource-naming';
+import { ResourceAutoNaming, ResourceDefaultNaming, ResourceNaming, ResourceNamingOptions, ResourceNamingType } from '@gammarers/aws-resource-naming';
 import * as cdk from 'aws-cdk-lib';
 import * as iam from 'aws-cdk-lib/aws-iam';
 import * as cr from 'aws-cdk-lib/custom-resources';
@@ -18,21 +17,66 @@ export enum ResponseField {
   HOST_ARN = 'HostArn',
 }
 
-export interface ResourceNamingOptions {
-  readonly naming: ResourceNaming.AutoNaming | ResourceNaming.DefaultNaming | {
-    type: ResourceNaming.NamingType.CUSTOM;
-    names: {
-      functionName: string;
-      functionRoleName: string;
-    };
-  };
+//export type Names = {
+//  functionName: string;
+//  functionRoleName: string;
+//}
+//export interface Names {
+//  readonly functionName: string;
+//  readonly functionRoleName: string;
+//}
+//
+//export type CustomNaming = {
+//  type: ResourceNaming.NamingType.CUSTOM;
+//  //  functionName: string;
+//  //  functionRoleName: string;
+//  names: Names;
+//}
+
+//export interface ResourceNamingOptions {
+//  readonly naming: ResourceNaming.AutoNaming | ResourceNaming.DefaultNaming | {
+//    type: ResourceNaming.NamingType.CUSTOM;
+//    names: {
+//      functionName: string;
+//      functionRoleName: string;
+//    };
+//  };
+//}
+
+//export interface ResourceNamingOptions {
+//  readonly naming: ResourceNaming.AutoNaming | ResourceNaming.DefaultNaming;
+//}
+//export type Naming = { type: ResourceNaming.NamingType.DEFAULT } | { type: ResourceNaming.NamingType.AUTO } | CustomNaming;
+//export type Naming = { type: ResourceNaming.NamingType.DEFAULT } | { type: ResourceNaming.NamingType.AUTO } | CustomNaming;
+//export type Naming = CustomNaming;
+
+//export interface ResourceNamingOptions {
+//  readonly naming: Naming;
+//}
+//export interface DefaultNamingOption {
+//  readonly type: ResourceNaming.NamingType.DEFAULT;
+//}
+//
+//export interface AutoNamingOption {
+//  readonly type: ResourceNaming.NamingType.AUTO;
+//}
+
+export interface CustomNaming {
+  readonly type: ResourceNamingType.CUSTOM;
+  // readonly names: Names; // CUSTOM の場合に必須
+  readonly functionName: string; // フラット化
+  readonly functionRoleName: string; // フラット化
 }
 
+export type ResourceNamingOption = ResourceDefaultNaming | ResourceAutoNaming | CustomNaming;
+
 export interface CodeConnectionsHostCustomResourceProps {
   readonly name: string;
   readonly providerEndpoint: string;
   readonly providerType: CodeConnectionsHostProviderType;
-  readonly resouceNamingOption?: ResourceNamingOptions;
+  //readonly resouceNamingOption?: ResourceNamingOptions;
+  //  readonly resouceNamingOption?: { type: ResourceNaming.NamingType.DEFAULT } | { type: ResourceNaming.NamingType.AUTO } | CustomNaming;
+  readonly resouceNamingOption?: ResourceNamingOption;
 }
 
 export class CodeConnectionsHostCustomResource extends cr.AwsCustomResource {
@@ -45,13 +89,16 @@ export class CodeConnectionsHostCustomResource extends cr.AwsCustomResource {
       functionName: `custom-resource-codeconnection-host-${random}-func`,
       functionRoleName: `custom-resource-codeconnection-host-${random}-func-exc-role`,
     };
-    const naming = ResourceNaming.naming(autoNaming, props.resouceNamingOption);
+    const names = ResourceNaming.naming(autoNaming, props.resouceNamingOption as ResourceNamingOptions);
+    //    const naming = {
+    //      names: autoNaming,
+    //    };
 
     const account = cdk.Stack.of(scope).account;
     const region = cdk.Stack.of(scope).region;
 
     const functionRole = new iam.Role(scope, 'FunctionRole', {
-      roleName: naming.names.functionRoleName,
+      roleName: names.functionRoleName,
       description: 'Custom Resource Function Execution Role.',
       assumedBy: new iam.ServicePrincipal('lambda.amazonaws.com'),
       managedPolicies: [
@@ -77,10 +124,11 @@ export class CodeConnectionsHostCustomResource extends cr.AwsCustomResource {
     });
 
     super(scope, id, {
-      functionName: naming.names.functionName,
+      functionName: names.functionName,
       role: functionRole,
       timeout: cdk.Duration.seconds(15),
       installLatestAwsSdk: true,
+      //logGroup: todo
       onCreate: {
         service: 'CodeConnections',
         action: 'createHost',

test/custom-resource.bitbucket.option.test.ts

@@ -1,4 +1,4 @@
-import { ResourceNaming } from '@gammarers/aws-resource-naming';
+import { ResourceNamingType } from '@gammarers/aws-resource-naming';
 import { App, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
 import * as codeconnections from 'aws-cdk-lib/aws-codeconnections';
@@ -20,9 +20,7 @@ describe('CustomResource Testing', () => {
     providerEndpoint: 'https://bitbucket.example.com',
     providerType: CodeConnectionsHostProviderType.BIT_BUCKET,
     resouceNamingOption: {
-      naming: {
-        type: ResourceNaming.NamingType.AUTO,
-      },
+      type: ResourceNamingType.AUTO,
     },
   });