Skip to content

feat: update dependencies #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 16, 2025
Merged

feat: update dependencies #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2d2c27
feat: update dependencies
Blankll Aug 16, 2025
5fe624c
fix: fx tests
Blankll Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13,605 changes: 3,674 additions & 9,931 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,54 +49,54 @@
"function"
],
"dependencies": {
"@alicloud/ims20190815": "^2.2.0",
"@alicloud/openapi-client": "^0.4.14",
"@alicloud/ros-cdk-apigateway": "^1.8.0",
"@alicloud/ros-cdk-core": "^1.8.0",
"@alicloud/ros-cdk-dns": "^1.8.0",
"@alicloud/ros-cdk-ecs": "^1.8.0",
"@alicloud/ros-cdk-elasticsearchserverless": "^1.8.0",
"@alicloud/ros-cdk-fc3": "^1.8.0",
"@alicloud/ros-cdk-nas": "^1.8.0",
"@alicloud/ros-cdk-oss": "^1.8.0",
"@alicloud/ros-cdk-ossdeployment": "^1.8.0",
"@alicloud/ros-cdk-ots": "^1.8.0",
"@alicloud/ros-cdk-ram": "^1.8.0",
"@alicloud/ros-cdk-rds": "^1.8.0",
"@alicloud/ros-cdk-ros": "^1.8.0",
"@alicloud/ros-cdk-sls": "^1.8.0",
"@alicloud/ros-cdk-vpc": "^1.8.0",
"@alicloud/ros20190910": "^3.5.6",
"@alicloud/ims20190815": "^2.3.0",
"@alicloud/openapi-client": "^0.4.15",
"@alicloud/ros-cdk-apigateway": "^1.9.0",
"@alicloud/ros-cdk-core": "^1.9.0",
"@alicloud/ros-cdk-dns": "^1.9.0",
"@alicloud/ros-cdk-ecs": "^1.9.0",
"@alicloud/ros-cdk-elasticsearchserverless": "^1.9.0",
"@alicloud/ros-cdk-fc3": "^1.9.0",
"@alicloud/ros-cdk-nas": "^1.9.0",
"@alicloud/ros-cdk-oss": "^1.9.0",
"@alicloud/ros-cdk-ossdeployment": "^1.9.0",
"@alicloud/ros-cdk-ots": "^1.9.0",
"@alicloud/ros-cdk-ram": "^1.9.0",
"@alicloud/ros-cdk-rds": "^1.9.0",
"@alicloud/ros-cdk-ros": "^1.9.0",
"@alicloud/ros-cdk-sls": "^1.9.0",
"@alicloud/ros-cdk-vpc": "^1.9.0",
"@alicloud/ros20190910": "^3.5.8",
"ajv": "^8.17.1",
"ali-oss": "^6.22.0",
"chalk": "^5.4.1",
"commander": "^13.1.0",
"ali-oss": "^6.23.0",
"chalk": "^5.5.0",
"commander": "^14.0.0",
"i": "^0.3.7",
"i18n": "^0.15.1",
"jszip": "^3.10.1",
"lodash": "^4.17.21",
"npm": "^11.3.0",
"pino": "^9.6.0",
"pino-pretty": "^13.0.0",
"yaml": "^2.7.1"
"npm": "^11.5.2",
"pino": "^9.9.0",
"pino-pretty": "^13.1.1",
"yaml": "^2.8.1"
},
"devDependencies": {
"@types/ali-oss": "^6.16.11",
"@types/i18n": "^0.13.12",
"@types/jest": "^29.5.14",
"@types/lodash": "^4.17.16",
"@types/node": "^22.14.0",
"@typescript-eslint/eslint-plugin": "^8.29.0",
"@typescript-eslint/parser": "^8.29.0",
"eslint": "^9.24.0",
"eslint-config-prettier": "^10.1.1",
"eslint-plugin-prettier": "^5.2.6",
"globals": "^16.0.0",
"@types/jest": "^30.0.0",
"@types/lodash": "^4.17.20",
"@types/node": "^24.3.0",
"@typescript-eslint/eslint-plugin": "^8.39.1",
"@typescript-eslint/parser": "^8.39.1",
"eslint": "^9.33.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.4",
"globals": "^16.3.0",
"husky": "^9.1.7",
"jest": "^29.7.0",
"prettier": "^3.5.3",
"ts-jest": "^29.3.1",
"jest": "^30.0.5",
"prettier": "^3.6.2",
"ts-jest": "^29.4.1",
"ts-node": "^10.9.2",
"typescript": "^5.8.3"
"typescript": "^5.9.2"
}
}
6 changes: 3 additions & 3 deletions src/common/rosClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Util from '@alicloud/tea-util';
import ROS20190910, {
import Client, {
CreateStackRequest,
CreateStackRequestParameters,
CreateStackRequestTags,
Expand All @@ -10,12 +9,13 @@ import ROS20190910, {
UpdateStackRequestParameters,
} from '@alicloud/ros20190910';
import { Config } from '@alicloud/openapi-client';
import Util from '@alicloud/tea-util';
import { Context } from '../types';
import { logger } from './logger';
import { lang } from '../lang';
import { getContext } from './context';

const client = new ROS20190910(
const client = new Client(
new Config({
accessKeyId: process.env.ALIYUN_ACCESS_KEY_ID,
accessKeySecret: process.env.ALIYUN_ACCESS_KEY_SECRET,
Expand Down
1 change: 1 addition & 0 deletions src/stack/rosStack/bucket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export const resolveBuckets = (
accessControl: aclMap.get(
calcRefs(bucket.security?.acl, context) ?? ('' as BucketAccessEnum),
),
blockPublicAccess: calcRefs(bucket.security?.acl, context) === BucketAccessEnum.PRIVATE,
websiteConfigurationV2: bucket.website
? {
indexDocument: {
Expand Down
3 changes: 1 addition & 2 deletions src/stack/rosStack/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,7 @@ export const resolveDatabases = (
],
},
quotaInfo: {
cu: db.cu.min,
storage: db.storage.min,
minCu: db.cu.min,
appType: category as string,
},
// network: [
Expand Down
10 changes: 10 additions & 0 deletions tests/common/rosAssets.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ const mockedGenerateAsync = jest.fn();
const mockedInfoLogger = jest.fn();
const mockedDebugLogger = jest.fn();

jest.mock('../../src/common/rosClient', () => ({}));
jest.mock('../../src/common/imsClient', () => ({}));
jest.mock('@alicloud/ros-cdk-core', () => ({}));

jest.mock('@alicloud/ros-cdk-ossdeployment', () => ({
Source: {
asset: jest.fn().mockImplementation(() => ({ bind: jest.fn() })),
},
}));

jest.mock('node:async_hooks', () => ({
AsyncLocalStorage: jest.fn().mockImplementation(() => ({
enterWith: jest.fn(),
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/deploy-fixtures/bucketMinimum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const bucketMinimumRos = {
Properties: {
BucketName: 'my-bucket',
AccessControl: 'private',
BlockPublicAccess: false,
DeletionForce: false,
EnableOssHdfsService: false,
RedundancyType: 'LRS',
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/deploy-fixtures/bucketWithWebsite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ export const bucketWithWebsiteRos = {
my_bucket: {
Properties: {
AccessControl: 'private',
BlockPublicAccess: false,
BucketName: 'my-bucket',
DeletionForce: false,
EnableOssHdfsService: false,
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/deploy-fixtures/esMinimum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ export const esServerlessMinimumRos = {
},
QuotaInfo: {
AppType: 'STANDARD',
Cu: 1,
Storage: 20,
MinCu: 1,
},
Scenario: 'SEARCH',
// Network: [
// {
// Enabled: true,
Expand Down
48 changes: 3 additions & 45 deletions tests/fixtures/deploy-fixtures/oneFcLargeCode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,51 +79,9 @@ export const largeCodeRos = {
},
DeletionForce: false,
IgnoreExisting: false,
Policies: [
{
PolicyDocument: {
Statement: [
{
Action: ['oss:*'],
Effect: 'Allow',
Resource: ['*'],
},
],
Version: '1',
},
PolicyName: 'AliyunOSSFullAccess',
},
{
PolicyDocument: {
Statement: [
{
Action: ['log:*'],
Effect: 'Allow',
Resource: ['*'],
},
{
Action: ['ram:CreateServiceLinkedRole'],
Condition: {
StringEquals: {
'ram:ServiceName': [
'audit.log.aliyuncs.com',
'alert.log.aliyuncs.com',
'middlewarelens.log.aliyuncs.com',
'storagelens.log.aliyuncs.com',
'ai-lens.log.aliyuncs.com',
'securitylens.log.aliyuncs.com',
],
},
},
Effect: 'Allow',
Resource: ['*'],
},
],
Version: '1',
},
PolicyName: 'AliyunLogFullAccess',
},
],
PolicyAttachments: {
System: ['AliyunOSSFullAccess', 'AliyunLogFullAccess'],
},
RoleName: {
'Fn::Join': [
'-',
Expand Down