docs(samples): Update Dataflow Iceberg samples for Beam 2.58.0 (GoogleCloudPlatform#9441)

VeronicaWasson · web-flow · commit 7b8be50c1ce3 · 2024-08-12T20:29:55.000+05:30
diff --git a/dataflow/snippets/pom.xml b/dataflow/snippets/pom.xml
@@ -37,7 +37,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <apache_beam.version>2.57.0</apache_beam.version>
+    <apache_beam.version>2.58.0</apache_beam.version>
     <slf4j.version>2.0.12</slf4j.version>
     <parquet.version>1.14.0</parquet.version>
     <iceberg.version>1.4.2</iceberg.version>
diff --git a/dataflow/snippets/src/main/java/com/example/dataflow/ApacheIcebergRead.java b/dataflow/snippets/src/main/java/com/example/dataflow/ApacheIcebergRead.java
@@ -66,14 +66,14 @@ public static void main(String[] args) {
 
     // Configure the Iceberg source I/O
     Map catalogConfig = ImmutableMap.<String, Object>builder()
-        .put("catalog_name", options.getCatalogName())
-        .put("warehouse_location", options.getWarehouseLocation())
-        .put("catalog_type", CATALOG_TYPE)
+        .put("warehouse", options.getWarehouseLocation())
+        .put("type", CATALOG_TYPE)
         .build();
 
     ImmutableMap<String, Object> config = ImmutableMap.<String, Object>builder()
         .put("table", options.getTableName())
-        .put("catalog_config", catalogConfig)
+        .put("catalog_name", options.getCatalogName())
+        .put("catalog_properties", catalogConfig)
         .build();
 
     // Build the pipeline.
diff --git a/dataflow/snippets/src/main/java/com/example/dataflow/ApacheIcebergWrite.java b/dataflow/snippets/src/main/java/com/example/dataflow/ApacheIcebergWrite.java
@@ -74,14 +74,14 @@ public static void main(String[] args) {
 
     // Configure the Iceberg source I/O
     Map catalogConfig = ImmutableMap.<String, Object>builder()
-        .put("catalog_name", options.getCatalogName())
-        .put("warehouse_location", options.getWarehouseLocation())
-        .put("catalog_type", CATALOG_TYPE)
+        .put("warehouse", options.getWarehouseLocation())
+        .put("type", CATALOG_TYPE)
         .build();
 
     ImmutableMap<String, Object> config = ImmutableMap.<String, Object>builder()
         .put("table", options.getTableName())
-        .put("catalog_config", catalogConfig)
+        .put("catalog_name", options.getCatalogName())
+        .put("catalog_properties", catalogConfig)
         .build();
 
     // Build the pipeline.
