ignore extra fields

Author: ekoby

ziti/src/main/kotlin/org/openziti/IdentityConfig.kt

@@ -20,6 +20,7 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonIgnoreUnknownKeys
 import kotlinx.serialization.json.decodeFromStream
 import org.openziti.identity.makeSSLContext
 import org.openziti.util.readCerts
@@ -34,6 +35,7 @@ import javax.net.ssl.SSLContext
 /**
  * Identity loaded from identity configuration JSON.
  */
+@JsonIgnoreUnknownKeys
 @Serializable data class IdentityConfig (
     /**
      * Ziti controller address.
@@ -94,13 +96,15 @@ import javax.net.ssl.SSLContext
 
 
     companion object {
-
+        private val jsonBuilder = Json {
+            ignoreUnknownKeys = true
+        }
         /**
          * Load identity configuration from the input stream.
          */
         @OptIn(ExperimentalSerializationApi::class)
         @JvmStatic
-        fun load(input: InputStream): IdentityConfig = Json.decodeFromStream(serializer(), input)
+        fun load(input: InputStream): IdentityConfig = jsonBuilder.decodeFromStream(serializer(), input)
 
         /**
          * Load identity configuration from the byte array.

ziti/src/test/kotlin/org/openziti/IdentityConfigTest.kt

@@ -67,6 +67,7 @@ class IdentityConfigTest {
         val json = """{
 	   "ztAPI":"https://bender:1280",
        "ztAPIs":null,
+       "configs": null,
 	   "id":{
 		   "cert":"-----BEGIN CERTIFICATE-----\nMIIDjzCCAXegAwIBAgIDAMi2MA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVT\nMRIwEAYDVQQHEwlDaGFybG90dGUxEzARBgNVBAoTCk5ldEZvdW5kcnkxEDAOBgNV\nBAsTB0FEVi1ERVYxIzAhBgNVBAMTGmludGVybWVkaWF0ZS1jYS1xdWlja3N0YXJ0\nMB4XDTI1MDIxODE5NDIyNVoXDTI2MDIxODE5NDMyNVowKDERMA8GA1UEChMIT3Bl\nblppdGkxEzARBgNVBAMTCkRsdzBRM09tb1EwWTATBgcqhkjOPQIBBggqhkjOPQMB\nBwNCAAR0DtFWsxJVi6yJxcH8OAHsKp3WLoTTnwhTZcYTjVARxYKZMGWsziVAAuuZ\nPb1NV4skL1LvITGQgK1wAjUwU4s5o0gwRjAOBgNVHQ8BAf8EBAMCBLAwEwYDVR0l\nBAwwCgYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUea/7+V+MNel79c7p6J2SBya1fnww\nDQYJKoZIhvcNAQELBQADggIBAKea6m0qpUcG0Ce05XdS9pcO0I8lZuCaXVqh0pVo\nj0PtWmrVu/euXaCsV2ENJricGV49FtQmiHS4eo1wt34LddKjUNtsCqHRsguBSlEl\nHqqdZgC07kymR3rJ12sK3/HPuF53HmlTZtxo9O4HNEtJjhszG3XPsUDTWoKBDCZE\n9ZN68jOIILrRY1OLPDF7u8KaECAHzVJt5qmxlMcyo6GKnnbYbtFTwWa0qfBxK1N2\ngmxNjNcAUJGdm0Xb1bL+YzFRo4mQP66/lDL0U3rXfjox1ra0zTu9gB2OxRw2r5Uu\nFYB0zwRbjvRp6wOffFBn8Z6i9sbP+a4vp7Tbny/KbGi4I02ViMcgWN1m7VGcpuKV\nAynV6PCL9JTJlqlpBUrShqqNzxGIEzUJMhFdEys+DVKirlf0NzoStR/jp5KQKOoi\nwFHx872xKaPatvZRPKxIdkVyNpaK/YI6bOOd50lULBeJs4XCWGVxeMRHAH+/EoMq\nBItCywy9Qsab5PS7qN+2XYe+NsBS/5jSknbzJx+zWczZMV2xBGp95bM6PyANoSkM\ne2dRTVwwjpBciOzvr5ZUy0Xr/iheOZuDap46+s8fC0V988Rbe9dyo9TgzsJ2MRMu\nsRN1HNNLmoQAI42brAHQJeWmao428L4rBm2AHkQHrDqYMwX8oUElLA/g4PdT3iZf\nLwP4\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIF2TCCA8GgAwIBAgIQMgjOt/XGqGSMmMEgTIhxezANBgkqhkiG9w0BAQsFADBa\nMQswCQYDVQQGEwJVUzESMBAGA1UEBxMJQ2hhcmxvdHRlMRMwEQYDVQQKEwpOZXRG\nb3VuZHJ5MRAwDgYDVQQLEwdBRFYtREVWMRAwDgYDVQQDEwdyb290LWNhMB4XDTI1\nMDIxODE5NDEyNFoXDTM1MDIxNjE5NDIyMlowbTELMAkGA1UEBhMCVVMxEjAQBgNV\nBAcTCUNoYXJsb3R0ZTETMBEGA1UEChMKTmV0Rm91bmRyeTEQMA4GA1UECxMHQURW\nLURFVjEjMCEGA1UEAxMaaW50ZXJtZWRpYXRlLWNhLXF1aWNrc3RhcnQwggIiMA0G\nCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRx87QdwtweFZ0hsRhMyFSbZPVdaC3\nmjTD8lDGugilDOV2nIjv7WdfcTMgct3/g0f8mHGPauKs/uL+cArAAyapP6t1DYC5\ntmG6+LuqFjlb+bcY5oYvPBLeBi8UEk95258+74URRLE5bK6JiH95rs/fdIjsVhpo\nsPfQDZq3RXYByfCk98UGoah+7YsEK07LDn+ykXrBmCogN2mWU6ZxImnbiJXt/J7S\nAG6pDkFqrhJnSkGErx5Q8vIv7qDr3FtVALcx29ndZUFUG0580f3E7ZSony2OAEvG\nnN1R2/el2FZEbINYGn95oYN/AyNtzq0aYKHfXoi30DI9sjzbEQkeEaiAaNm+GqdX\nRWIPemUDPglaMu8Jo9UK+HPWGkkw8AdclmVk3KBB2CM78fcPmDmQ772to6hrUNVi\nD/rlhVwypVq7HAnXvCF7crxiNndhh9zGhUOsFFpS/aecVIKaeN2kUK9oTMGoYMxR\nUzYF+YvGN+3UeBtMaGcmUaSw2VA4QqE+1UNmudYm6pgykQ6ai/rF6GvUKuDJxisU\n43nHxzWRSwZikM3i0EhNnmhqf94vVuIcuIJucAH4ZdHFelh045l9DLgWi2KcKfqv\nGxpbgn95LhAPlINGo04NK8xGnVT8EQWC/eKsSh4kC9mBLlSkqG8m5xjxhdyJgFER\nt8DSMRHCyHgHvQIDAQABo4GHMIGEMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8E\nCDAGAQH/AgEBMB0GA1UdDgQWBBR5r/v5X4w16Xv1zunonZIHJrV+fDAfBgNVHSME\nGDAWgBQlKAdnL4josYQt42xKrv/LhpmTgzAeBgNVHREEFzAVhhNzcGlmZmU6Ly9x\ndWlja3N0YXJ0MA0GCSqGSIb3DQEBCwUAA4ICAQBvJT7KLqKffAx80DcpPYF9xPbN\nMfW4sjom6B+1r9PrHerTplX2W6vleLP0gWnnNgwCSapXA+96G0Bn3ILc0HudiSb9\n3nlj97PZG66Ftj/ol8n7MQFyLPFedlQ4m1rsA2Mai8Exelp4aE6PifH+ykmzudS0\nDLxJzXG+hVlRf1DVIya8W8vL329KVXjEClxvSx0ay7lvCo8EIelGNPgyrFV+Khu5\nQNtr5xa9ysV+OS1yyg8BPi1J/bFXATTS9x20wvKOmLKk9AdtUhV0BmFWpqLkEjgI\nkvfPXhzqAJEbCjdyQbyZHhQpBKBRITZ7cpI71XGxJSj7hn0uZkceRbPGJ6StUA0r\nTnAWdnzVjscLKQTaSjS3OEqF6KF+G15xOa5CPNAfHMNGD8FCOMUXlxol5UtXnSN0\n7F/LAiktuZ2FnzconYsotWmBIVRyz5AKIibESqeQM8W4Yn3H/QIwDHnhHAAhUhpE\nltj5hMoETWxqi+s5iO8XhUkUBtT9AKEPcTSJSthq/efXcrg3DsoLstJDMosgqB7s\nooU5WjBfzMggXzD5NOIXyxz06u6+U0128Sxqnz44U1X3f+Y7do7gvLeEzvWOTU7s\nYfj24ODJxVHdHKHN0EWl91l+9DAsfzySKU5QPz+/zRMiKgL9OJhIjeC5PakDySOG\nvaST+lvNiqBbvgU5DA==\n-----END CERTIFICATE-----\n",
 		   "key":"-----BEGIN PRIVATE KEY-----\nMIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgyh2aOTEM6t3G7Zh5\nO280GnMu/b7nvnoHOhaDMCKPyDehRANCAAR0DtFWsxJVi6yJxcH8OAHsKp3WLoTT\nnwhTZcYTjVARxYKZMGWsziVAAuuZPb1NV4skL1LvITGQgK1wAjUwU4s5\n-----END PRIVATE KEY-----\n",