From b3088a2470e61666b422579be9e4cef5a1958721 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Mon, 15 Jan 2024 07:16:42 +0000 Subject: [PATCH] chore(deps): bump galoy image to 'sha256:3740ab5678fa6682cad54712056eae2a2896d44328401181126574ab8ce5631e' --- charts/galoy/Chart.yaml | 2 +- charts/galoy/apollo-router/supergraph.graphql | 123 ++++++++++++------ charts/galoy/values.yaml | 14 +- 3 files changed, 88 insertions(+), 51 deletions(-) diff --git a/charts/galoy/Chart.yaml b/charts/galoy/Chart.yaml index 281230400d..180f2782f3 100644 --- a/charts/galoy/Chart.yaml +++ b/charts/galoy/Chart.yaml @@ -16,7 +16,7 @@ version: 0.31.15-dev # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.19.38 +appVersion: 0.19.44 dependencies: - name: redis repository: https://charts.bitnami.com/bitnami diff --git a/charts/galoy/apollo-router/supergraph.graphql b/charts/galoy/apollo-router/supergraph.graphql index 7deafb0b4d..5a4f87225e 100644 --- a/charts/galoy/apollo-router/supergraph.graphql +++ b/charts/galoy/apollo-router/supergraph.graphql @@ -87,12 +87,6 @@ input AccountDisableNotificationChannelInput channel: NotificationChannel! } -input AccountDisableNotificationChannelInputAlt - @join__type(graph: NOTIFICATIONS) -{ - channel: String! -} - input AccountEnableNotificationCategoryInput @join__type(graph: PUBLIC) { @@ -177,12 +171,6 @@ type AccountUpdateNotificationSettingsPayload errors: [Error!]! } -type AccountUpdateNotificationSettingsPayloadAlt - @join__type(graph: NOTIFICATIONS) -{ - notificationSettings: NotificationSettingsAlt! -} - type ApiKey @join__type(graph: API_KEYS) { @@ -380,19 +368,18 @@ type CentAmountPayload type ConsumerAccount implements Account @join__implements(graph: PUBLIC, interface: "Account") - @join__type(graph: NOTIFICATIONS, key: "id", extension: true) @join__type(graph: PUBLIC) { - id: ID! - callbackEndpoints: [CallbackEndpoint!]! @join__field(graph: PUBLIC) + callbackEndpoints: [CallbackEndpoint!]! """ return CSV stream, base64 encoded, of the list of transactions in the wallet """ - csvTransactions(walletIds: [WalletId!]!): String! @join__field(graph: PUBLIC) - defaultWallet: PublicWallet! @join__field(graph: PUBLIC) - defaultWalletId: WalletId! @join__field(graph: PUBLIC) - displayCurrency: DisplayCurrency! @join__field(graph: PUBLIC) + csvTransactions(walletIds: [WalletId!]!): String! + defaultWallet: PublicWallet! + defaultWalletId: WalletId! + displayCurrency: DisplayCurrency! + id: ID! """A list of all invoices associated with walletIds optionally passed.""" invoices( @@ -408,15 +395,15 @@ type ConsumerAccount implements Account """Returns the last n items from the list.""" last: Int walletIds: [WalletId] - ): InvoiceConnection @join__field(graph: PUBLIC) - level: AccountLevel! @join__field(graph: PUBLIC) - limits: AccountLimits! @join__field(graph: PUBLIC) - notificationSettings: NotificationSettings! @join__field(graph: PUBLIC) - pendingIncomingTransactions(walletIds: [WalletId]): [Transaction!]! @join__field(graph: PUBLIC) + ): InvoiceConnection + level: AccountLevel! + limits: AccountLimits! + notificationSettings: NotificationSettings! + pendingIncomingTransactions(walletIds: [WalletId]): [Transaction!]! """List the quiz questions of the consumer account""" - quiz: [Quiz!]! @join__field(graph: PUBLIC) - realtimePrice: RealtimePrice! @join__field(graph: PUBLIC) + quiz: [Quiz!]! + realtimePrice: RealtimePrice! """ A list of all transactions associated with walletIds optionally passed. @@ -434,9 +421,9 @@ type ConsumerAccount implements Account """Returns the last n items from the list.""" last: Int walletIds: [WalletId] - ): TransactionConnection @join__field(graph: PUBLIC) - walletById(walletId: WalletId!): Wallet! @join__field(graph: PUBLIC) - wallets: [Wallet!]! @join__field(graph: PUBLIC) + ): TransactionConnection + walletById(walletId: WalletId!): Wallet! + wallets: [Wallet!]! } """ @@ -1067,7 +1054,10 @@ type Mutation { apiKeyCreate(input: ApiKeyCreateInput!): ApiKeyCreatePayload! @join__field(graph: API_KEYS) apiKeyRevoke(input: ApiKeyRevokeInput!): ApiKeyRevokePayload! @join__field(graph: API_KEYS) - accountDisableNotificationChannelAlt(input: AccountDisableNotificationChannelInputAlt!): AccountUpdateNotificationSettingsPayloadAlt! @join__field(graph: NOTIFICATIONS) + userDisableNotificationChannel(input: UserDisableNotificationChannelInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) + userEnableNotificationChannel(input: UserEnableNotificationChannelInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) + userDisableNotificationCategory(input: UserDisableNotificationCategoryInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) + userEnableNotificationCategory(input: UserEnableNotificationCategoryInput!): UserUpdateNotificationSettingsPayload! @join__field(graph: NOTIFICATIONS) accountDelete: AccountDeletePayload! @join__field(graph: PUBLIC) accountDisableNotificationCategory(input: AccountDisableNotificationCategoryInput!): AccountUpdateNotificationSettingsPayload! @join__field(graph: PUBLIC) accountDisableNotificationChannel(input: AccountDisableNotificationChannelInput!): AccountUpdateNotificationSettingsPayload! @join__field(graph: PUBLIC) @@ -1236,25 +1226,12 @@ type NotificationChannelSettings enabled: Boolean! } -type NotificationChannelSettingsAlt - @join__type(graph: NOTIFICATIONS) -{ - enabled: Boolean! - disabledCategories: [String!]! -} - type NotificationSettings @join__type(graph: PUBLIC) { push: NotificationChannelSettings! } -type NotificationSettingsAlt - @join__type(graph: NOTIFICATIONS) -{ - push: NotificationChannelSettingsAlt! -} - """An address for an on-chain bitcoin destination""" scalar OnChainAddress @join__type(graph: PUBLIC) @@ -1872,10 +1849,12 @@ type UsdWallet implements Wallet type User @join__type(graph: API_KEYS, key: "id", extension: true) + @join__type(graph: NOTIFICATIONS, key: "id", extension: true) @join__type(graph: PUBLIC) { id: ID! apiKeys: [ApiKey!]! @join__field(graph: API_KEYS) + notificationSettings: UserNotificationSettings! @join__field(graph: NOTIFICATIONS) """ Get single contact details. @@ -1954,6 +1933,19 @@ type UserContactUpdateAliasPayload errors: [Error!]! } +input UserDisableNotificationCategoryInput + @join__type(graph: NOTIFICATIONS) +{ + channel: UserNotificationChannel! + category: UserNotificationCategory! +} + +input UserDisableNotificationChannelInput + @join__type(graph: NOTIFICATIONS) +{ + channel: UserNotificationChannel! +} + type UserEmailDeletePayload @join__type(graph: PUBLIC) { @@ -1989,6 +1981,19 @@ type UserEmailRegistrationValidatePayload me: User } +input UserEnableNotificationCategoryInput + @join__type(graph: NOTIFICATIONS) +{ + channel: UserNotificationChannel! + category: UserNotificationCategory! +} + +input UserEnableNotificationChannelInput + @join__type(graph: NOTIFICATIONS) +{ + channel: UserNotificationChannel! +} + input UserLoginInput @join__type(graph: PUBLIC) { @@ -2013,6 +2018,32 @@ input UserLogoutInput scalar Username @join__type(graph: PUBLIC) +enum UserNotificationCategory + @join__type(graph: NOTIFICATIONS) +{ + CIRCLES @join__enumValue(graph: NOTIFICATIONS) + PAYMENTS @join__enumValue(graph: NOTIFICATIONS) +} + +enum UserNotificationChannel + @join__type(graph: NOTIFICATIONS) +{ + PUSH @join__enumValue(graph: NOTIFICATIONS) +} + +type UserNotificationChannelSettings + @join__type(graph: NOTIFICATIONS) +{ + enabled: Boolean! + disabledCategories: [UserNotificationCategory!]! +} + +type UserNotificationSettings + @join__type(graph: NOTIFICATIONS) +{ + push: UserNotificationChannelSettings! +} + type UserPhoneDeletePayload @join__type(graph: PUBLIC) { @@ -2093,6 +2124,12 @@ type UserUpdateLanguagePayload user: User } +type UserUpdateNotificationSettingsPayload + @join__type(graph: NOTIFICATIONS) +{ + notificationSettings: UserNotificationSettings! +} + input UserUpdateUsernameInput @join__type(graph: PUBLIC) { diff --git a/charts/galoy/values.yaml b/charts/galoy/values.yaml index 96645507a5..4ba7744495 100644 --- a/charts/galoy/values.yaml +++ b/charts/galoy/values.yaml @@ -36,31 +36,31 @@ galoy: repository: us.gcr.io/galoy-org/galoy-api ## Digest of the image ## - digest: "sha256:decd9b21a100af95b7b5336b123015bb484bdbfd94a02136714a9642c74018ae" + digest: "sha256:3740ab5678fa6682cad54712056eae2a2896d44328401181126574ab8ce5631e" ## Not used by Helm, just used to ref to the source https://github.com/GaloyMoney/galoy.git ## Reference for timestamping the corresponding docker image and used by internal CI. ## - git_ref: "8f83645" + git_ref: "93a01a0" websocket: repository: us.gcr.io/galoy-org/galoy-api-ws-server ## Digest of the image ## - digest: "sha256:88a27bc5c3b626f775463da0a3c5f950e3ed5a025dc904cb773f9e4b029799cb" + digest: "sha256:e27fbfcb89faeceaa975dac4e97e2b394d976d4e5c2453f3613310b7e603aa0b" trigger: repository: us.gcr.io/galoy-org/galoy-api-trigger ## Digest of the image ## - digest: "sha256:c7caa0e6d8422a2b31149f492756043296d38d04c1cf58570b33bf3b08ef696b" + digest: "sha256:47b7dd955bea992637cd8b5719e2a507eccb9d652f64ab202dd12d5c89aafde9" cron: repository: us.gcr.io/galoy-org/galoy-api-cron ## Digest of the image ## - digest: "sha256:3c2f5e04f6f508387c6de70177babdc77086becdec8e3d636d4fbd7319342735" + digest: "sha256:6ce4e9a97272a86708045b564bb47b1bca913954eede2c26a5d748239e6904e3" exporter: repository: us.gcr.io/galoy-org/galoy-api-exporter ## Digest of the image ## - digest: "sha256:6dcee6fa859bee7aefe4ab370a2b99685a869c418aba11985c1c08db61bccac2" + digest: "sha256:5ad269eef56d70c40e33185be7f76ea5f9d536bd5857de9708151e0e53e72189" consent: repository: us.gcr.io/galoy-org/galoy-consent ## Digest of the image @@ -79,7 +79,7 @@ galoy: repository: us.gcr.io/galoy-org/galoy-api-migrate ## Digest of the image ## - digest: "sha256:d48a1e5cd738d5fbda0008cb84f30ccfdc7f019e6f5ea20c9c7b836d2712a786" + digest: "sha256:c2bc8b36ec7b6d203723dadf6d0dcf7a3fceef5513075c07dd93e1a0ff933576" ## Galoy Application MongoDB Backup Image details ## mongoBackup: