@l-v-yonsama/multi-platform-database-drivers 0.1.102 → 0.1.103
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/built/src/drivers/BaseDriver.d.ts +3 -3
- package/built/src/drivers/MySQLDriver.d.ts +3 -3
- package/built/src/drivers/MySQLDriver.js +7 -7
- package/built/src/drivers/MySQLDriver.js.map +1 -1
- package/built/src/drivers/PostgresDriver.d.ts +3 -3
- package/built/src/drivers/PostgresDriver.js +6 -6
- package/built/src/drivers/PostgresDriver.js.map +1 -1
- package/built/src/drivers/RDSBaseDriver.d.ts +6 -6
- package/built/src/drivers/RDSBaseDriver.js +22 -16
- package/built/src/drivers/RDSBaseDriver.js.map +1 -1
- package/built/src/drivers/RedisDriver.d.ts +3 -3
- package/built/src/drivers/RedisDriver.js +13 -11
- package/built/src/drivers/RedisDriver.js.map +1 -1
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.d.ts +5 -5
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.js +7 -7
- package/built/src/drivers/aws/AwsCloudwatchServiceClient.js.map +1 -1
- package/built/src/drivers/aws/AwsS3ServiceClient.d.ts +3 -3
- package/built/src/drivers/aws/AwsS3ServiceClient.js +3 -3
- package/built/src/drivers/aws/AwsS3ServiceClient.js.map +1 -1
- package/built/src/drivers/aws/AwsSQSServiceClient.d.ts +3 -3
- package/built/src/drivers/aws/AwsSQSServiceClient.js +3 -3
- package/built/src/drivers/aws/AwsSQSServiceClient.js.map +1 -1
- package/built/src/examples/mysql.js.map +1 -1
- package/built/src/examples/rules.d.ts +1 -0
- package/built/src/examples/rules.js +31 -0
- package/built/src/examples/rules.js.map +1 -0
- package/built/src/helpers/ResourceHelper.d.ts +4 -2
- package/built/src/helpers/ResourceHelper.js +51 -13
- package/built/src/helpers/ResourceHelper.js.map +1 -1
- package/built/src/helpers/SQLHelper.js +2 -2
- package/built/src/helpers/SQLHelper.js.map +1 -1
- package/built/src/resource/ResultSetDataBuilder.d.ts +54 -0
- package/built/src/resource/{ResultSetDataHolder.js → ResultSetDataBuilder.js} +249 -289
- package/built/src/resource/ResultSetDataBuilder.js.map +1 -0
- package/built/src/resource/index.d.ts +1 -2
- package/built/src/resource/index.js +1 -2
- package/built/src/resource/index.js.map +1 -1
- package/built/src/types/resource/Annonations.d.ts +23 -14
- package/built/src/types/resource/Annonations.js +9 -15
- package/built/src/types/resource/Annonations.js.map +1 -1
- package/built/src/types/resource/ResultSetDataType.d.ts +64 -0
- package/built/src/types/resource/ResultSetDataType.js +6 -0
- package/built/src/types/resource/ResultSetDataType.js.map +1 -0
- package/built/src/types/resource/index.d.ts +1 -1
- package/built/src/types/resource/index.js +1 -1
- package/built/src/types/resource/index.js.map +1 -1
- package/built/src/util.d.ts +1 -2
- package/built/src/util.js +1 -18
- package/built/src/util.js.map +1 -1
- package/package.json +4 -1
- package/built/src/resource/MultipleResultSetDataHolder.d.ts +0 -30
- package/built/src/resource/MultipleResultSetDataHolder.js +0 -107
- package/built/src/resource/MultipleResultSetDataHolder.js.map +0 -1
- package/built/src/resource/ResultSetDataHolder.d.ts +0 -99
- package/built/src/resource/ResultSetDataHolder.js.map +0 -1
- package/built/src/types/resource/ResultSetHelperMetadata.d.ts +0 -9
- package/built/src/types/resource/ResultSetHelperMetadata.js +0 -3
- package/built/src/types/resource/ResultSetHelperMetadata.js.map +0 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { ColumnResolver, DbDatabase,
|
|
2
|
-
import { ConnectionSetting, GeneralResult, ScanParams } from '../types';
|
|
1
|
+
import { ColumnResolver, DbDatabase, SchemaAndTableHints } from '../resource';
|
|
2
|
+
import { ConnectionSetting, GeneralResult, ScanParams, ResultSetData } from '../types';
|
|
3
3
|
import { DBError } from './DBError';
|
|
4
4
|
import { Statement } from 'pgsql-ast-parser';
|
|
5
5
|
export interface Scannable {
|
|
6
|
-
scan(params: ScanParams): Promise<
|
|
6
|
+
scan(params: ScanParams): Promise<ResultSetData>;
|
|
7
7
|
}
|
|
8
8
|
export declare function isScannable(arg: any): arg is Scannable;
|
|
9
9
|
export declare abstract class BaseDriver<T extends DbDatabase = DbDatabase> {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { DbColumn, DbSchema, DbTable,
|
|
2
|
-
import { ConnectionSetting, QueryParams } from '../types';
|
|
1
|
+
import { DbColumn, DbSchema, DbTable, RdsDatabase, ResultSetDataBuilder, SchemaAndTableHints, TableRows } from '../resource';
|
|
2
|
+
import { ConnectionSetting, QueryParams, RdhKey } from '../types';
|
|
3
3
|
import { RDSBaseDriver } from './RDSBaseDriver';
|
|
4
4
|
export declare class MySQLDriver extends RDSBaseDriver {
|
|
5
5
|
private client;
|
|
@@ -9,7 +9,7 @@ export declare class MySQLDriver extends RDSBaseDriver {
|
|
|
9
9
|
protected getTestSqlStatement(): string;
|
|
10
10
|
requestSqlSub(params: QueryParams & {
|
|
11
11
|
dbTable: DbTable;
|
|
12
|
-
}): Promise<
|
|
12
|
+
}): Promise<ResultSetDataBuilder>;
|
|
13
13
|
countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
|
|
14
14
|
getInfomationSchemasSub(): Promise<Array<RdsDatabase>>;
|
|
15
15
|
getSchemas(dbDatabase: RdsDatabase): Promise<Array<DbSchema>>;
|
|
@@ -59,7 +59,7 @@ class MySQLDriver extends RDSBaseDriver_1.RDSBaseDriver {
|
|
|
59
59
|
var _a;
|
|
60
60
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
61
61
|
const { sql, conditions, dbTable } = params;
|
|
62
|
-
let
|
|
62
|
+
let rdb;
|
|
63
63
|
if (sql.trim().match(/set\s+global\s+.+/i)) {
|
|
64
64
|
throw new Error('Setting global system variables is not supported');
|
|
65
65
|
}
|
|
@@ -68,7 +68,7 @@ class MySQLDriver extends RDSBaseDriver_1.RDSBaseDriver {
|
|
|
68
68
|
const [rows, fields] = yield this.client.execute(sql, binds);
|
|
69
69
|
if (fields === undefined) {
|
|
70
70
|
const results = rows;
|
|
71
|
-
|
|
71
|
+
rdb = new resource_1.ResultSetDataBuilder([
|
|
72
72
|
'fieldCount',
|
|
73
73
|
'affectedRows',
|
|
74
74
|
'insertId',
|
|
@@ -76,7 +76,7 @@ class MySQLDriver extends RDSBaseDriver_1.RDSBaseDriver {
|
|
|
76
76
|
'warningStatus',
|
|
77
77
|
'changedRows',
|
|
78
78
|
]);
|
|
79
|
-
|
|
79
|
+
rdb.addRow({
|
|
80
80
|
fieldCount: results.fieldCount,
|
|
81
81
|
affectedRows: results.affectedRows,
|
|
82
82
|
insertId: results.insertId,
|
|
@@ -86,24 +86,24 @@ class MySQLDriver extends RDSBaseDriver_1.RDSBaseDriver {
|
|
|
86
86
|
});
|
|
87
87
|
}
|
|
88
88
|
else {
|
|
89
|
-
|
|
89
|
+
rdb = new resource_1.ResultSetDataBuilder(fields === undefined
|
|
90
90
|
? []
|
|
91
91
|
: fields.map((f) => this.fieldInfo2Key(f, dbTable)));
|
|
92
92
|
rows.forEach((result) => {
|
|
93
|
-
|
|
93
|
+
rdb.rs.keys.forEach((key) => {
|
|
94
94
|
const v = result[key.name];
|
|
95
95
|
if (key.type === types_1.GeneralColumnType.BIT) {
|
|
96
96
|
result[key.name] = (0, util_1.toBoolean)(v);
|
|
97
97
|
}
|
|
98
98
|
});
|
|
99
|
-
|
|
99
|
+
rdb.addRow(result);
|
|
100
100
|
});
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
else {
|
|
104
104
|
new Error('No connection');
|
|
105
105
|
}
|
|
106
|
-
return
|
|
106
|
+
return rdb;
|
|
107
107
|
});
|
|
108
108
|
}
|
|
109
109
|
countTables(tables, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MySQLDriver.js","sourceRoot":"","sources":["../../../src/drivers/MySQLDriver.ts"],"names":[],"mappings":";;;;AAAA,8DAAwC;AACxC,6CAAyC;AAEzC,
|
|
1
|
+
{"version":3,"file":"MySQLDriver.js","sourceRoot":"","sources":["../../../src/drivers/MySQLDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { default as pg } from 'pg';
|
|
2
|
-
import { DbColumn, DbSchema, DbTable,
|
|
3
|
-
import { ConnectionSetting, QueryParams } from '../types';
|
|
2
|
+
import { DbColumn, DbSchema, DbTable, RdsDatabase, ResultSetDataBuilder, SchemaAndTableHints, TableRows } from '../resource';
|
|
3
|
+
import { ConnectionSetting, QueryParams, RdhKey } from '../types';
|
|
4
4
|
import { RDSBaseDriver } from './RDSBaseDriver';
|
|
5
5
|
export declare class PostgresDriver extends RDSBaseDriver {
|
|
6
6
|
private pool;
|
|
@@ -10,7 +10,7 @@ export declare class PostgresDriver extends RDSBaseDriver {
|
|
|
10
10
|
protected getTestSqlStatement(): string;
|
|
11
11
|
requestSqlSub(params: QueryParams & {
|
|
12
12
|
dbTable: DbTable;
|
|
13
|
-
}): Promise<
|
|
13
|
+
}): Promise<ResultSetDataBuilder>;
|
|
14
14
|
countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
|
|
15
15
|
getInfomationSchemasSub(): Promise<Array<RdsDatabase>>;
|
|
16
16
|
asyncGetDatabases(connectionDatabase: string): Promise<Array<RdsDatabase>>;
|
|
@@ -58,25 +58,25 @@ class PostgresDriver extends RDSBaseDriver_1.RDSBaseDriver {
|
|
|
58
58
|
var _a;
|
|
59
59
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
const { sql, conditions, dbTable } = params;
|
|
61
|
-
let
|
|
61
|
+
let rdb;
|
|
62
62
|
const binds = (_a = conditions === null || conditions === void 0 ? void 0 : conditions.binds) !== null && _a !== void 0 ? _a : [];
|
|
63
63
|
const results = yield this.pool.query(sql, binds);
|
|
64
64
|
if (results) {
|
|
65
65
|
const fields = results.fields;
|
|
66
66
|
if (fields === null || fields === void 0 ? void 0 : fields.length) {
|
|
67
|
-
|
|
67
|
+
rdb = new resource_1.ResultSetDataBuilder(fields.map((f) => this.fieldInfo2Key(f, dbTable)));
|
|
68
68
|
if (results.rows) {
|
|
69
69
|
results.rows.forEach((result) => {
|
|
70
|
-
|
|
70
|
+
rdb.addRow(result);
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
else {
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
rdb = new resource_1.ResultSetDataBuilder(['Result']);
|
|
76
|
+
rdb.addRow({ Result: 'OK' });
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
return
|
|
79
|
+
return rdb;
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
countTables(tables, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":";;;;AAEA,oDAAmC;AACnC,6CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"PostgresDriver.js","sourceRoot":"","sources":["../../../src/drivers/PostgresDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BaseDriver } from './BaseDriver';
|
|
2
|
-
import { DbTable, RdsDatabase,
|
|
2
|
+
import { DbTable, RdsDatabase, ResultSetDataBuilder, SchemaAndTableHints, TableRows } from '../resource';
|
|
3
3
|
import { Statement } from 'pgsql-ast-parser';
|
|
4
|
-
import { CompareKey, ConnectionSetting, QueryParams } from '../types';
|
|
4
|
+
import { CompareKey, ConnectionSetting, QueryParams, ResultSetData } from '../types';
|
|
5
5
|
export declare abstract class RDSBaseDriver extends BaseDriver<RdsDatabase> {
|
|
6
6
|
constructor(conRes: ConnectionSetting);
|
|
7
7
|
protected abstract getTestSqlStatement(): string;
|
|
@@ -11,16 +11,16 @@ export declare abstract class RDSBaseDriver extends BaseDriver<RdsDatabase> {
|
|
|
11
11
|
columnNames?: string[];
|
|
12
12
|
maxRows?: number;
|
|
13
13
|
compareKeys?: CompareKey[];
|
|
14
|
-
}): Promise<
|
|
14
|
+
}): Promise<ResultSetData>;
|
|
15
15
|
abstract countTables(tables: SchemaAndTableHints, options: any): Promise<TableRows[]>;
|
|
16
16
|
abstract isPositionedParameterAvailable(): boolean;
|
|
17
17
|
protected getRdsDatabase(): RdsDatabase | undefined;
|
|
18
|
-
requestSql(params: QueryParams): Promise<
|
|
18
|
+
requestSql(params: QueryParams): Promise<ResultSetData>;
|
|
19
19
|
abstract requestSqlSub(params: QueryParams & {
|
|
20
20
|
dbTable: DbTable;
|
|
21
|
-
}): Promise<
|
|
21
|
+
}): Promise<ResultSetDataBuilder>;
|
|
22
22
|
private getTableName;
|
|
23
23
|
private getDbTable;
|
|
24
|
-
setRdhMetaAndStatement(params: QueryParams,
|
|
24
|
+
setRdhMetaAndStatement(params: QueryParams, rdb: ResultSetDataBuilder, type: Statement['type'], astTableName?: string, dbTable?: DbTable): void;
|
|
25
25
|
resetDefaultSchema(database: RdsDatabase): void;
|
|
26
26
|
}
|
|
@@ -62,13 +62,13 @@ class RDSBaseDriver extends BaseDriver_1.BaseDriver {
|
|
|
62
62
|
}
|
|
63
63
|
requestSql(params) {
|
|
64
64
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
65
|
-
const { sql
|
|
65
|
+
const { sql } = params;
|
|
66
66
|
const ast = this.parseQuery(sql);
|
|
67
67
|
const astTableName = this.getTableName(ast);
|
|
68
68
|
const dbTable = this.getDbTable(astTableName);
|
|
69
|
-
const
|
|
70
|
-
this.setRdhMetaAndStatement(params,
|
|
71
|
-
return
|
|
69
|
+
const rdb = yield this.requestSqlSub(Object.assign(Object.assign({}, params), { dbTable }));
|
|
70
|
+
this.setRdhMetaAndStatement(params, rdb, ast === null || ast === void 0 ? void 0 : ast.type, astTableName, dbTable);
|
|
71
|
+
return rdb.build();
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
74
|
getTableName(ast) {
|
|
@@ -104,24 +104,30 @@ class RDSBaseDriver extends BaseDriver_1.BaseDriver {
|
|
|
104
104
|
}
|
|
105
105
|
return undefined;
|
|
106
106
|
}
|
|
107
|
-
setRdhMetaAndStatement(params,
|
|
107
|
+
setRdhMetaAndStatement(params, rdb, type, astTableName, dbTable) {
|
|
108
108
|
var _a;
|
|
109
109
|
const { sql, conditions, meta } = params;
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
rdh.meta.tableName = astTableName;
|
|
110
|
+
rdb.setSqlStatement(sql);
|
|
111
|
+
const connectionName = this.conRes.name;
|
|
112
|
+
let tableName = meta === null || meta === void 0 ? void 0 : meta.tableName;
|
|
113
|
+
const comment = (_a = meta === null || meta === void 0 ? void 0 : meta.comment) !== null && _a !== void 0 ? _a : dbTable === null || dbTable === void 0 ? void 0 : dbTable.comment;
|
|
114
|
+
let compareKeys = meta === null || meta === void 0 ? void 0 : meta.compareKeys;
|
|
115
|
+
if (!rdb.rs.meta.tableName) {
|
|
116
|
+
tableName = astTableName;
|
|
118
117
|
}
|
|
119
|
-
if (!
|
|
118
|
+
if (!rdb.rs.meta.compareKeys && !compareKeys) {
|
|
120
119
|
if (dbTable) {
|
|
121
|
-
|
|
120
|
+
compareKeys = dbTable.getCompareKeys();
|
|
122
121
|
}
|
|
123
122
|
}
|
|
124
|
-
|
|
123
|
+
rdb.updateMeta({
|
|
124
|
+
connectionName,
|
|
125
|
+
comment,
|
|
126
|
+
tableName,
|
|
127
|
+
compareKeys,
|
|
128
|
+
type,
|
|
129
|
+
});
|
|
130
|
+
rdb.rs.queryConditions = conditions;
|
|
125
131
|
}
|
|
126
132
|
resetDefaultSchema(database) {
|
|
127
133
|
const searchNames = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RDSBaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/RDSBaseDriver.ts"],"names":[],"mappings":";;;;AAAA,6CAA0C;AAC1C,0CAMqB;AAErB,
|
|
1
|
+
{"version":3,"file":"RDSBaseDriver.js","sourceRoot":"","sources":["../../../src/drivers/RDSBaseDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Redis } from 'ioredis';
|
|
2
2
|
import { BaseDriver, Scannable } from './BaseDriver';
|
|
3
|
-
import { DbKey, RedisDatabase, RedisKeyParams
|
|
4
|
-
import { ConnectionSetting, RedisKeyType, ScanParams } from '../types';
|
|
3
|
+
import { DbKey, RedisDatabase, RedisKeyParams } from '../resource';
|
|
4
|
+
import { ConnectionSetting, RedisKeyType, ResultSetData, ScanParams } from '../types';
|
|
5
5
|
export declare class RedisDriver extends BaseDriver<RedisDatabase> implements Scannable {
|
|
6
6
|
client: Redis | undefined;
|
|
7
7
|
constructor(conRes: ConnectionSetting);
|
|
@@ -11,7 +11,7 @@ export declare class RedisDriver extends BaseDriver<RedisDatabase> implements Sc
|
|
|
11
11
|
flushDb(): Promise<void>;
|
|
12
12
|
delete(key: string): Promise<void>;
|
|
13
13
|
scanStream(params: ScanParams): Promise<DbKey<RedisKeyParams>[]>;
|
|
14
|
-
scan(params: ScanParams): Promise<
|
|
14
|
+
scan(params: ScanParams): Promise<ResultSetData>;
|
|
15
15
|
getValueByKey(client: Redis, key: string, type: RedisKeyType): Promise<any>;
|
|
16
16
|
getInfomationSchemasSub(): Promise<Array<RedisDatabase>>;
|
|
17
17
|
closeSub(): Promise<string>;
|
|
@@ -126,7 +126,7 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
|
|
|
126
126
|
scan(params) {
|
|
127
127
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
128
128
|
const dbKeys = yield this.scanStream(params);
|
|
129
|
-
const
|
|
129
|
+
const rdb = new resource_1.ResultSetDataBuilder([
|
|
130
130
|
(0, resource_1.createRdhKey)({ name: 'key', type: types_1.GeneralColumnType.TEXT, width: 150 }),
|
|
131
131
|
(0, resource_1.createRdhKey)({ name: 'type', type: types_1.GeneralColumnType.ENUM, width: 70 }),
|
|
132
132
|
(0, resource_1.createRdhKey)({ name: 'ttl', type: types_1.GeneralColumnType.INTEGER, width: 50 }),
|
|
@@ -137,17 +137,19 @@ class RedisDriver extends BaseDriver_1.BaseDriver {
|
|
|
137
137
|
}),
|
|
138
138
|
]);
|
|
139
139
|
dbKeys.forEach((dbKey) => {
|
|
140
|
-
|
|
140
|
+
rdb.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.name }));
|
|
141
141
|
});
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
142
|
+
rdb.updateMeta({
|
|
143
|
+
tableName: `RedisDB${this.conRes.database}`,
|
|
144
|
+
connectionName: this.conRes.name,
|
|
145
|
+
compareKeys: [
|
|
146
|
+
{
|
|
147
|
+
kind: 'primary',
|
|
148
|
+
names: ['key'],
|
|
149
|
+
},
|
|
150
|
+
],
|
|
151
|
+
});
|
|
152
|
+
return rdb.build();
|
|
151
153
|
});
|
|
152
154
|
}
|
|
153
155
|
getValueByKey(client, key, type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/drivers/RedisDriver.ts"],"names":[],"mappings":";;;;AAEA,qCAAgC;AAChC,6CAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../src/drivers/RedisDriver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AwsDatabase
|
|
2
|
-
import { ConnectionSetting, ScanParams } from '../../types';
|
|
1
|
+
import { AwsDatabase } from '../../resource';
|
|
2
|
+
import { ConnectionSetting, ResultSetData, ScanParams } from '../../types';
|
|
3
3
|
import { CloudWatchLogsClient, GetQueryResultsCommandOutput, LogStream, OutputLogEvent, QueryDefinition, StartQueryCommandInput } from '@aws-sdk/client-cloudwatch-logs';
|
|
4
4
|
import { AwsServiceClient } from './AwsServiceClient';
|
|
5
5
|
import { ClientConfigType } from '../AwsDriver';
|
|
@@ -16,9 +16,9 @@ export declare class AwsCloudwatchServiceClient extends AwsServiceClient impleme
|
|
|
16
16
|
limit?: number;
|
|
17
17
|
}): Promise<OutputLogEvent[]>;
|
|
18
18
|
query(params: StartQueryCommandInput): Promise<GetQueryResultsCommandOutput>;
|
|
19
|
-
scan(params: ScanParams): Promise<
|
|
20
|
-
scanLogGroup(params: ScanParams): Promise<
|
|
21
|
-
scanLogStream(params: ScanParams): Promise<
|
|
19
|
+
scan(params: ScanParams): Promise<ResultSetData>;
|
|
20
|
+
scanLogGroup(params: ScanParams): Promise<ResultSetData>;
|
|
21
|
+
scanLogStream(params: ScanParams): Promise<ResultSetData>;
|
|
22
22
|
getInfomationSchemas(): Promise<AwsDatabase>;
|
|
23
23
|
getLogStreams({ logGroupName, }: {
|
|
24
24
|
logGroupName: string;
|
|
@@ -103,7 +103,7 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
103
103
|
throw new Error('StartQueryCommand Failed');
|
|
104
104
|
}
|
|
105
105
|
if (!results || results.length === 0) {
|
|
106
|
-
return resource_1.
|
|
106
|
+
return resource_1.ResultSetDataBuilder.createEmpty();
|
|
107
107
|
}
|
|
108
108
|
const keys = results[0]
|
|
109
109
|
.filter((it) => it.field !== undefined && it.field !== '@ptr')
|
|
@@ -123,7 +123,7 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
123
123
|
}
|
|
124
124
|
return key;
|
|
125
125
|
});
|
|
126
|
-
const
|
|
126
|
+
const rdb = new resource_1.ResultSetDataBuilder(keys);
|
|
127
127
|
results.forEach((rowResult) => {
|
|
128
128
|
const values = {};
|
|
129
129
|
rowResult.forEach((it) => {
|
|
@@ -136,9 +136,9 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
136
136
|
values[it.field] = it.value;
|
|
137
137
|
}
|
|
138
138
|
});
|
|
139
|
-
|
|
139
|
+
rdb.addRow(values);
|
|
140
140
|
});
|
|
141
|
-
return
|
|
141
|
+
return rdb.build();
|
|
142
142
|
});
|
|
143
143
|
}
|
|
144
144
|
scanLogStream(params) {
|
|
@@ -166,16 +166,16 @@ class AwsCloudwatchServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
166
166
|
width: 500,
|
|
167
167
|
});
|
|
168
168
|
const keys = [ingestionTime, timestamp, message];
|
|
169
|
-
const
|
|
169
|
+
const rdb = new resource_1.ResultSetDataBuilder(keys);
|
|
170
170
|
list.forEach((rowResult) => {
|
|
171
171
|
const values = {
|
|
172
172
|
ingestionTime: (0, util_1.toDate)(rowResult.ingestionTime),
|
|
173
173
|
timestamp: (0, util_1.toDate)(rowResult.timestamp),
|
|
174
174
|
message: rowResult.message,
|
|
175
175
|
};
|
|
176
|
-
|
|
176
|
+
rdb.addRow(values);
|
|
177
177
|
});
|
|
178
|
-
return
|
|
178
|
+
return rdb.build();
|
|
179
179
|
});
|
|
180
180
|
}
|
|
181
181
|
getInfomationSchemas() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsCloudwatchServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsCloudwatchServiceClient.ts"],"names":[],"mappings":";;;;AAEA,6CAMwB;AACxB,
|
|
1
|
+
{"version":3,"file":"AwsCloudwatchServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsCloudwatchServiceClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3';
|
|
2
|
-
import { AwsDatabase, DbKey,
|
|
3
|
-
import { ConnectionSetting, ScanParams } from '../../types';
|
|
2
|
+
import { AwsDatabase, DbKey, S3KeyParams } from '../../resource';
|
|
3
|
+
import { ConnectionSetting, ResultSetData, ScanParams } from '../../types';
|
|
4
4
|
import { AwsServiceClient } from './AwsServiceClient';
|
|
5
5
|
import { ClientConfigType } from '../AwsDriver';
|
|
6
6
|
import { Scannable } from '../BaseDriver';
|
|
@@ -15,7 +15,7 @@ export declare class AwsS3ServiceClient extends AwsServiceClient implements Scan
|
|
|
15
15
|
limit: number;
|
|
16
16
|
withValue: boolean | 'auto';
|
|
17
17
|
}): Promise<DbKey<S3KeyParams>[]>;
|
|
18
|
-
scan(params: ScanParams): Promise<
|
|
18
|
+
scan(params: ScanParams): Promise<ResultSetData>;
|
|
19
19
|
getInfomationSchemas(): Promise<AwsDatabase>;
|
|
20
20
|
createBucket({ bucket }: {
|
|
21
21
|
bucket: string;
|
|
@@ -87,7 +87,7 @@ class AwsS3ServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
87
87
|
limit,
|
|
88
88
|
withValue,
|
|
89
89
|
});
|
|
90
|
-
const
|
|
90
|
+
const rdb = new resource_1.ResultSetDataBuilder([
|
|
91
91
|
(0, resource_1.createRdhKey)({ name: 'key', type: types_1.GeneralColumnType.TEXT }),
|
|
92
92
|
(0, resource_1.createRdhKey)({ name: 'size', type: types_1.GeneralColumnType.INTEGER }),
|
|
93
93
|
(0, resource_1.createRdhKey)({ name: 'etag', type: types_1.GeneralColumnType.TEXT }),
|
|
@@ -97,9 +97,9 @@ class AwsS3ServiceClient extends AwsServiceClient_1.AwsServiceClient {
|
|
|
97
97
|
]);
|
|
98
98
|
list.forEach((dbKey) => {
|
|
99
99
|
var _a;
|
|
100
|
-
|
|
100
|
+
rdb.addRow(Object.assign(Object.assign({}, dbKey.params), { key: dbKey.name, value: (_a = dbKey.params) === null || _a === void 0 ? void 0 : _a.base64 }));
|
|
101
101
|
});
|
|
102
|
-
return
|
|
102
|
+
return rdb.build();
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
105
|
getInfomationSchemas() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsS3ServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsS3ServiceClient.ts"],"names":[],"mappings":";;;;AAGA,kDAY4B;AAC5B,6CAQwB;AACxB,
|
|
1
|
+
{"version":3,"file":"AwsS3ServiceClient.js","sourceRoot":"","sources":["../../../../src/drivers/aws/AwsS3ServiceClient.ts"],"names":[],"mappings":";;;;AAGA,kDAY4B;AAC5B,6CAQwB;AACxB,uCAMqB;AACrB,yDAAsD;AAGtD,yCAAmC;AAEnC,MAAa,kBAAmB,SAAQ,mCAAgB;IAGtD,YAAY,MAAyB,EAAE,MAAwB;QAC7D,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,CAAC;IAEK,UAAU;;;YACd,MAAM,MAAM,qBACP,IAAI,CAAC,MAAM,CACf,CAAC;YACF,IAAI,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,0CAAE,gBAAgB,EAAE;gBACtC,MAAO,CAAC,gBAAgB,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,0CAAE,gBAAgB,CAAC;aAC3E;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,CAAC,MAAM,CAAC,CAAC;YAErC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;;KACzB;IAEe,OAAO;;YACrB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,8BAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;aACtD;QACH,CAAC;KAAA;IAYK,WAAW,CAAC,EAChB,MAAM,EACN,MAAM,EACN,KAAK,EACL,SAAS,GAMV;;;YAEC,IAAI,SAAS,GAAG,IAAI,CAAC;YAErB,IAAI,UAAU,CAAC;YAEf,MAAM,YAAY,GAA4B;gBAC5C,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;aACf,CAAC;YAEF,MAAM,IAAI,GAAyB,EAAE,CAAC;YACtC,OAAO,SAAS,EAAE;gBAChB,IAAI;oBACF,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACvC,IAAI,8BAAkB,CAAC,YAAY,CAAC,CACrC,CAAC;oBAEF,MAAA,QAAQ,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBAClC,MAAM,GAAG,GAAG,IAAI,gBAAK,CAAc,IAAI,CAAC,GAAG,EAAE;4BAC3C,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,YAAY,EAAE,IAAI,CAAC,YAAY;4BAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;yBAChC,CAAC,CAAC;wBACH,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACjB,CAAC,CAAC,CAAC;oBAEH,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC;oBAEjC,IAAI,SAAS,EAAE;wBACb,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;wBAEhD,YAAY,CAAC,MAAM,GAAG,UAAU,CAAC;qBAClC;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBAC1B,SAAS,GAAG,KAAK,CAAC;iBACnB;aACF;YAED,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,MAAM,EAAE;gBAC9C,MAAM,QAAQ,GAAG,IAAI;qBAClB,MAAM,CACL,CAAC,EAAE,EAAE,EAAE,CACL,SAAS,KAAK,IAAI;oBAClB,CAAC,SAAS,KAAK,MAAM,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,KAAM,CAAC,CACrD;qBACA,GAAG,CAAC,CAAO,EAAE,EAAE,EAAE;oBAChB,EAAE,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC;wBAC1C,MAAM;wBACN,GAAG,EAAE,EAAE,CAAC,IAAI;qBACb,CAAC,CAAC;gBACL,CAAC,CAAA,CAAC,CAAC;gBACL,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aAC7B;YACD,OAAO,IAAI,CAAC;;KACb;IAEK,IAAI,CAAC,MAAkB;;YAC3B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;gBAClC,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,OAAO;gBACf,KAAK;gBACL,SAAS;aACV,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,+BAAoB,CAAC;gBACnC,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,yBAAiB,CAAC,IAAI,EAAE,CAAC;gBAC3D,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC/D,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAiB,CAAC,IAAI,EAAE,CAAC;gBAC5D,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,yBAAiB,CAAC,IAAI,EAAE,CAAC;gBACpE,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,yBAAiB,CAAC,SAAS,EAAE,CAAC;gBACzE,IAAA,uBAAY,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,yBAAiB,CAAC,OAAO,EAAE,CAAC;aACjE,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;gBACrB,GAAG,CAAC,MAAM,iCACL,KAAK,CAAC,MAAM,KACf,GAAG,EAAE,KAAK,CAAC,IAAI,EACf,KAAK,EAAE,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,IAC3B,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;KAAA;IAoBK,oBAAoB;;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,OAAO,IAAI,CAAC;aACb;YAED,MAAM,UAAU,GAAG,IAAI,sBAAW,CAAC,IAAI,EAAE,sBAAc,CAAC,EAAE,CAAC,CAAC;YAE5D,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,8BAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrE,IAAI,OAAO,CAAC,OAAO,EAAE;oBACnB,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;wBACpC,MAAM,QAAQ,GAAG,IAAI,qBAAU,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;wBAClE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;qBAC/B;oBACD,UAAU,CAAC,OAAO,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,IAAA,kBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC;iBACtE;gBACD,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,MAAM,OAAO,GAAG,IAAI,oBAAS,CAC3B,OAAO,CAAC,KAAK,CAAC,EAAE,EAChB,OAAO,CAAC,KAAK,CAAC,WAAW,CAC1B,CAAC;oBACF,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBAC9B;qBAAM;iBAEN;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAElB;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;KAAA;IAyCK,YAAY,CAAC,EAAE,MAAM,EAAsB;;YAC/C,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,+BAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,CAAC;KAAA;IAEK,aAAa,CAAC,EAClB,MAAM,EACN,GAAG,GAIJ;;YAEC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACnC,IAAI,4BAAgB,CAAC;gBACnB,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;aACT,CAAC,CACH,CAAC;YACF,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvC,CAAC;KAAA;IAEK,SAAS,CAAC,EACd,MAAM,EACN,GAAG,EACH,IAAI,GAKL;;YACC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACtB,IAAI,4BAAgB,CAAC;gBACnB,MAAM,EAAE,MAAM;gBACd,GAAG,EAAE,GAAG;gBACR,IAAI,EAAE,IAAI;aACX,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,YAAY,CAAC,EAAE,MAAM,EAAsB;;YAC/C,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,+BAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACxE,CAAC;KAAA;IAEK,gBAAgB,CAAC,EAAE,MAAM,EAAsB;;YACnD,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,IAAI,UAAU,CAAC;YACf,MAAM,YAAY,GAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAE7C,OAAO,SAAS,EAAE;gBAChB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACvC,IAAI,8BAAkB,CAAC,YAAY,CAAC,CACrC,CAAC;gBAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CACnC,IAAI,+BAAmB,CAAC;wBACtB,MAAM,EAAE,MAAM;wBACd,GAAG,EAAE,IAAI,CAAC,GAAG;qBACd,CAAC,CACH,CAAC;iBACH;gBAED,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC;gBAEjC,IAAI,SAAS,EAAE;oBACb,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;oBAEhD,YAAY,CAAC,MAAM,GAAG,UAAU,CAAC;iBAClC;aAEF;QACH,CAAC;KAAA;IAEe,QAAQ;;YACtB,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;KAAA;CACF;AA1SD,gDA0SC"}
|