From 9dd99c0d78d375974b0a96ee207e5bcf12ac1d26 Mon Sep 17 00:00:00 2001
From: Alex Vanin <alexey@nspcc.ru>
Date: Fri, 29 Apr 2022 17:21:18 +0300
Subject: [PATCH] [#173] Update gateways to the latest version and tidy configs

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
---
 .env                                  |  4 ++--
 services/http_gate/.http.env          |  7 ++-----
 services/http_gate/docker-compose.yml |  4 +++-
 services/s3_gate/.s3.env              | 14 ++------------
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/.env b/.env
index e472703..a97dfa5 100644
--- a/.env
+++ b/.env
@@ -23,11 +23,11 @@ NATS_VERSION=2.7.2
 NATS_IMAGE=nats
 
 # HTTP Gate
-HTTP_GW_VERSION=0.18.0
+HTTP_GW_VERSION=0.20.0
 HTTP_GW_IMAGE=nspccdev/neofs-http-gw
 
 # S3 Gate
-S3_GW_VERSION=0.18.0
+S3_GW_VERSION=0.20.0
 S3_GW_IMAGE=nspccdev/neofs-s3-gw
 
 # Coredns 
diff --git a/services/http_gate/.http.env b/services/http_gate/.http.env
index 1b71a9e..6a90aad 100644
--- a/services/http_gate/.http.env
+++ b/services/http_gate/.http.env
@@ -6,10 +6,7 @@ HTTP_GW_REBALANCE_TIMER=5m
 HTTP_GW_CONNECT_TIMEOUT=60s
 HTTP_GW_REQUEST_TIMEOUT=300s
 
-HTTP_GW_KEEPALIVE_TIMEOUT=300s
-HTTP_GW_KEEPALIVE_TIME=120s
-HTTP_GW_KEEPALIVE_PERMIT_WITHOUT_STREAM=True
-
 HTTP_GW_METRICS=False
 HTTP_GW_PPROF=False
-HTTP_GW_VERBOSE=false
+
+HTTP_GW_RESOLVE_ORDER=dns
diff --git a/services/http_gate/docker-compose.yml b/services/http_gate/docker-compose.yml
index 2bd9e6f..446d164 100644
--- a/services/http_gate/docker-compose.yml
+++ b/services/http_gate/docker-compose.yml
@@ -8,6 +8,8 @@ services:
     hostname: http_gate
     container_name: http_gate
     restart: on-failure
+    dns: 
+      - ${IPV4_PREFIX}.53
     networks:
       http_gate_int:
       internet:
@@ -18,7 +20,7 @@ services:
     stop_signal: SIGKILL
     env_file: [ ".env", ".http.env", ".int_test.env" ]
     environment:
-      - HTTP_GW_WALLET=/wallet.json
+      - HTTP_GW_WALLET_PATH=/wallet.json
       - HTTP_GW_WALLET_PASSPHRASE=one
       - HTTP_GW_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
       - HTTP_GW_PEERS_0_WEIGHT=0.2
diff --git a/services/s3_gate/.s3.env b/services/s3_gate/.s3.env
index 920cb89..dc5d923 100644
--- a/services/s3_gate/.s3.env
+++ b/services/s3_gate/.s3.env
@@ -1,21 +1,11 @@
-S3_GW_REBALANCE_TIMER=15s
-S3_GW_REQUEST_TIMEOUT=15s
+S3_GW_REBALANCE_INTERVAL=15s
+S3_GW_HEALTHCHECK_TIMEOUT=15s
 S3_GW_CONNECT_TIMEOUT=30s
 
-S3_GW_KEEPALIVE_PERMIT_WITHOUT_STREAM=true
-S3_GW_KEEPALIVE_TIME=10s
-S3_GW_KEEPALIVE_TIMEOUT=10s
-
-S3_GW_LOGGER_FORMAT=console
 S3_GW_LOGGER_LEVEL=debug
-S3_GW_LOGGER_NO_DISCLAIMER=true
-S3_GW_LOGGER_SAMPLING_INITIAL=1000
-S3_GW_LOGGER_SAMPLING_THEREAFTER=1000
-S3_GW_LOGGER_TRACE_LEVEL=panic
 
 S3_GW_MAX_CLIENTS_COUNT=100
 S3_GW_MAX_CLIENTS_DEADLINE=30s
 
 S3_GW_METRICS=false
 S3_GW_PPROF=false
-S3_GW_VERBOSE=false