diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f4a2e58f..c48d62cd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## [0.189.6] - 2024-07-3 ### Fixed - GQL API regression where unparsable SQL was ending up in internal error - REST API `/query` endpoint will return `400 Bad Request` in case of unparsable SQL +- Bug fixed in database IAM token authentication method (redundant session token request) ## [0.189.4] - 2024-07-02 ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 97fa65dfb..f7c1ea398 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1262,7 +1262,7 @@ dependencies = [ "aws-runtime", "aws-sdk-sso", "aws-sdk-ssooidc", - "aws-sdk-sts 0.36.0", + "aws-sdk-sts", "aws-smithy-async", "aws-smithy-http", "aws-smithy-json", @@ -1430,29 +1430,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "aws-sdk-sts" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b1a8ae5c7098502a3e6d4130dbee1e1d3fcb8dc5d65cecab39e01d595f90f6" -dependencies = [ - "aws-credential-types", - "aws-http", - "aws-runtime", - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "http 0.2.12", - "regex", - "tracing", -] - [[package]] name = "aws-sdk-sts" version = "0.36.0" @@ -2320,7 +2297,7 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "container-runtime" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "cfg-if", @@ -2719,12 +2696,12 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "database-common" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "aws-config", + "aws-credential-types", "aws-sdk-secretsmanager", - "aws-sdk-sts 0.35.0", "chrono", "dill", "hex", @@ -3476,7 +3453,7 @@ dependencies = [ [[package]] name = "enum-variants" -version = "0.189.5" +version = "0.189.6" [[package]] name = "env_filter" @@ -3538,7 +3515,7 @@ dependencies = [ [[package]] name = "event-bus" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "dill", @@ -3559,7 +3536,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-sourcing" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -3574,7 +3551,7 @@ dependencies = [ [[package]] name = "event-sourcing-macros" -version = "0.189.5" +version = "0.189.6" dependencies = [ "quote", "syn 2.0.68", @@ -4327,7 +4304,7 @@ dependencies = [ "hyper 1.4.0", "hyper-util", "rustls 0.23.10", - "rustls-native-certs 0.7.0", + "rustls-native-certs 0.7.1", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -4545,7 +4522,7 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "internal-error" -version = "0.189.5" +version = "0.189.6" dependencies = [ "thiserror", ] @@ -4702,7 +4679,7 @@ dependencies = [ [[package]] name = "kamu" -version = "0.189.5" +version = "0.189.6" dependencies = [ "alloy", "async-recursion", @@ -4785,7 +4762,7 @@ dependencies = [ [[package]] name = "kamu-accounts" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "base32", @@ -4810,7 +4787,7 @@ dependencies = [ [[package]] name = "kamu-accounts-inmem" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -4828,7 +4805,7 @@ dependencies = [ [[package]] name = "kamu-accounts-mysql" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -4848,7 +4825,7 @@ dependencies = [ [[package]] name = "kamu-accounts-postgres" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -4868,7 +4845,7 @@ dependencies = [ [[package]] name = "kamu-accounts-repo-tests" -version = "0.189.5" +version = "0.189.6" dependencies = [ "argon2", "chrono", @@ -4883,7 +4860,7 @@ dependencies = [ [[package]] name = "kamu-accounts-services" -version = "0.189.5" +version = "0.189.6" dependencies = [ "argon2", "async-trait", @@ -4909,7 +4886,7 @@ dependencies = [ [[package]] name = "kamu-accounts-sqlite" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -4929,7 +4906,7 @@ dependencies = [ [[package]] name = "kamu-adapter-auth-oso" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "dill", @@ -4949,7 +4926,7 @@ dependencies = [ [[package]] name = "kamu-adapter-flight-sql" -version = "0.189.5" +version = "0.189.6" dependencies = [ "arrow-flight", "async-trait", @@ -4972,7 +4949,7 @@ dependencies = [ [[package]] name = "kamu-adapter-graphql" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-graphql", "async-trait", @@ -5017,7 +4994,7 @@ dependencies = [ [[package]] name = "kamu-adapter-http" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "aws-sdk-s3", @@ -5070,7 +5047,7 @@ dependencies = [ [[package]] name = "kamu-adapter-oauth" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -5090,7 +5067,7 @@ dependencies = [ [[package]] name = "kamu-adapter-odata" -version = "0.189.5" +version = "0.189.6" dependencies = [ "axum", "chrono", @@ -5120,7 +5097,7 @@ dependencies = [ [[package]] name = "kamu-cli" -version = "0.189.5" +version = "0.189.6" dependencies = [ "arrow-flight", "assert_cmd", @@ -5219,7 +5196,7 @@ dependencies = [ [[package]] name = "kamu-cli-e2e-common" -version = "0.189.5" +version = "0.189.6" dependencies = [ "indoc 2.0.5", "internal-error", @@ -5237,7 +5214,7 @@ dependencies = [ [[package]] name = "kamu-cli-e2e-inmem" -version = "0.189.5" +version = "0.189.6" dependencies = [ "indoc 2.0.5", "kamu-cli-e2e-common", @@ -5249,7 +5226,7 @@ dependencies = [ [[package]] name = "kamu-cli-e2e-mysql" -version = "0.189.5" +version = "0.189.6" dependencies = [ "indoc 2.0.5", "kamu-cli-e2e-common", @@ -5262,7 +5239,7 @@ dependencies = [ [[package]] name = "kamu-cli-e2e-postgres" -version = "0.189.5" +version = "0.189.6" dependencies = [ "indoc 2.0.5", "kamu-cli-e2e-common", @@ -5275,7 +5252,7 @@ dependencies = [ [[package]] name = "kamu-cli-e2e-repo-tests" -version = "0.189.5" +version = "0.189.6" dependencies = [ "chrono", "indoc 2.0.5", @@ -5288,7 +5265,7 @@ dependencies = [ [[package]] name = "kamu-cli-e2e-sqlite" -version = "0.189.5" +version = "0.189.6" dependencies = [ "indoc 2.0.5", "kamu-cli-e2e-common", @@ -5301,7 +5278,7 @@ dependencies = [ [[package]] name = "kamu-core" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -5329,7 +5306,7 @@ dependencies = [ [[package]] name = "kamu-data-utils" -version = "0.189.5" +version = "0.189.6" dependencies = [ "arrow", "arrow-digest", @@ -5354,7 +5331,7 @@ dependencies = [ [[package]] name = "kamu-datafusion-cli" -version = "0.189.5" +version = "0.189.6" dependencies = [ "arrow", "async-trait", @@ -5376,7 +5353,7 @@ dependencies = [ [[package]] name = "kamu-flow-system" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -5401,7 +5378,7 @@ dependencies = [ [[package]] name = "kamu-flow-system-inmem" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -5428,7 +5405,7 @@ dependencies = [ [[package]] name = "kamu-flow-system-postgres" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -5451,7 +5428,7 @@ dependencies = [ [[package]] name = "kamu-flow-system-repo-tests" -version = "0.189.5" +version = "0.189.6" dependencies = [ "chrono", "dill", @@ -5462,7 +5439,7 @@ dependencies = [ [[package]] name = "kamu-flow-system-services" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -5500,7 +5477,7 @@ dependencies = [ [[package]] name = "kamu-flow-system-sqlite" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -5523,7 +5500,7 @@ dependencies = [ [[package]] name = "kamu-ingest-datafusion" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -5560,7 +5537,7 @@ dependencies = [ [[package]] name = "kamu-repo-tools" -version = "0.189.5" +version = "0.189.6" dependencies = [ "chrono", "clap", @@ -5575,7 +5552,7 @@ dependencies = [ [[package]] name = "kamu-task-system" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -5590,7 +5567,7 @@ dependencies = [ [[package]] name = "kamu-task-system-inmem" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-trait", "chrono", @@ -5605,7 +5582,7 @@ dependencies = [ [[package]] name = "kamu-task-system-postgres" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -5627,7 +5604,7 @@ dependencies = [ [[package]] name = "kamu-task-system-repo-tests" -version = "0.189.5" +version = "0.189.6" dependencies = [ "chrono", "dill", @@ -5638,7 +5615,7 @@ dependencies = [ [[package]] name = "kamu-task-system-services" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -5657,7 +5634,7 @@ dependencies = [ [[package]] name = "kamu-task-system-sqlite" -version = "0.189.5" +version = "0.189.6" dependencies = [ "async-stream", "async-trait", @@ -6143,7 +6120,7 @@ dependencies = [ [[package]] name = "multiformats" -version = "0.189.5" +version = "0.189.6" dependencies = [ "bs58", "digest 0.10.7", @@ -6462,7 +6439,7 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opendatafabric" -version = "0.189.5" +version = "0.189.6" dependencies = [ "arrow", "base64 0.21.7", @@ -7320,7 +7297,7 @@ dependencies = [ [[package]] name = "random-names" -version = "0.189.5" +version = "0.189.6" dependencies = [ "rand", ] @@ -7501,7 +7478,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls 0.23.10", - "rustls-native-certs 0.7.0", + "rustls-native-certs 0.7.1", "rustls-pemfile 2.1.2", "rustls-pki-types", "serde", @@ -7776,7 +7753,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.4", + "rustls-webpki 0.102.5", "subtle", "zeroize", ] @@ -7795,9 +7772,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile 2.1.2", @@ -7843,9 +7820,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -9320,7 +9297,7 @@ dependencies = [ [[package]] name = "tracing-perfetto" -version = "0.189.5" +version = "0.189.6" dependencies = [ "conv", "serde", @@ -10130,18 +10107,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 5ecc1e4c8..a2011dac5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,68 +66,68 @@ resolver = "2" [workspace.dependencies] # Apps -kamu-cli = { version = "0.189.5", path = "src/app/cli", default-features = false } +kamu-cli = { version = "0.189.6", path = "src/app/cli", default-features = false } # Utils -container-runtime = { version = "0.189.5", path = "src/utils/container-runtime", default-features = false } -database-common = { version = "0.189.5", path = "src/utils/database-common", default-features = false } -enum-variants = { version = "0.189.5", path = "src/utils/enum-variants", default-features = false } -event-bus = { version = "0.189.5", path = "src/utils/event-bus", default-features = false } -event-sourcing = { version = "0.189.5", path = "src/utils/event-sourcing", default-features = false } -event-sourcing-macros = { version = "0.189.5", path = "src/utils/event-sourcing-macros", default-features = false } -internal-error = { version = "0.189.5", path = "src/utils/internal-error", default-features = false } -kamu-data-utils = { version = "0.189.5", path = "src/utils/data-utils", default-features = false } -kamu-datafusion-cli = { version = "0.189.5", path = "src/utils/datafusion-cli", default-features = false } -multiformats = { version = "0.189.5", path = "src/utils/multiformats", default-features = false } -random-names = { version = "0.189.5", path = "src/utils/random-names", default-features = false } -tracing-perfetto = { version = "0.189.5", path = "src/utils/tracing-perfetto", default-features = false } +container-runtime = { version = "0.189.6", path = "src/utils/container-runtime", default-features = false } +database-common = { version = "0.189.6", path = "src/utils/database-common", default-features = false } +enum-variants = { version = "0.189.6", path = "src/utils/enum-variants", default-features = false } +event-bus = { version = "0.189.6", path = "src/utils/event-bus", default-features = false } +event-sourcing = { version = "0.189.6", path = "src/utils/event-sourcing", default-features = false } +event-sourcing-macros = { version = "0.189.6", path = "src/utils/event-sourcing-macros", default-features = false } +internal-error = { version = "0.189.6", path = "src/utils/internal-error", default-features = false } +kamu-data-utils = { version = "0.189.6", path = "src/utils/data-utils", default-features = false } +kamu-datafusion-cli = { version = "0.189.6", path = "src/utils/datafusion-cli", default-features = false } +multiformats = { version = "0.189.6", path = "src/utils/multiformats", default-features = false } +random-names = { version = "0.189.6", path = "src/utils/random-names", default-features = false } +tracing-perfetto = { version = "0.189.6", path = "src/utils/tracing-perfetto", default-features = false } # Domain -opendatafabric = { version = "0.189.5", path = "src/domain/opendatafabric", default-features = false } -kamu-core = { version = "0.189.5", path = "src/domain/core", default-features = false } -kamu-accounts = { version = "0.189.5", path = "src/domain/accounts/domain", default-features = false } -kamu-task-system = { version = "0.189.5", path = "src/domain/task-system/domain", default-features = false } -kamu-flow-system = { version = "0.189.5", path = "src/domain/flow-system/domain", default-features = false } +opendatafabric = { version = "0.189.6", path = "src/domain/opendatafabric", default-features = false } +kamu-core = { version = "0.189.6", path = "src/domain/core", default-features = false } +kamu-accounts = { version = "0.189.6", path = "src/domain/accounts/domain", default-features = false } +kamu-task-system = { version = "0.189.6", path = "src/domain/task-system/domain", default-features = false } +kamu-flow-system = { version = "0.189.6", path = "src/domain/flow-system/domain", default-features = false } # Domain service layer -kamu-accounts-services = { version = "0.189.5", path = "src/domain/accounts/services", default-features = false } -kamu-task-system-services = { version = "0.189.5", path = "src/domain/task-system/services", default-features = false } -kamu-flow-system-services = { version = "0.189.5", path = "src/domain/flow-system/services", default-features = false } +kamu-accounts-services = { version = "0.189.6", path = "src/domain/accounts/services", default-features = false } +kamu-task-system-services = { version = "0.189.6", path = "src/domain/task-system/services", default-features = false } +kamu-flow-system-services = { version = "0.189.6", path = "src/domain/flow-system/services", default-features = false } # Infra -kamu = { version = "0.189.5", path = "src/infra/core", default-features = false } -kamu-ingest-datafusion = { version = "0.189.5", path = "src/infra/ingest-datafusion", default-features = false } +kamu = { version = "0.189.6", path = "src/infra/core", default-features = false } +kamu-ingest-datafusion = { version = "0.189.6", path = "src/infra/ingest-datafusion", default-features = false } ## Flow System -kamu-flow-system-repo-tests = { version = "0.189.5", path = "src/infra/flow-system/repo-tests", default-features = false } -kamu-flow-system-inmem = { version = "0.189.5", path = "src/infra/flow-system/inmem", default-features = false } -kamu-flow-system-postgres = { version = "0.189.5", path = "src/infra/flow-system/postgres", default-features = false } -kamu-flow-system-sqlite = { version = "0.189.5", path = "src/infra/flow-system/sqlite", default-features = false } +kamu-flow-system-repo-tests = { version = "0.189.6", path = "src/infra/flow-system/repo-tests", default-features = false } +kamu-flow-system-inmem = { version = "0.189.6", path = "src/infra/flow-system/inmem", default-features = false } +kamu-flow-system-postgres = { version = "0.189.6", path = "src/infra/flow-system/postgres", default-features = false } +kamu-flow-system-sqlite = { version = "0.189.6", path = "src/infra/flow-system/sqlite", default-features = false } ## Accounts -kamu-accounts-inmem = { version = "0.189.5", path = "src/infra/accounts/inmem", default-features = false } -kamu-accounts-mysql = { version = "0.189.5", path = "src/infra/accounts/mysql", default-features = false } -kamu-accounts-postgres = { version = "0.189.5", path = "src/infra/accounts/postgres", default-features = false } -kamu-accounts-sqlite = { version = "0.189.5", path = "src/infra/accounts/sqlite", default-features = false } -kamu-accounts-repo-tests = { version = "0.189.5", path = "src/infra/accounts/repo-tests", default-features = false } +kamu-accounts-inmem = { version = "0.189.6", path = "src/infra/accounts/inmem", default-features = false } +kamu-accounts-mysql = { version = "0.189.6", path = "src/infra/accounts/mysql", default-features = false } +kamu-accounts-postgres = { version = "0.189.6", path = "src/infra/accounts/postgres", default-features = false } +kamu-accounts-sqlite = { version = "0.189.6", path = "src/infra/accounts/sqlite", default-features = false } +kamu-accounts-repo-tests = { version = "0.189.6", path = "src/infra/accounts/repo-tests", default-features = false } ## Task System -kamu-task-system-inmem = { version = "0.189.5", path = "src/infra/task-system/inmem", default-features = false } -kamu-task-system-postgres = { version = "0.189.5", path = "src/infra/task-system/postgres", default-features = false } -kamu-task-system-sqlite = { version = "0.189.5", path = "src/infra/task-system/sqlite", default-features = false } -kamu-task-system-repo-tests = { version = "0.189.5", path = "src/infra/task-system/repo-tests", default-features = false } +kamu-task-system-inmem = { version = "0.189.6", path = "src/infra/task-system/inmem", default-features = false } +kamu-task-system-postgres = { version = "0.189.6", path = "src/infra/task-system/postgres", default-features = false } +kamu-task-system-sqlite = { version = "0.189.6", path = "src/infra/task-system/sqlite", default-features = false } +kamu-task-system-repo-tests = { version = "0.189.6", path = "src/infra/task-system/repo-tests", default-features = false } # Adapters -kamu-adapter-auth-oso = { version = "0.189.5", path = "src/adapter/auth-oso", default-features = false } -kamu-adapter-flight-sql = { version = "0.189.5", path = "src/adapter/flight-sql", default-features = false } -kamu-adapter-graphql = { version = "0.189.5", path = "src/adapter/graphql", default-features = false } -kamu-adapter-http = { version = "0.189.5", path = "src/adapter/http", default-features = false } -kamu-adapter-odata = { version = "0.189.5", path = "src/adapter/odata", defualt-features = false } -kamu-adapter-oauth = { version = "0.189.5", path = "src/adapter/oauth", defualt-features = false } +kamu-adapter-auth-oso = { version = "0.189.6", path = "src/adapter/auth-oso", default-features = false } +kamu-adapter-flight-sql = { version = "0.189.6", path = "src/adapter/flight-sql", default-features = false } +kamu-adapter-graphql = { version = "0.189.6", path = "src/adapter/graphql", default-features = false } +kamu-adapter-http = { version = "0.189.6", path = "src/adapter/http", default-features = false } +kamu-adapter-odata = { version = "0.189.6", path = "src/adapter/odata", defualt-features = false } +kamu-adapter-oauth = { version = "0.189.6", path = "src/adapter/oauth", defualt-features = false } # E2E -kamu-cli-e2e-common = { version = "0.189.5", path = "src/e2e/app/cli/common", defualt-features = false } -kamu-cli-e2e-repo-tests = { version = "0.189.5", path = "src/e2e/app/cli/repo-tests", defualt-features = false } +kamu-cli-e2e-common = { version = "0.189.6", path = "src/e2e/app/cli/common", defualt-features = false } +kamu-cli-e2e-repo-tests = { version = "0.189.6", path = "src/e2e/app/cli/repo-tests", defualt-features = false } [workspace.package] -version = "0.189.5" +version = "0.189.6" edition = "2021" homepage = "https://github.com/kamu-data/kamu-cli" repository = "https://github.com/kamu-data/kamu-cli" diff --git a/LICENSE.txt b/LICENSE.txt index abefe26c8..ae37e9552 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -11,7 +11,7 @@ Business Source License 1.1 Licensor: Kamu Data, Inc. -Licensed Work: Kamu CLI Version 0.189.5 +Licensed Work: Kamu CLI Version 0.189.6 The Licensed Work is © 2023 Kamu Data, Inc. Additional Use Grant: You may use the Licensed Work for any purpose, diff --git a/src/utils/database-common/Cargo.toml b/src/utils/database-common/Cargo.toml index ce19033f9..474e1ebf5 100644 --- a/src/utils/database-common/Cargo.toml +++ b/src/utils/database-common/Cargo.toml @@ -24,7 +24,7 @@ doctest = false [dependencies] aws-config = "0.57" aws-sdk-secretsmanager = "0.35" -aws-sdk-sts = "0.35" +aws-credential-types = "0.57" async-trait = "0.1" chrono = { version = "0.4", default-features = false } dill = "0.8" diff --git a/src/utils/database-common/src/password/provider/db_aws_iam_token_provider.rs b/src/utils/database-common/src/password/provider/db_aws_iam_token_provider.rs index bcee9a2f8..97de53333 100644 --- a/src/utils/database-common/src/password/provider/db_aws_iam_token_provider.rs +++ b/src/utils/database-common/src/password/provider/db_aws_iam_token_provider.rs @@ -8,7 +8,7 @@ // by the Apache License, Version 2.0. use aws_config::meta::region::RegionProviderChain; -use aws_sdk_sts::Client as StsClient; +use aws_credential_types::provider::ProvideCredentials; use chrono::Utc; use dill::*; use hmac::{Hmac, Mac}; @@ -65,14 +65,16 @@ impl DatabasePasswordProvider for DatabaseAwsIamTokenProvider { let region_provider = RegionProviderChain::default_provider().or_else("unspefified"); let config = aws_config::from_env().region(region_provider).load().await; - let sts_client = StsClient::new(&config); - let session_token_output = sts_client.get_session_token().send().await.int_err()?; + let creds = config + .credentials_provider() + .unwrap() + .provide_credentials() + .await + .unwrap(); - let credentials = session_token_output.credentials().unwrap(); - - let access_key = credentials.access_key_id(); - let secret_key = credentials.secret_access_key(); - let session_token = credentials.session_token(); + let access_key = creds.access_key_id(); + let secret_key = creds.secret_access_key(); + let session_token = creds.session_token().unwrap_or_default(); let endpoint = format!( "{}:{}/{}",