From ad679663fac5be8a005e357337b45f7711c181ea Mon Sep 17 00:00:00 2001 From: CI Bot Date: Fri, 3 Nov 2023 07:24:12 +0000 Subject: [PATCH] chore(deps): bump galoy image to 'sha256:9e9b65331b9c437d9a8d20411fdfbe94e9a5b547680de16edbc9488cd4b7ec7a' --- charts/galoy/Chart.yaml | 2 +- .../apollo-router/api-keys-schema.graphql | 10 ++-- charts/galoy/apollo-router/supergraph.graphql | 53 ++++++++++--------- charts/galoy/values.yaml | 14 ++--- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/charts/galoy/Chart.yaml b/charts/galoy/Chart.yaml index 539b2444da..0d30315279 100644 --- a/charts/galoy/Chart.yaml +++ b/charts/galoy/Chart.yaml @@ -16,7 +16,7 @@ version: 0.26.16-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.15.83 +appVersion: 0.15.85 dependencies: - name: redis repository: https://charts.bitnami.com/bitnami diff --git a/charts/galoy/apollo-router/api-keys-schema.graphql b/charts/galoy/apollo-router/api-keys-schema.graphql index 95425a23af..3dd0a0b508 100644 --- a/charts/galoy/apollo-router/api-keys-schema.graphql +++ b/charts/galoy/apollo-router/api-keys-schema.graphql @@ -19,11 +19,6 @@ input ApiKeyRevokeInput { } -extend type ConsumerAccount @key(fields: "id") { - id: ID! @external - apiKeys: [ApiKey!]! -} - """ Implement the DateTime scalar @@ -41,6 +36,11 @@ type Mutation { +extend type User @key(fields: "id") { + id: ID! @external + apiKeys: [ApiKey!]! +} + extend schema @link( url: "https://specs.apollo.dev/federation/v2.3", import: ["@key", "@tag", "@shareable", "@inaccessible", "@override", "@external", "@provides", "@requires", "@composeDirective", "@interfaceObject"] diff --git a/charts/galoy/apollo-router/supergraph.graphql b/charts/galoy/apollo-router/supergraph.graphql index 19abc66a5b..9766afb20e 100644 --- a/charts/galoy/apollo-router/supergraph.graphql +++ b/charts/galoy/apollo-router/supergraph.graphql @@ -320,26 +320,24 @@ type CentAmountPayload type ConsumerAccount implements Account @join__implements(graph: PUBLIC, interface: "Account") - @join__type(graph: API_KEYS, key: "id", extension: true) @join__type(graph: PUBLIC) { - id: ID! - apiKeys: [ApiKey!]! @join__field(graph: API_KEYS) - 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) - defaultWalletId: WalletId! @join__field(graph: PUBLIC) - displayCurrency: DisplayCurrency! @join__field(graph: PUBLIC) - level: AccountLevel! @join__field(graph: PUBLIC) - limits: AccountLimits! @join__field(graph: PUBLIC) - notificationSettings: NotificationSettings! @join__field(graph: PUBLIC) + csvTransactions(walletIds: [WalletId!]!): String! + defaultWalletId: WalletId! + displayCurrency: DisplayCurrency! + id: ID! + level: AccountLevel! + limits: AccountLimits! + notificationSettings: NotificationSettings! """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. @@ -357,9 +355,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!]! } """ @@ -1690,43 +1688,46 @@ type UsdWallet implements Wallet } type User + @join__type(graph: API_KEYS, key: "id", extension: true) @join__type(graph: PUBLIC) { + id: ID! + apiKeys: [ApiKey!]! @join__field(graph: API_KEYS) + """ Get single contact details. Can include the transactions associated with the contact. """ - contactByUsername(username: Username!): UserContact! @deprecated(reason: "will be moved to Accounts") + contactByUsername(username: Username!): UserContact! @join__field(graph: PUBLIC) @deprecated(reason: "will be moved to Accounts") """ Get full list of contacts. Can include the transactions associated with each contact. """ - contacts: [UserContact!]! @deprecated(reason: "will be moved to account") - createdAt: Timestamp! - defaultAccount: Account! + contacts: [UserContact!]! @join__field(graph: PUBLIC) @deprecated(reason: "will be moved to account") + createdAt: Timestamp! @join__field(graph: PUBLIC) + defaultAccount: Account! @join__field(graph: PUBLIC) """Email address""" - email: Email - id: ID! + email: Email @join__field(graph: PUBLIC) """ Preferred language for user. When value is 'default' the intent is to use preferred language from OS settings. """ - language: Language! + language: Language! @join__field(graph: PUBLIC) """Phone number with international calling code.""" - phone: Phone + phone: Phone @join__field(graph: PUBLIC) """List the quiz questions the user may have completed.""" - quizQuestions: [UserQuizQuestion!]! @deprecated(reason: "use Quiz from Account instead") + quizQuestions: [UserQuizQuestion!]! @join__field(graph: PUBLIC) @deprecated(reason: "use Quiz from Account instead") """Whether TOTP is enabled for this user.""" - totpEnabled: Boolean! + totpEnabled: Boolean! @join__field(graph: PUBLIC) """Optional immutable user friendly identifier.""" - username: Username @deprecated(reason: "will be moved to @Handle in Account and Wallet") + username: Username @join__field(graph: PUBLIC) @deprecated(reason: "will be moved to @Handle in Account and Wallet") } type UserContact diff --git a/charts/galoy/values.yaml b/charts/galoy/values.yaml index f12965522c..8c600e074c 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:6d875d027323afe51d6d23aa101e68b55e0904f133b685fa6251561965861b50" + digest: "sha256:9e9b65331b9c437d9a8d20411fdfbe94e9a5b547680de16edbc9488cd4b7ec7a" ## 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: "8b2b2ac" + git_ref: "d17fb06" websocket: repository: us.gcr.io/galoy-org/galoy-api-ws-server ## Digest of the image ## - digest: "sha256:c033574c691cfd1fe12a50def8a3ad153b980562f86cb8b832961b766ba7a376" + digest: "sha256:bf970b0cc67ef9cb75d65eef06dcb8a88f1d59c4ac6a4bf828a96deb0ccb6ee2" trigger: repository: us.gcr.io/galoy-org/galoy-api-trigger ## Digest of the image ## - digest: "sha256:f3551282c242e1e1fe3fceaf3bbeff74015e49450bbfa470222e9a489be29b68" + digest: "sha256:8b37bac66f77223e3249d529ac21c6ed2cb0f2f3fa58ec0c0f81df7c459fe2d7" cron: repository: us.gcr.io/galoy-org/galoy-api-cron ## Digest of the image ## - digest: "sha256:156083c8b31f200dc2e33ea2d36c1ec29dae3c14dc7dce2ac95f2d3908e6774e" + digest: "sha256:7d3054c14becd03a8e3eebcd27710c429cc253a5624ac1a725938fee64e6702a" exporter: repository: us.gcr.io/galoy-org/galoy-api-exporter ## Digest of the image ## - digest: "sha256:538f6a0d3a5e9b285492e486f009ead3b8d76a4beb350afe58230fab8d3f90ea" + digest: "sha256:76a1d908e3f28e914aebf1cce4b60e53c3aff56a4244bb27220035430a6f8de1" consent: repository: us.gcr.io/galoy-org/galoy-consent ## Digest of the image @@ -74,7 +74,7 @@ galoy: repository: us.gcr.io/galoy-org/galoy-app-migrate ## Digest of the image ## - digest: "sha256:12d685b37d15dcd75daacf11dd118487aaa375affa466ea135bf891229dbcb1d" + digest: "sha256:9464a401893d7f9ac3be116c558f2edb93bf690a534b55e929fbdaa4446604ff" ## Galoy Application MongoDB Backup Image details ## mongoBackup: