fix: Fix openssl dependencies

kindredgroup · Sep 29, 2023 · 05d4e4d · 05d4e4d
1 parent d00daef
commit 05d4e4d
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 14 deletions.
diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -13,12 +13,12 @@ jobs:
             fail-fast: false
             matrix:
                 settings:
-                  - host: macos-latest
-                    target: x86_64-apple-darwin
-                    jsPackageHome: packages/cohort_sdk_js
-                    finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.darwin-x64.node
-                    customiseHostCommand: echo 'No customizations are needed'
-                    buildCommand: npm run build -- --target x86_64-apple-darwin
+                  # - host: macos-latest
+                  #   target: x86_64-apple-darwin
+                  #   jsPackageHome: packages/cohort_sdk_js
+                  #   finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.darwin-x64.node
+                  #   customiseHostCommand: echo 'No customizations are needed'
+                  #   buildCommand: npm run build -- --target x86_64-apple-darwin
 
                   - host: macos-latest
                     target: aarch64-apple-darwin

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/agent_client/Cargo.toml b/examples/agent_client/Cargo.toml
@@ -14,7 +14,12 @@ async-trait =   { workspace = true }
 env_logger =    { workspace = true }
 log =           { workspace = true }
 rand =          { version = "0.8.5" }
+
 rdkafka =       { version = "0.34.0", features = ["sasl"] }
+rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
+openssl-sys = { version = "0.9", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
+
 serde =         { workspace = true }
 serde_json =    { workspace = true }
 strum =         { version = "0.25", features = ["derive"] }

diff --git a/examples/cohort_banking_with_sdk/Cargo.toml b/examples/cohort_banking_with_sdk/Cargo.toml
@@ -29,7 +29,12 @@ opentelemetry-stdout =      { version = "0.1.0", features = ["metrics"] }
 opentelemetry_sdk =         { version = "0.20.0", features = ["metrics", "rt-tokio"] }
 opentelemetry  =            { version = "0.20.0", features = ["metrics"] }
 rand =                      { version = "0.8.5" }
+
 rdkafka =                   { version = "0.34.0" }
+rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
+openssl-sys = { version = "0.9", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
+
 rust_decimal =              { version = "1.30.0", features = ["db-tokio-postgres", "serde-with-float"] }
 time =                      { version = "0.3.17" }
 tokio-postgres =            { version = "0.7", features = [ "with-uuid-1", "with-serde_json-1" ] }

diff --git a/examples/cohort_replicator_kafka_pg/Cargo.toml b/examples/cohort_replicator_kafka_pg/Cargo.toml
@@ -20,8 +20,11 @@ serde =       { workspace = true }
 serde_json =  { workspace = true }
 tokio =       { workspace = true, features = ["full"] }
 
-rdkafka =                   { version = "0.34.0", features = ["sasl"] }
-rdkafka-sys =               { version = "4.3.0" }
+rdkafka = { version = "0.34.0", features = ["sasl"] }
+rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
+openssl-sys = { version = "0.9", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
+
 rust_decimal =              { version = "1.30.0", features = ["db-tokio-postgres", "serde-with-float"] }
 time =                      { version = "0.3.17" }
 tokio-postgres =            { version = "0.7", features = [ "with-uuid-1", "with-serde_json-1" ] }

diff --git a/packages/cohort_sdk/Cargo.toml b/packages/cohort_sdk/Cargo.toml
@@ -13,11 +13,12 @@ opentelemetry_api = { version = "0.20.0" }
 opentelemetry_sdk = { version = "0.20.0", features = ["metrics", "rt-tokio"] }
 opentelemetry = { version = "0.20.0" }
 rand = { version = "0.8.5" }
+
 rdkafka = { version = "0.34.0", features = ["sasl"] }
+rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
 openssl-sys = { version = "0.9", features = ["vendored"] }
-sasl2-sys = { version = "0.1", features = ["vendored"] }
-#openssl = { version = "0.10.57" }
-#sasl2-sys = { version = "0.1.20", features = ["vendored", "openssl-vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
+
 serde = { workspace = true }
 serde_json = { workspace = true }
 strum = { version = "0.25", features = ["derive"] }

diff --git a/packages/talos_agent/Cargo.toml b/packages/talos_agent/Cargo.toml
@@ -9,7 +9,12 @@ async-trait =   { workspace = true }
 env_logger =    { workspace = true }
 log =           { workspace = true }
 multimap =      { version = "0.9.0" }
+
 rdkafka =       { version = "0.34.0", features = ["sasl"] }
+rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
+openssl-sys = { version = "0.9", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
+
 serde =         { workspace = true }
 serde_json =    { workspace = true }
 strum =         { version = "0.25", features = ["derive"] }

diff --git a/packages/talos_certifier_adapters/Cargo.toml b/packages/talos_certifier_adapters/Cargo.toml
@@ -21,9 +21,9 @@ async-trait = { workspace = true }
 futures-util = "0.3.21"
 # Kafka
 rdkafka = { version = "0.34.0", features = ["sasl"] }
-rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "libz-static", "gssapi-vendored"] }
+rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
 openssl-sys = { version = "0.9", features = ["vendored"] }
-#sasl2-sys = { version = "0.1", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
 
 # uuid
 uuid = { version = "1.4.1", features = ["v4"] }

diff --git a/packages/talos_rdkafka_utils/Cargo.toml b/packages/talos_rdkafka_utils/Cargo.toml
@@ -22,6 +22,9 @@ mockall = "0.11.0"
 thiserror = "1.0.31"
 
 rdkafka = { version = "0.34.0", features = ["sasl"] }
+rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
+openssl-sys = { version = "0.9", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
 
 [dev-dependencies]
 tokio-test = "0.4"