From 217070f759f03f2a4bd317f53d714265e8f96fce Mon Sep 17 00:00:00 2001
From: merle <sebastien.merle@stritzinger.com>
Date: Thu, 1 Dec 2022 08:41:19 -0800
Subject: [PATCH] te: Fix dependencies
---
src/te/Dockerfile | 1 +
src/te/apps/epce/src/epce_server.erl | 3 ++-
src/te/apps/tfte/src/tfte_app.erl | 2 +-
src/te/rebar.config | 2 +-
src/te/rebar.lock | 10 +++++-----
src/te/tests/deploy_specs.sh | 2 +-
6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/te/Dockerfile b/src/te/Dockerfile
index f580ccf4e..98194f254 100644
--- a/src/te/Dockerfile
+++ b/src/te/Dockerfile
@@ -35,6 +35,7 @@ FROM alpine
# Install some libs
RUN apk add --no-cache libgcc libstdc++ && \
apk add --no-cache openssl && \
+ apk add --no-cache libcrypto1.1 && \
apk add --no-cache ncurses-libs
# Install the released application
diff --git a/src/te/apps/epce/src/epce_server.erl b/src/te/apps/epce/src/epce_server.erl
index 507255385..03f1dacb2 100644
--- a/src/te/apps/epce/src/epce_server.erl
+++ b/src/te/apps/epce/src/epce_server.erl
@@ -234,7 +234,8 @@ compute_path(From, To) ->
logger:debug("Route from ~p to ~p: ~p", [From, To, Labels]),
{ok, Labels};
{error, Reason} ->
- logger:warning("Failed to find a route from ~p to ~p", [From, To]),
+ logger:warning("Failed to find a route from ~p to ~p: ~p",
+ [From, To, Reason]),
{error, route_not_found}
end.
diff --git a/src/te/apps/tfte/src/tfte_app.erl b/src/te/apps/tfte/src/tfte_app.erl
index 96724904d..12f8cd4fc 100644
--- a/src/te/apps/tfte/src/tfte_app.erl
+++ b/src/te/apps/tfte/src/tfte_app.erl
@@ -57,7 +57,7 @@ add_services([{Name, EndpointsSpecs, GrpcOpts} | Rest]) ->
end
catch
throw:{Name, Reason, Extra} ->
- ?LOG_WARNING("Failed to resolve ~s service configuration: ~s ~p ~p",
+ ?LOG_WARNING("Failed to resolve ~s service configuration: ~s ~p",
[Name, Reason, Extra])
end,
add_services(Rest).
diff --git a/src/te/rebar.config b/src/te/rebar.config
index 3451955c2..776a80249 100644
--- a/src/te/rebar.config
+++ b/src/te/rebar.config
@@ -2,7 +2,7 @@
{deps, [
grpcbox,
- {pcep_server, {git, "git@github.com:stritzinger/pcep_server.git", {branch, "master"}}}
+ {pcep_server, {git, "https://github.com/stritzinger/pcep_server.git", {branch, "master"}}}
]}.
{shell, [
diff --git a/src/te/rebar.lock b/src/te/rebar.lock
index ef9747fe4..446884e6b 100644
--- a/src/te/rebar.lock
+++ b/src/te/rebar.lock
@@ -2,7 +2,7 @@
[{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0">>},1},
{<<"chatterbox">>,{pkg,<<"ts_chatterbox">>,<<"0.12.0">>},1},
{<<"codec_sequencer">>,
- {git,"git@github.com:stritzinger/codec_sequencer.git",
+ {git,"https://github.com/stritzinger/codec_sequencer.git",
{ref,"fc8760894f7962ef1497bf6ce4247eb75db9d5ca"}},
2},
{<<"ctx">>,{pkg,<<"ctx">>,<<"0.6.0">>},1},
@@ -10,12 +10,12 @@
{<<"grpcbox">>,{pkg,<<"grpcbox">>,<<"0.15.0">>},0},
{<<"hpack">>,{pkg,<<"hpack_erl">>,<<"0.2.3">>},2},
{<<"pcep_codec">>,
- {git,"git@github.com:stritzinger/pcep_codec.git",
- {ref,"84dcc430b2aa427984c100cc19dd35d946b22ff9"}},
+ {git,"https://github.com/stritzinger/pcep_codec.git",
+ {ref,"ca5eb0822d9971ec4bcfb427a49b2e516081a126"}},
1},
{<<"pcep_server">>,
- {git,"git@github.com:stritzinger/pcep_server.git",
- {ref,"3910bf5546879cb91a3483008b6aed11753deaa6"}},
+ {git,"https://github.com/stritzinger/pcep_server.git",
+ {ref,"ea751fa807f4c1f5635f781431fe384610166b0a"}},
0},
{<<"ranch">>,{pkg,<<"ranch">>,<<"2.0.0">>},1}]}.
[
diff --git a/src/te/tests/deploy_specs.sh b/src/te/tests/deploy_specs.sh
index 17dd44dd5..cd8871a05 100644
--- a/src/te/tests/deploy_specs.sh
+++ b/src/te/tests/deploy_specs.sh
@@ -7,7 +7,7 @@ export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"
# interdomain slice pathcomp dlt
# dbscanserving opticalattackmitigator opticalattackdetector
# l3_attackmitigator l3_centralizedattackdetector l3_distributedattackdetector
-export TFS_COMPONENTS="context device pathcomp service slice webui" # te
+export TFS_COMPONENTS="context device pathcomp service slice webui te"
# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
--
GitLab