Use 9002 port

Author: ggcr

.github/workflows/ci.yml

@@ -18,14 +18,14 @@ jobs:
 
     - name: Start MinIO server
       run: |
-        docker run -d -p 9000:9000 -p 9001:9001 \
+        docker run -d -p 9002:9002 -p 9003:9003 \
           -e "MINIO_ROOT_USER=minio_access" \
           -e "MINIO_ROOT_PASSWORD=minio_secret" \
           --name minio-server \
           s3cpp-minio:latest \
-          server /data --console-address ":9001"
+          server /data --address ":9002" --console-address ":9003"
 
-        timeout 30 bash -c 'until curl -f http://localhost:9000/minio/health/live 2>/dev/null; do sleep 1; done'
+        timeout 30 bash -c 'until curl -f http://localhost:9002/minio/health/live 2>/dev/null; do sleep 1; done'
 
     - name: Install dependencies
       run: |

Dockerfile

@@ -18,10 +18,10 @@ RUN useradd -r minio-user && \
     mkdir -p /data && \
     chown minio-user:minio-user /data
 
-EXPOSE 9000 9001
+EXPOSE 9002 9003
 
 USER minio-user
 
 ENTRYPOINT ["/usr/local/bin/minio"]
-CMD ["server", "/data", "--console-address", ":9001"]
+CMD ["server", "/data", "--address", ":9002", "--console-address", ":9003"]
 

README.md

@@ -183,11 +183,11 @@ Some tests require a local MinIO container to be running:
 
 ```bash
 $ docker build -t s3cpp-minio:latest .
-$ docker run -d -p 9000:9000 -p 9001:9001 \
+$ docker run -d -p 9002:9002 -p 9003:9003 \
   -e "MINIO_ROOT_USER=minio_access" \
   -e "MINIO_ROOT_PASSWORD=minio_secret" \
   s3cpp-minio:latest \
-  server /data --console-address ":9001"
+  server /data --address ":9002" --console-address ":9003"
 ```
 
 The full test suite contains 63 tests

benchmark/README.md

@@ -14,11 +14,11 @@ A local MinIO instance is expected to be running already. The current `test.cpp`
 
 ```bash
 $ docker build -t s3cpp-minio:latest ..
-$ docker run -d -p 9000:9000 -p 9001:9001 \
+$ docker run -d -p 9002:9002 -p 9003:9003 \
       -e "MINIO_ROOT_USER=minio_access" \
       -e "MINIO_ROOT_PASSWORD=minio_secret" \
       s3cpp-minio:latest \
-      server /data --console-address ":9001"
+      server /data --address ":9002" --console-address ":9003"
 ```
 
 ## Usage

benchmark/aws-sdk-cpp/task.cpp

