Cleanup

Author: Merteg

docs/PER_SHARE_EGRESS_MONITORING.md

@@ -124,9 +124,7 @@ accessLogging:
   sourceRegion: "us-central1"           # GCP region where server runs
   detectGcpTraffic: true                # Enable GCP IP range lookup
   clientRegionHeader: "x-client-region" # Header with country code
-  clientRegionSubdivisionHeader: "x-client-region-subdivision"
   clientIpHeader: "x-forwarded-for"     # Header with client IP chain
-  defaultPricingGroup: "unknown"        # Fallback when location unknown
 ```
 
 ### GCP Load Balancer Headers
@@ -184,8 +182,6 @@ X-Client-Region-Subdivision: {client_region_subdivision}
 **Client IP Headers:**
 1. Configured `clientIpHeader` (default: `x-forwarded-for`)
 2. `x-envoy-external-address`
-3. `x-real-ip`
-4. `true-client-ip`
 
 ---
 

server/src/main/scala/io/delta/sharing/server/DeltaSharingService.scala

@@ -888,14 +888,9 @@ object DeltaSharingService {
     "x-appengine-country",
     "cf-ipcountry",
     "cloudfront-viewer-country")
-  private val DefaultSubdivisionHeaders = Seq(
-    "x-client-region-subdivision",
-    "x-appengine-region")
   private val DefaultIpHeaders = Seq(
     "x-forwarded-for",
-    "x-envoy-external-address",
-    "x-real-ip",
-    "true-client-ip")
+    "x-envoy-external-address")
   private val DefaultPricingGroupsByRegion = Map(
     "US" -> "na_eu",
     "CA" -> "na_eu",

server/src/main/scala/io/delta/sharing/server/config/ServerConfig.scala

@@ -139,16 +139,12 @@ case class AccessLoggingConfig(
     @BeanProperty var enabled: Boolean,
     // Header that contains the client region code (for example: US, DE).
     @BeanProperty var clientRegionHeader: String,
-    // Header that contains the client region subdivision (for example: USCA, DEBE).
-    @BeanProperty var clientRegionSubdivisionHeader: String,
     // Header that contains client IP or forwarding chain (for example: X-Forwarded-For).
     @BeanProperty var clientIpHeader: String,
-    // Optional mapping from region/subdivision codes to pricing group labels.
-    // Keys should be uppercase location codes (for example: US, DE, USCA).
+    // Optional mapping from region codes to pricing group labels.
+    // Keys should be uppercase location codes (for example: US, DE).
     // A wildcard key "*" can be used as a catch-all default.
     @BeanProperty var pricingGroups: java.util.Map[String, String],
-    // Fallback group when no mapping and no region are available.
-    @BeanProperty var defaultPricingGroup: String,
     // The GCP region where this server runs (for example: us-central1).
     // Used for pricing tier calculation based on source→destination pairs.
     @BeanProperty var sourceRegion: String,
@@ -161,19 +157,14 @@ case class AccessLoggingConfig(
     this(
       enabled = false,
       clientRegionHeader = "x-client-region",
-      clientRegionSubdivisionHeader = "x-client-region-subdivision",
       clientIpHeader = "x-forwarded-for",
       pricingGroups = Collections.emptyMap(),
-      defaultPricingGroup = "unknown",
       sourceRegion = "",
       detectGcpTraffic = true)
   }
 
   override def checkConfig(): Unit = {
-    if (defaultPricingGroup == null || defaultPricingGroup.trim.isEmpty) {
-      throw new IllegalArgumentException(
-        "'defaultPricingGroup' in 'accessLogging' must be provided")
-    }
+    // No required fields to validate
   }
 }
 

server/src/test/scala/io/delta/sharing/server/config/ServerConfigSuite.scala

@@ -125,10 +125,8 @@ class ServerConfigSuite extends FunSuite {
     val accessLogging = new AccessLoggingConfig()
     accessLogging.setEnabled(true)
     accessLogging.setClientRegionHeader("x-client-region")
-    accessLogging.setClientRegionSubdivisionHeader("x-client-region-subdivision")
     accessLogging.setClientIpHeader("x-forwarded-for")
     accessLogging.setPricingGroups(Collections.singletonMap("US", "na-tier-1"))
-    accessLogging.setDefaultPricingGroup("unknown")
     serverConfig.setAccessLogging(accessLogging)
     testConfig(
       """version: 1
@@ -142,11 +140,9 @@ class ServerConfigSuite extends FunSuite {
         |accessLogging:
         |  enabled: true
         |  clientRegionHeader: x-client-region
-        |  clientRegionSubdivisionHeader: x-client-region-subdivision
         |  clientIpHeader: x-forwarded-for
         |  pricingGroups:
         |    US: na-tier-1
-        |  defaultPricingGroup: unknown
         |""".stripMargin,
       serverConfig)
   }
@@ -209,11 +205,6 @@ class ServerConfigSuite extends FunSuite {
     val accessLogging = new AccessLoggingConfig()
     accessLogging.setEnabled(true)
     accessLogging.checkConfig()
-
-    accessLogging.setDefaultPricingGroup("   ")
-    assertInvalidConfig("'defaultPricingGroup' in 'accessLogging' must be provided") {
-      accessLogging.checkConfig()
-    }
   }
 
   test("SSLConfig") {

server/src/universal/conf/delta-sharing-server.yaml.template

@@ -74,18 +74,13 @@ accessLogging:
   # In GCP, configure your load balancer backend custom request headers to inject this.
   # Example: X-Client-Region:{client_region}
   clientRegionHeader: "x-client-region"
-  # Name of the incoming header that carries client subdivision (for example: USCA).
-  # Example: X-Client-Region-Subdivision:{client_region_subdivision}
-  clientRegionSubdivisionHeader: "x-client-region-subdivision"
   # Name of the incoming header that carries client IP information.
   # This is typically a forwarding chain header and does not require LB changes when already present.
   clientIpHeader: "x-forwarded-for"
-  # Optional mapping from region/subdivision codes to billing price groups.
+  # Optional mapping from region codes to billing price groups.
   # Use uppercase keys. A wildcard key "*" can be used as a catch-all.
   # If empty, server applies a built-in default map (na_eu/apac/latam buckets).
   pricingGroups: {}
-  # Fallback pricing group when no location can be resolved.
-  defaultPricingGroup: "unknown"
   # GCP region where this server runs (for example: us-central1).
   # Required for GCP pricing tier calculation.
   # Used to determine source→destination pairs for egress cost attribution.