sst 2.1.3 → 2.1.5
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/cli/commands/plugins/kysely.js +3 -6
- package/credentials.js +3 -0
- package/package.json +4 -4
- package/sst.mjs +4 -5
- package/support/rds-migrator/index.mjs +21 -21
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Kysely } from "kysely";
|
|
2
2
|
import { DataApiDialect } from "kysely-data-api";
|
|
3
|
-
import
|
|
3
|
+
import { RDSData } from "@aws-sdk/client-rds-data";
|
|
4
4
|
import * as fs from "fs/promises";
|
|
5
5
|
import { DatabaseMetadata, EnumCollection, PostgresDialect, MysqlDialect, Serializer, Transformer, } from "kysely-codegen";
|
|
6
6
|
import { Context } from "../../../context/context.js";
|
|
7
7
|
import { useBus } from "../../../bus.js";
|
|
8
8
|
import { useProject } from "../../../project.js";
|
|
9
9
|
import { Logger } from "../../../logger.js";
|
|
10
|
-
import { useAWSCredentials, } from "../../../credentials.js";
|
|
10
|
+
import { useAWSClient, useAWSCredentials, } from "../../../credentials.js";
|
|
11
11
|
export const useKyselyTypeGenerator = Context.memo(async () => {
|
|
12
12
|
let databases = [];
|
|
13
13
|
const bus = useBus();
|
|
@@ -24,10 +24,7 @@ export const useKyselyTypeGenerator = Context.memo(async () => {
|
|
|
24
24
|
secretArn: db.secretArn,
|
|
25
25
|
resourceArn: db.clusterArn,
|
|
26
26
|
database: db.defaultDatabaseName,
|
|
27
|
-
client:
|
|
28
|
-
region: project.config.region,
|
|
29
|
-
credentials,
|
|
30
|
-
}),
|
|
27
|
+
client: useAWSClient(RDSData),
|
|
31
28
|
},
|
|
32
29
|
}),
|
|
33
30
|
});
|
package/credentials.js
CHANGED
|
@@ -88,6 +88,9 @@ export function useAWSClient(client, force = false) {
|
|
|
88
88
|
Logger.debug("Created AWS client", client.name);
|
|
89
89
|
return result;
|
|
90
90
|
}
|
|
91
|
+
// @ts-expect-error
|
|
92
|
+
import stupid from "aws-sdk/lib/maintenance_mode_message.js";
|
|
93
|
+
stupid.suppress = true;
|
|
91
94
|
import aws from "aws-sdk";
|
|
92
95
|
import { useProject } from "./project.js";
|
|
93
96
|
const CredentialProviderChain = aws.CredentialProviderChain;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sst",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.5",
|
|
4
4
|
"bin": {
|
|
5
5
|
"sst": "cli/sst.js"
|
|
6
6
|
},
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"aws-cdk": "2.62.2",
|
|
55
55
|
"aws-cdk-lib": "2.62.2",
|
|
56
56
|
"aws-iot-device-sdk": "^2.2.12",
|
|
57
|
-
"aws-sdk": "^2.
|
|
57
|
+
"aws-sdk": "^2.1326.0",
|
|
58
58
|
"builtin-modules": "3.2.0",
|
|
59
59
|
"cdk-assets": "2.62.2",
|
|
60
60
|
"chalk": "^4.1.2",
|
|
@@ -76,9 +76,9 @@
|
|
|
76
76
|
"immer": "9",
|
|
77
77
|
"ink": "^3.2.0",
|
|
78
78
|
"ink-spinner": "^4.0.3",
|
|
79
|
-
"kysely": "^0.23.
|
|
79
|
+
"kysely": "^0.23.4",
|
|
80
80
|
"kysely-codegen": "^0.9.0",
|
|
81
|
-
"kysely-data-api": "^0.
|
|
81
|
+
"kysely-data-api": "^0.2.0",
|
|
82
82
|
"minimatch": "^6.1.6",
|
|
83
83
|
"openid-client": "^5.1.8",
|
|
84
84
|
"ora": "^6.1.2",
|
package/sst.mjs
CHANGED
|
@@ -1595,6 +1595,7 @@ import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
|
|
|
1595
1595
|
import { GetCallerIdentityCommand, STSClient } from "@aws-sdk/client-sts";
|
|
1596
1596
|
import { SdkProvider } from "aws-cdk/lib/api/aws-auth/sdk-provider.js";
|
|
1597
1597
|
import { StandardRetryStrategy } from "@aws-sdk/middleware-retry";
|
|
1598
|
+
import stupid from "aws-sdk/lib/maintenance_mode_message.js";
|
|
1598
1599
|
import aws from "aws-sdk";
|
|
1599
1600
|
function useAWSClient(client, force = false) {
|
|
1600
1601
|
const cache = useClientCache();
|
|
@@ -1690,6 +1691,7 @@ var init_credentials = __esm({
|
|
|
1690
1691
|
return identity;
|
|
1691
1692
|
});
|
|
1692
1693
|
useClientCache = Context.memo(() => /* @__PURE__ */ new Map());
|
|
1694
|
+
stupid.suppress = true;
|
|
1693
1695
|
CredentialProviderChain = aws.CredentialProviderChain;
|
|
1694
1696
|
useAWSProvider = Context.memo(async () => {
|
|
1695
1697
|
Logger.debug("Loading v2 AWS SDK");
|
|
@@ -6213,7 +6215,7 @@ __export(kysely_exports, {
|
|
|
6213
6215
|
});
|
|
6214
6216
|
import { Kysely } from "kysely";
|
|
6215
6217
|
import { DataApiDialect } from "kysely-data-api";
|
|
6216
|
-
import
|
|
6218
|
+
import { RDSData } from "@aws-sdk/client-rds-data";
|
|
6217
6219
|
import * as fs17 from "fs/promises";
|
|
6218
6220
|
import {
|
|
6219
6221
|
DatabaseMetadata,
|
|
@@ -6248,10 +6250,7 @@ var init_kysely = __esm({
|
|
|
6248
6250
|
secretArn: db.secretArn,
|
|
6249
6251
|
resourceArn: db.clusterArn,
|
|
6250
6252
|
database: db.defaultDatabaseName,
|
|
6251
|
-
client:
|
|
6252
|
-
region: project.config.region,
|
|
6253
|
-
credentials
|
|
6254
|
-
})
|
|
6253
|
+
client: useAWSClient(RDSData)
|
|
6255
6254
|
}
|
|
6256
6255
|
})
|
|
6257
6256
|
});
|