@@ -17,7 +17,7 @@ static bench::ClientHandle initialize_client(const char *access,
   Aws::InitAPI(options);
 
   Aws::S3::S3ClientConfiguration clientConfig;
-  clientConfig.endpointOverride = "http://127.0.0.1:9000/";
+  clientConfig.endpointOverride = "http://127.0.0.1:9002/";
   clientConfig.region = "eu-west-1";
   clientConfig.scheme = Aws::Http::Scheme::HTTP;
 

benchmark/aws-sdk-go-v2/main.go

@@ -27,7 +27,7 @@ var p runtime.Pinner // yolo
 func initialize_client(access, secret, endpoint string) *s3.Client {
 	cfg, err := config.LoadDefaultConfig(context.TODO(),
 		config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(access, secret, "")),
-		config.WithBaseEndpoint("http://127.0.0.1:9000/"),
+		config.WithBaseEndpoint("http://127.0.0.1:9002/"),
 		config.WithDefaultRegion("eu-west-2"),
 	)
 	if err != nil {

benchmark/aws-sdk-rust/src/lib.rs

@@ -22,7 +22,7 @@ fn initialize_client(access: String, secret: String, endpoint: String) -> Client
     let credentials = Credentials::from_keys(access, secret, None);
     let config = Config::builder()
         .credentials_provider(credentials)
-        .endpoint_url("http://127.0.0.1:9000/")
+        .endpoint_url("http://127.0.0.1:9002/")
         .region(Region::new("eu-west-1"))
         .build();
     let client = aws_sdk_s3::Client::from_conf(config);

benchmark/benchmark.cpp

@@ -9,9 +9,9 @@ namespace s3b {
 static void benchmark_init_client(::benchmark::State &state, s3b::implementation impl) {
   const std::string access_ = "minio_access";
   const std::string secret_ = "minio_secret";
-  const std::string endpoint_ = "127.0.0.1:9000";
+  const std::string endpoint_ = "127.0.0.1:9002";
   for (auto _ : state) {
-    auto handle = impl.init_client("minio_access", "minio_secret", "127.0.0.1:9000");
+    auto handle = impl.init_client("minio_access", "minio_secret", "127.0.0.1:9002");
     ::benchmark::DoNotOptimize(handle);
     state.PauseTiming();
     impl.free_client(handle);
@@ -85,7 +85,7 @@ static std::string get_benchmark_name(const std::string &aws_operation, const im
 } // namespace s3b
 
 int main(int argc, char *argv[]) {
-  s3b::check_endpoint("127.0.0.1:9000");
+  s3b::check_endpoint("127.0.0.1:9002");
   s3b::clean_up();
 
   std::array<s3b::implementation, s3b::implementations_count> implementations = s3b::parse_implementations();

benchmark/implementations.h

@@ -78,7 +78,7 @@ inline implementation parse_implementation(const char *so_path) {
     std::exit(1);
   }
 
-  return implementation{so_path,     init_client("minio_access", "minio_secret", "127.0.0.1:9000"),
+  return implementation{so_path,     init_client("minio_access", "minio_secret", "127.0.0.1:9002"),
                         init_client, create_bucket,
                         put_object,  get_object, free_client};
 }
@@ -130,7 +130,7 @@ inline void clean_up() {
 
   // TODO(cristian): use another port/ip for benchmark to not collide with core s3cpp tests...
   s3cpp::S3Client client =
-      s3cpp::S3Client("minio_access", "minio_secret", "127.0.0.1:9000", s3cpp::S3AddressingStyle::PathStyle);
+      s3cpp::S3Client("minio_access", "minio_secret", "127.0.0.1:9002", s3cpp::S3AddressingStyle::PathStyle);
 
   auto result = client.ListBuckets();
   if (!result.has_value()) {
@@ -154,11 +154,11 @@ inline void check_endpoint(const std::string &endpoint) {
   if (!s3cpp::Ping(endpoint)) {
     std::println(stderr, "MinIO is not running. Start it with:\n"
                          "  docker build -t s3cpp-minio:latest ..\n"
-                         "  docker run -d -p 9000:9000 -p 9001:9001 \\\n"
+                         "  docker run -d -p 9002:9002 -p 9003:9003 \\\n"
                          "    -e \"MINIO_ROOT_USER=minio_access\" \\\n"
                          "    -e \"MINIO_ROOT_PASSWORD=minio_secret\" \\\n"
                          "    s3cpp-minio:latest \\\n"
-                         "    server /data --console-address \":9001\"");
+                         "    server /data --address \":9002\" --console-address \":9003\"");
     std::exit(1);
   }
 }

benchmark/s3cpp/task.cpp

@@ -9,7 +9,7 @@ static bench::ClientHandle initialize_client(const char *access,
                                              const char *secret,
                                              const char *endpoint) {
   auto client = new S3Client(access, secret,
-                             endpoint, // 127.0.0.1:9000
+                             endpoint, // 127.0.0.1:9002
                              s3cpp::S3AddressingStyle::PathStyle);
   return reinterpret_cast<bench::ClientHandle>(client);
 }