From d7974d75983c115e01e2b7ae2532e09d43bfae2e Mon Sep 17 00:00:00 2001
From: Lukasz Rajewski <lukasz.rajewski@orange.com>
Date: Thu, 29 Jul 2021 23:27:06 +0200
Subject: Ignore unknown fields from the k8splugin API responses

Ignore unknown fields from the k8splugin API responses

Issue-ID: CCSDK-3400
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I9d184a0a4369848221cce56e164162b55edb3c5a
---
 .../functions/k8s/definition/profile/K8sProfile.kt                  | 2 ++
 .../functions/k8s/definition/template/K8sTemplate.kt                | 2 ++
 .../functions/k8s/instance/K8sConfigValueRequest.kt                 | 2 ++
 .../functions/k8s/instance/K8sConfigValueResponse.kt                | 2 ++
 .../cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstance.kt | 2 ++
 .../blueprintsprocessor/functions/k8s/instance/K8sRbInstanceGvk.kt  | 2 ++
 .../functions/k8s/instance/K8sRbInstanceRequest.kt                  | 2 ++
 .../functions/k8s/instance/K8sRbInstanceStatus.kt                   | 3 +++
 .../cds/blueprintsprocessor/functions/k8s/instance/K8sTopic.kt      | 2 ++
 .../functions/k8s/instance/healthcheck/K8sRbInstanceHealthCheck.kt  | 6 ++++++
 10 files changed, 25 insertions(+)

diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfile.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfile.kt
index 69c835543..8caa1d1a5 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfile.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/profile/K8sProfile.kt
@@ -19,8 +19,10 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.definition.profile
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sProfile {
 
     @get:JsonProperty("rb-name")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sTemplate.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sTemplate.kt
index e2c1270e0..e135d21ce 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sTemplate.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/definition/template/K8sTemplate.kt
@@ -1,7 +1,9 @@
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.definition.template
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sTemplate {
 
     @get:JsonProperty("template-name")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueRequest.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueRequest.kt
index b6093d68c..ad2bc1f04 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueRequest.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueRequest.kt
@@ -1,7 +1,9 @@
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sConfigValueRequest {
 
     @get:JsonProperty("template-name")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueResponse.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueResponse.kt
index 0106b81a4..cefe3e605 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueResponse.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sConfigValueResponse.kt
@@ -1,8 +1,10 @@
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance
 
 import com.fasterxml.jackson.annotation.JsonAlias
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sConfigValueResponse {
     @get:JsonProperty("rb-name")
     var rbName: String? = null
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstance.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstance.kt
index d3acde015..2b40d3517 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstance.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstance.kt
@@ -19,8 +19,10 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstance {
 
     @get:JsonProperty("id")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceGvk.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceGvk.kt
index 8bfe5f241..526fdcc49 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceGvk.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceGvk.kt
@@ -19,8 +19,10 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceGvk {
 
     @get:JsonProperty("Group")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceRequest.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceRequest.kt
index 388d5e33b..86d605845 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceRequest.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceRequest.kt
@@ -19,8 +19,10 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceRequest {
 
     @get:JsonProperty("labels")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceStatus.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceStatus.kt
index e61868984..f662118c0 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceStatus.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sRbInstanceStatus.kt
@@ -19,8 +19,10 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceStatus {
 
     @get:JsonProperty("request")
@@ -46,6 +48,7 @@ class K8sRbInstanceStatus {
     }
 }
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceResourceStatus {
 
     @get:JsonProperty("name")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sTopic.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sTopic.kt
index 7ff18ade6..7ce82a35d 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sTopic.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/K8sTopic.kt
@@ -1,7 +1,9 @@
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sTopic {
 
     @get:JsonProperty("name")
diff --git a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/healthcheck/K8sRbInstanceHealthCheck.kt b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/healthcheck/K8sRbInstanceHealthCheck.kt
index 0f1f60557..1a23c59e1 100644
--- a/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/healthcheck/K8sRbInstanceHealthCheck.kt
+++ b/ms/blueprintsprocessor/functions/k8s-connection-plugin/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/k8s/instance/healthcheck/K8sRbInstanceHealthCheck.kt
@@ -1,7 +1,9 @@
 package org.onap.ccsdk.cds.blueprintsprocessor.functions.k8s.instance.healthcheck
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceHealthCheckSimple {
 
     @get:JsonProperty("healthcheck-id")
@@ -25,6 +27,7 @@ class K8sRbInstanceHealthCheckSimple {
     }
 }
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceHealthCheckList {
 
     @get:JsonProperty("instance-id")
@@ -47,6 +50,7 @@ class K8sRbInstanceHealthCheckList {
     }
 }
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceHealthCheck {
 
     @get:JsonProperty("healthcheck-id")
@@ -79,6 +83,7 @@ class K8sRbInstanceHealthCheck {
     }
 }
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sHealthCheckTest {
 
     @get:JsonProperty("StartedAt")
@@ -107,6 +112,7 @@ class K8sHealthCheckTest {
     }
 }
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class K8sRbInstanceHealthCheckHook {
 
     @get:JsonProperty("name")
-- 
cgit 1.2.3-korg