Skip to content

Commit e865e52

Browse files
committed
Address CR Comments
1 parent b221c28 commit e865e52

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

src/prisma/schema.prisma

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ model Configuration {
3030
contractSubscriptionsRetryDelaySeconds String @default("10") @map("contractSubscriptionsRetryDelaySeconds")
3131
3232
// AWS
33-
awsAccessKeyId String? @map("awsAccessKeyId") /// global config, precendence goes to WalletDetails
34-
awsSecretAccessKey String? @map("awsSecretAccessKey") /// global config, precendence goes to WalletDetails
33+
awsAccessKeyId String? @map("awsAccessKeyId") /// global config, precedence goes to WalletDetails
34+
awsSecretAccessKey String? @map("awsSecretAccessKey") /// global config, precedence goes to WalletDetails
3535
awsRegion String? @map("awsRegion") /// global config, treat as "default", store in WalletDetails.awsKmsArn
3636
// GCP
37-
gcpApplicationProjectId String? @map("gcpApplicationProjectId") /// global config, treat as "defult", store in WalletDetails.gcpKmsResourcePath
38-
gcpKmsLocationId String? @map("gcpKmsLocationId") /// global config, treat as "defult", store in WalletDetails.gcpKmsResourcePath
39-
gcpKmsKeyRingId String? @map("gcpKmsKeyRingId") /// global config, treat as "defult", store in WalletDetails.gcpKmsResourcePath
40-
gcpApplicationCredentialEmail String? @map("gcpApplicationCredentialEmail") /// global config, precendence goes to WalletDetails
41-
gcpApplicationCredentialPrivateKey String? @map("gcpApplicationCredentialPrivateKey") /// global config, precendence goes to WalletDetails
37+
gcpApplicationProjectId String? @map("gcpApplicationProjectId") /// global config, treat as "default", store in WalletDetails.gcpKmsResourcePath
38+
gcpKmsLocationId String? @map("gcpKmsLocationId") /// global config, treat as "default", store in WalletDetails.gcpKmsResourcePath
39+
gcpKmsKeyRingId String? @map("gcpKmsKeyRingId") /// global config, treat as "default", store in WalletDetails.gcpKmsResourcePath
40+
gcpApplicationCredentialEmail String? @map("gcpApplicationCredentialEmail") /// global config, precedence goes to WalletDetails
41+
gcpApplicationCredentialPrivateKey String? @map("gcpApplicationCredentialPrivateKey") /// global config, precedence goes to WalletDetails
4242
// Auth
4343
authDomain String @default("") @map("authDomain") // TODO: Remove defaults on major
4444
authWalletEncryptedJson String @default("") @map("authWalletEncryptedJson") // TODO: Remove defaults on major

src/server/routes/backend-wallet/import.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,19 @@ const RequestBodySchema = Type.Intersect([
2626
"arn:aws:kms:us-east-1:123456789012:key/12345678-1234-1234-1234-123456789012",
2727
],
2828
}),
29-
credentials: Type.Object(
30-
{
31-
awsAccessKeyId: Type.String({ description: "AWS Access Key ID" }),
32-
awsSecretAccessKey: Type.String({
33-
description: "AWS Secret Access Key",
34-
}),
35-
},
36-
{
37-
description:
38-
"Optional AWS credentials to use for importing the wallet, if not provided, the default AWS credentials will be used (if available).",
39-
},
29+
credentials: Type.Optional(
30+
Type.Object(
31+
{
32+
awsAccessKeyId: Type.String({ description: "AWS Access Key ID" }),
33+
awsSecretAccessKey: Type.String({
34+
description: "AWS Secret Access Key",
35+
}),
36+
},
37+
{
38+
description:
39+
"Optional AWS credentials to use for importing the wallet, if not provided, the default AWS credentials will be used (if available).",
40+
},
41+
),
4042
),
4143
}),
4244
// TODO: with next breaking change, only require GCP KMS resource path

0 commit comments

Comments
 (0)