Infra: Rename the object store service to object-store

Feedback from @kevinjqliu

Author: rambleraptor

dev/docker-compose-integration.yml

@@ -28,7 +28,7 @@ services:
     depends_on:
       - rest
       - hive
-      - rustfs
+      - object-store
     ports:
       - 15002:15002 # Spark Connect
       - 4040:4040 # Spark UI
@@ -39,7 +39,7 @@ services:
     links:
       - rest:rest
       - hive:hive
-      - rustfs:rustfs
+      - object-store:object-store
     healthcheck:
       test: ["CMD", "sh", "-c", "netstat -an | grep 15002 | grep LISTEN"]
       interval: 30s
@@ -59,15 +59,15 @@ services:
       - AWS_REGION=us-east-1
       - CATALOG_WAREHOUSE=s3://warehouse/
       - CATALOG_IO__IMPL=org.apache.iceberg.aws.s3.S3FileIO
-      - CATALOG_S3_ENDPOINT=http://rustfs:9000
+      - CATALOG_S3_ENDPOINT=http://object-store:9000
       - CATALOG_JDBC_STRICT__MODE=true
-  rustfs:
+  object-store:
     image: rustfs/rustfs:1.0.0-rc.5
-    container_name: pyiceberg-rustfs
+    container_name: pyiceberg-object-store
     networks:
       iceberg_net:
         aliases:
-          - warehouse.rustfs
+          - warehouse.object-store
     ports:
       - 9001:9001
       - 9000:9000
@@ -78,9 +78,9 @@ services:
       - RUSTFS_ADDRESS=:9000
       - RUSTFS_CONSOLE_ENABLE=true
       - RUSTFS_CONSOLE_ADDRESS=:9001
-      # Resolves virtual-hosted-style `warehouse.rustfs` to the warehouse bucket.
-      # The port is required until rustfs/rustfs#7051 ships.
-      - RUSTFS_SERVER_DOMAINS=rustfs:9000
+      # Resolves virtual-hosted-style `warehouse.object-store` to the warehouse
+      # bucket. The port is required until rustfs/rustfs#7051 ships.
+      - RUSTFS_SERVER_DOMAINS=object-store:9000
     healthcheck:
       test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health"]
       interval: 5s
@@ -93,17 +93,17 @@ services:
     networks:
       iceberg_net:
     depends_on:
-      rustfs:
+      object-store:
         condition: service_healthy
     environment:
       - AWS_ACCESS_KEY_ID=admin
       - AWS_SECRET_ACCESS_KEY=password
       - AWS_REGION=us-east-1
-      - AWS_ENDPOINT_URL=http://rustfs:9000
+      - AWS_ENDPOINT_URL=http://object-store:9000
     entrypoint: /bin/sh
     command:
       - -c
-      - "aws s3 mb s3://warehouse"
+      - "aws s3 rb s3://warehouse --force 2>/dev/null; aws s3 mb s3://warehouse"
   hive:
     image: pyiceberg-hive:latest
     build:

dev/docker-compose.yml

@@ -16,36 +16,36 @@
 # under the License.
 
 services:
-  rustfs:
+  object-store:
     image: rustfs/rustfs:1.0.0-rc.5
-    container_name: pyiceberg-rustfs
+    container_name: pyiceberg-object-store
+    ports:
+      - 9001:9001
+      - 9000:9000
     environment:
       - RUSTFS_ACCESS_KEY=admin
       - RUSTFS_SECRET_KEY=password
       - RUSTFS_VOLUMES=/data
       - RUSTFS_ADDRESS=:9000
       - RUSTFS_CONSOLE_ENABLE=true
       - RUSTFS_CONSOLE_ADDRESS=:9001
-    ports:
-      - 9001:9001
-      - 9000:9000
     healthcheck:
       test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health"]
       interval: 5s
       timeout: 5s
       retries: 10
       start_period: 5s
   aws-cli:
-    depends_on:
-      rustfs:
-        condition: service_healthy
     image: amazon/aws-cli:2.36.40
     container_name: pyiceberg-aws-cli
+    depends_on:
+      object-store:
+        condition: service_healthy
     environment:
       - AWS_ACCESS_KEY_ID=admin
       - AWS_SECRET_ACCESS_KEY=password
       - AWS_REGION=us-east-1
-      - AWS_ENDPOINT_URL=http://rustfs:9000
+      - AWS_ENDPOINT_URL=http://object-store:9000
     entrypoint: /bin/sh
     command:
       - -c

dev/hive/core-site.xml

@@ -32,7 +32,7 @@
     </property>
     <property>
       <name>fs.s3a.endpoint</name>
-      <value>http://rustfs:9000</value>
+      <value>http://object-store:9000</value>
     </property>
     <property>
       <name>fs.s3a.access.key</name>

dev/run-s3.sh

@@ -20,7 +20,7 @@
 
 set -ex
 
-if [ $(docker ps -q --filter "name=pyiceberg-rustfs" --filter "health=healthy" ) ]; then
+if [ $(docker ps -q --filter "name=pyiceberg-object-store" --filter "health=healthy" ) ]; then
     echo "S3 backend running"
 else
     docker compose -f dev/docker-compose.yml kill

dev/spark/spark-defaults.conf

@@ -23,7 +23,7 @@ spark.sql.catalog.rest.type            rest
 spark.sql.catalog.rest.uri             http://rest:8181
 spark.sql.catalog.rest.io-impl         org.apache.iceberg.aws.s3.S3FileIO
 spark.sql.catalog.rest.warehouse       s3://warehouse/rest/
-spark.sql.catalog.rest.s3.endpoint     http://rustfs:9000
+spark.sql.catalog.rest.s3.endpoint     http://object-store:9000
 spark.sql.catalog.rest.cache-enabled   false
 
 # Configure Iceberg Hive catalog
@@ -32,13 +32,13 @@ spark.sql.catalog.hive.type            hive
 spark.sql.catalog.hive.uri             thrift://hive:9083
 spark.sql.catalog.hive.io-impl         org.apache.iceberg.aws.s3.S3FileIO
 spark.sql.catalog.hive.warehouse       s3://warehouse/hive/
-spark.sql.catalog.hive.s3.endpoint     http://rustfs:9000
+spark.sql.catalog.hive.s3.endpoint     http://object-store:9000
 
 # Configure Spark's default session catalog (spark_catalog) to use Iceberg backed by the Hive Metastore
 spark.sql.catalog.spark_catalog        org.apache.iceberg.spark.SparkSessionCatalog
 spark.sql.catalog.spark_catalog.type   hive
 spark.sql.catalog.spark_catalog.uri    thrift://hive:9083
-spark.hadoop.fs.s3a.endpoint           http://rustfs:9000
+spark.hadoop.fs.s3a.endpoint           http://object-store:9000
 spark.sql.catalogImplementation        hive
 spark.sql.warehouse.dir                s3a://warehouse/hive/