diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6d88c7..cdf0ac5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - name: Install dependencies run: yarn install --check-files - name: build @@ -95,7 +95,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - name: Download build artifacts uses: actions/download-artifact@v4 with: @@ -129,7 +129,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - uses: actions/setup-python@v5 with: python-version: 3.x diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 125b8fc..d35aa70 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: release @@ -71,7 +71,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - name: Download build artifacts uses: actions/download-artifact@v4 with: @@ -97,7 +97,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - name: Download build artifacts uses: actions/download-artifact@v4 with: @@ -137,7 +137,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - uses: actions/setup-python@v5 with: python-version: 3.x diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml index 7f08db1..4a27c6b 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-main.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 22.5.x + node-version: 22.x - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies diff --git a/.projenrc.ts b/.projenrc.ts index 77b1cb2..6b62440 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -18,7 +18,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ releaseToNpm: true, npmAccess: javascript.NpmAccess.PUBLIC, minNodeVersion: '18.0.0', - workflowNodeVersion: '22.5.x', + workflowNodeVersion: '22.x', depsUpgradeOptions: { workflowOptions: { labels: ['auto-approve', 'auto-merge'], diff --git a/src/index.ts b/src/index.ts index 11360f2..f325fa1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,10 +1,15 @@ -import { ResourceAutoNaming, ResourceDefaultNaming, ResourceNaming, ResourceNamingType } from '@gammarers/aws-resource-naming'; +import { + ResourceAutoNaming, + ResourceDefaultNaming, + ResourceNaming, + ResourceNamingType as CodeConnectionsHostCustomResourceResourceNamingType, +} 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'; import { Construct } from 'constructs'; -export { ResourceAutoNaming, ResourceDefaultNaming, ResourceNamingType }; +export { CodeConnectionsHostCustomResourceResourceNamingType }; // Bitbucket | GitHub | GitHubEnterpriseServer | GitLab | GitLabSelfManaged export enum CodeConnectionsHostProviderType { @@ -64,7 +69,7 @@ export enum ResponseField { //} export interface CustomNaming { - readonly type: ResourceNamingType.CUSTOM; + readonly type: CodeConnectionsHostCustomResourceResourceNamingType.CUSTOM; // readonly names: Names; // CUSTOM の場合に必須 readonly functionName: string; // フラット化 readonly functionRoleName: string; // フラット化