From d288e2c141aca30974088d0c8f6f1e2957fb3092 Mon Sep 17 00:00:00 2001
From: Alex Vanin <a.vanin@yadro.com>
Date: Fri, 2 Jun 2023 18:12:38 +0300
Subject: [PATCH] Use older version of S3 gateway with 2pset implementation

---
 .env                    |  2 +-
 Dockerfile              |  6 +++---
 Makefile                |  2 +-
 bin/init-aio.sh         |  2 +-
 s3-gw/s3-gw-config.yaml | 10 ++++------
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index dcf003b..5a37dfc 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 FROSTFS_HUB_IMAGE=truecloudlab/frostfs
 AIO_IMAGE=truecloudlab/frostfs-aio
-AIO_VERSION=1.2.7
+AIO_VERSION=1.2.7-1
diff --git a/Dockerfile b/Dockerfile
index 7d5e013..1adbb08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} as frostfs-adm
 FROM ${FROSTFS_HUB_IMAGE}-cli:${FROSTFS_CORE_TAG} as frostfs-cli
 FROM ${FROSTFS_HUB_IMAGE}-ir:${FROSTFS_CORE_TAG} as frostfs-ir
 FROM ${FROSTFS_HUB_IMAGE}-storage:${FROSTFS_CORE_TAG} as frostfs-storage
-FROM ${FROSTFS_HUB_IMAGE}-s3-gw:${FROSTFS_GATES_TAG} as frostfs-s3-gw
+FROM nspccdev/neofs-s3-gw:0.21.1 as neofs-s3-gw
 FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_GATES_TAG} as frostfs-http-gw
 
 # Executable image
@@ -32,8 +32,8 @@ COPY --from=frostfs-adm /bin/frostfs-adm /usr/bin/frostfs-adm
 COPY --from=frostfs-cli /bin/frostfs-cli /usr/bin/frostfs-cli
 COPY --from=frostfs-ir /bin/frostfs-ir /usr/bin/frostfs-ir
 COPY --from=frostfs-storage /bin/frostfs-node /usr/bin/frostfs-node
-COPY --from=frostfs-s3-gw /bin/frostfs-s3-gw /usr/bin/frostfs-s3-gw
-COPY --from=frostfs-s3-gw /bin/frostfs-s3-authmate /usr/bin/frostfs-s3-authmate
+COPY --from=neofs-s3-gw /bin/neofs-s3-gw /usr/bin/neofs-s3-gw
+COPY --from=neofs-s3-gw /bin/neofs-authmate /usr/bin/neofs-authmate
 COPY --from=frostfs-http-gw /bin/frostfs-http-gw /usr/bin/frostfs-http-gw
 
 COPY ./adm/frostfs-adm.yml /config/frostfs-adm.yml
diff --git a/Makefile b/Makefile
index 1144bac..7f0fc02 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ clean:
 
 # Generate S3 credentials
 s3cred:
-	@docker exec aio /usr/bin/frostfs-s3-authmate issue-secret \
+	@docker exec aio /usr/bin/neofs-authmate issue-secret \
 		--wallet /config/user-wallet.json \
 		--peer localhost:8080 \
 		--gate-public-key $(S3_GATE_PUBLIC_KEY) \
diff --git a/bin/init-aio.sh b/bin/init-aio.sh
index ec81ea7..4c6a95e 100755
--- a/bin/init-aio.sh
+++ b/bin/init-aio.sh
@@ -54,7 +54,7 @@ runServices() {
     sleep 2
   done
 
-  /usr/bin/frostfs-s3-gw --config /config/s3-gw-config.yaml &
+  /usr/bin/neofs-s3-gw --config /config/s3-gw-config.yaml --wallet /config/s3-gw-wallet.json &
   /usr/bin/frostfs-http-gw --config /config/http-gw-config.yaml &
 }
 
diff --git a/s3-gw/s3-gw-config.yaml b/s3-gw/s3-gw-config.yaml
index 522e1b4..4fa4baa 100644
--- a/s3-gw/s3-gw-config.yaml
+++ b/s3-gw/s3-gw-config.yaml
@@ -1,7 +1,7 @@
 wallet:
-  path: /config/s3-gw-wallet.json
   passphrase: ""
-  address: NN1RQ3qwnvDMVNsQw4WPkKi7BrjxdVTDZp
+
+address: NN1RQ3qwnvDMVNsQw4WPkKi7BrjxdVTDZp
 
 peers:
   0:
@@ -9,8 +9,7 @@ peers:
     priority: 1
     weight: 1
 
-server:
-  - address: 0.0.0.0:8084
+listen_address: 0.0.0.0:8084
 
 logger:
   level: debug
@@ -61,7 +60,6 @@ cache:
     lifetime: 1m
     size: 100000
 
-placement_policy:
-  default: REP 1
+default_policy: REP 1