Handle empty instance_config_version in topology elements (#450)

* Convert IC version field to *int32 * Make IC version field nullable
elastic · Dec 14, 2023 · 87ffc76 · 87ffc76
1 parent 041b43e
commit 87ffc76
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 6 deletions.
diff --git a/cmd/generator/cloudspec/spec_modifier.go b/cmd/generator/cloudspec/spec_modifier.go
@@ -70,6 +70,36 @@ func Modify(cloudSpec *spec.Swagger) {
 				cloudSpec.Definitions[k].Properties[kk] = prop
 			}
 
+			if k == "ApmTopologyElement" && kk == "instance_configuration_version" {
+				prop.AddExtension(nullableKey, true)
+				cloudSpec.Definitions[k].Properties[kk] = prop
+			}
+
+			if k == "AppSearchTopologyElement" && kk == "instance_configuration_version" {
+				prop.AddExtension(nullableKey, true)
+				cloudSpec.Definitions[k].Properties[kk] = prop
+			}
+
+			if k == "ElasticsearchClusterTopologyElement" && kk == "instance_configuration_version" {
+				prop.AddExtension(nullableKey, true)
+				cloudSpec.Definitions[k].Properties[kk] = prop
+			}
+
+			if k == "EnterpriseSearchTopologyElement" && kk == "instance_configuration_version" {
+				prop.AddExtension(nullableKey, true)
+				cloudSpec.Definitions[k].Properties[kk] = prop
+			}
+
+			if k == "IntegrationsServerTopologyElement" && kk == "instance_configuration_version" {
+				prop.AddExtension(nullableKey, true)
+				cloudSpec.Definitions[k].Properties[kk] = prop
+			}
+
+			if k == "KibanaClusterTopologyElement" && kk == "instance_configuration_version" {
+				prop.AddExtension(nullableKey, true)
+				cloudSpec.Definitions[k].Properties[kk] = prop
+			}
+
 			if k == "ElasticsearchConfiguration" {
 				if kk == "enabled_built_in_plugins" ||
 					kk == "user_bundles" ||

diff --git a/pkg/models/apm_topology_element.go b/pkg/models/apm_topology_element.go
diff --git a/pkg/models/app_search_topology_element.go b/pkg/models/app_search_topology_element.go
diff --git a/pkg/models/elasticsearch_cluster_topology_element.go b/pkg/models/elasticsearch_cluster_topology_element.go
diff --git a/pkg/models/enterprise_search_topology_element.go b/pkg/models/enterprise_search_topology_element.go
diff --git a/pkg/models/integrations_server_topology_element.go b/pkg/models/integrations_server_topology_element.go
diff --git a/pkg/models/kibana_cluster_topology_element.go b/pkg/models/kibana_cluster_topology_element.go