diff --git a/examples/Makefile b/examples/Makefile index f58c848..68ab592 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -11,6 +11,7 @@ all: cd exec_pod; make cd list_secret; make cd configmap; make + cd list_event; make clean: cd create_pod; make clean @@ -25,6 +26,7 @@ clean: cd exec_pod; make clean cd list_secret; make clean cd configmap; make clean + cd list_event; make clean test: cd create_pod; make test; @@ -34,6 +36,7 @@ test: kubectl wait --for=delete pod/test-pod-6 -n default --timeout=120s cd list_secret; make test cd configmap; make test + cd list_event; make test cd generic; make test cd multi_thread; make test; kubectl wait --for=condition=ready pod/test-pod-8 -n default --timeout=60s @@ -48,6 +51,7 @@ memcheck: kubectl wait --for=delete pod/test-pod-6 -n default --timeout=120s cd list_secret; make memcheck cd configmap; make memcheck + cd list_event; make test cd generic; make memcheck cd multi_thread; make memcheck; kubectl wait --for=condition=ready pod/test-pod-8 -n default --timeout=60s diff --git a/examples/list_event/.gitignore b/examples/list_event/.gitignore new file mode 100644 index 0000000..ad4610c --- /dev/null +++ b/examples/list_event/.gitignore @@ -0,0 +1 @@ +list_event_bin diff --git a/examples/list_event/Makefile b/examples/list_event/Makefile new file mode 100644 index 0000000..b69a1be --- /dev/null +++ b/examples/list_event/Makefile @@ -0,0 +1,17 @@ +INCLUDE:=-I../../kubernetes/ +LIBS:=-L../../kubernetes/build -lyaml -lwebsockets -lkubernetes -L/usr/local/lib +CFLAGS:=-g +BIN:=list_event_bin + +.PHONY : all clean test memcheck +all: + gcc main.c $(CFLAGS) $(INCLUDE) $(LIBS) -o $(BIN) + +test: + ./$(BIN) + +memcheck: + valgrind --tool=memcheck --leak-check=full ./$(BIN) + +clean: + rm ./$(BIN) diff --git a/examples/list_event/main.c b/examples/list_event/main.c new file mode 100644 index 0000000..0c4189f --- /dev/null +++ b/examples/list_event/main.c @@ -0,0 +1,76 @@ +#include +#include +#include + +#include +#include +#include + +void list_event(apiClient_t * apiClient) +{ + core_v1_event_list_t *event_list = CoreV1API_listNamespacedEvent(apiClient, "default", /*namespace */ + "true", /* pretty */ + 0, /* allowWatchBookmarks */ + NULL, /* continue */ + NULL, /* fieldSelector */ + NULL, /* labelSelector */ + 0, /* limit */ + NULL, /* resourceVersion */ + NULL, /* resourceVersionMatch */ + 0, /* timeoutSeconds */ + 0 /* watch */ + ); + printf("The return code of HTTP request=%ld\n", apiClient->response_code); + if (event_list) { + if (event_list->items) { + listEntry_t *listEntry = NULL; + core_v1_event_t *event = NULL; + list_ForEach(listEntry, event_list->items) { + event = listEntry->data; + if (event) { + if (event->type) { + printf("Event Type: %s\n", event->type); + } + if (event->message) { + printf("Event Message: %s\n", event->message); + } + } + } + } else { + fprintf(stderr, "There are no events in event list.\n"); + } + core_v1_event_list_free(event_list); + event_list = NULL; + } else { + fprintf(stderr, "Cannot get event list.\n"); + } +} + +int main() +{ + char *basePath = NULL; + sslConfig_t *sslConfig = NULL; + list_t *apiKeys = NULL; + int rc = load_kube_config(&basePath, &sslConfig, &apiKeys, NULL); /* NULL means loading configuration from $HOME/.kube/config */ + if (rc != 0) { + fprintf(stderr, "Cannot load kubernetes configuration.\n"); + return -1; + } + apiClient_t *apiClient = apiClient_create_with_base_path(basePath, sslConfig, apiKeys); + if (!apiClient) { + fprintf(stderr, "Cannot create a kubernetes client.\n"); + return -1; + } + + list_event(apiClient); + + apiClient_free(apiClient); + apiClient = NULL; + free_client_config(basePath, sslConfig, apiKeys); + basePath = NULL; + sslConfig = NULL; + apiKeys = NULL; + apiClient_unsetupGlobalEnv(); + + return 0; +} diff --git a/kubernetes/model/core_v1_event.c b/kubernetes/model/core_v1_event.c index 9912092..9f95d47 100644 --- a/kubernetes/model/core_v1_event.c +++ b/kubernetes/model/core_v1_event.c @@ -344,7 +344,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){ // core_v1_event->event_time cJSON *event_time = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "eventTime"); if (event_time) { - if(!cJSON_IsString(event_time)) + if(!cJSON_IsString(event_time) && !cJSON_IsNull(event_time)) { goto end; //DateTime } @@ -353,7 +353,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){ // core_v1_event->first_timestamp cJSON *first_timestamp = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "firstTimestamp"); if (first_timestamp) { - if(!cJSON_IsString(first_timestamp)) + if(!cJSON_IsString(first_timestamp) && !cJSON_IsNull(first_timestamp)) { goto end; //DateTime } @@ -380,7 +380,7 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){ // core_v1_event->last_timestamp cJSON *last_timestamp = cJSON_GetObjectItemCaseSensitive(core_v1_eventJSON, "lastTimestamp"); if (last_timestamp) { - if(!cJSON_IsString(last_timestamp)) + if(!cJSON_IsString(last_timestamp) && !cJSON_IsNull(last_timestamp)) { goto end; //DateTime } @@ -463,11 +463,11 @@ core_v1_event_t *core_v1_event_parseFromJSON(cJSON *core_v1_eventJSON){ action ? strdup(action->valuestring) : NULL, api_version ? strdup(api_version->valuestring) : NULL, count ? count->valuedouble : 0, - event_time ? strdup(event_time->valuestring) : NULL, - first_timestamp ? strdup(first_timestamp->valuestring) : NULL, + event_time && !cJSON_IsNull(event_time) ? strdup(event_time->valuestring) : NULL, + first_timestamp && !cJSON_IsNull(first_timestamp) ? strdup(first_timestamp->valuestring) : NULL, involved_object_local_nonprim, kind ? strdup(kind->valuestring) : NULL, - last_timestamp ? strdup(last_timestamp->valuestring) : NULL, + last_timestamp && !cJSON_IsNull(last_timestamp) ? strdup(last_timestamp->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, metadata_local_nonprim, reason ? strdup(reason->valuestring) : NULL, diff --git a/kubernetes/model/core_v1_event_series.c b/kubernetes/model/core_v1_event_series.c index 00f1552..e1d77a1 100644 --- a/kubernetes/model/core_v1_event_series.c +++ b/kubernetes/model/core_v1_event_series.c @@ -74,7 +74,7 @@ core_v1_event_series_t *core_v1_event_series_parseFromJSON(cJSON *core_v1_event_ // core_v1_event_series->last_observed_time cJSON *last_observed_time = cJSON_GetObjectItemCaseSensitive(core_v1_event_seriesJSON, "lastObservedTime"); if (last_observed_time) { - if(!cJSON_IsString(last_observed_time)) + if(!cJSON_IsString(last_observed_time) && !cJSON_IsNull(last_observed_time)) { goto end; //DateTime } @@ -83,7 +83,7 @@ core_v1_event_series_t *core_v1_event_series_parseFromJSON(cJSON *core_v1_event_ core_v1_event_series_local_var = core_v1_event_series_create ( count ? count->valuedouble : 0, - last_observed_time ? strdup(last_observed_time->valuestring) : NULL + last_observed_time && !cJSON_IsNull(last_observed_time) ? strdup(last_observed_time->valuestring) : NULL ); return core_v1_event_series_local_var; diff --git a/kubernetes/model/events_v1_event.c b/kubernetes/model/events_v1_event.c index 56a640b..05bb87f 100644 --- a/kubernetes/model/events_v1_event.c +++ b/kubernetes/model/events_v1_event.c @@ -343,7 +343,7 @@ events_v1_event_t *events_v1_event_parseFromJSON(cJSON *events_v1_eventJSON){ // events_v1_event->deprecated_first_timestamp cJSON *deprecated_first_timestamp = cJSON_GetObjectItemCaseSensitive(events_v1_eventJSON, "deprecatedFirstTimestamp"); if (deprecated_first_timestamp) { - if(!cJSON_IsString(deprecated_first_timestamp)) + if(!cJSON_IsString(deprecated_first_timestamp) && !cJSON_IsNull(deprecated_first_timestamp)) { goto end; //DateTime } @@ -352,7 +352,7 @@ events_v1_event_t *events_v1_event_parseFromJSON(cJSON *events_v1_eventJSON){ // events_v1_event->deprecated_last_timestamp cJSON *deprecated_last_timestamp = cJSON_GetObjectItemCaseSensitive(events_v1_eventJSON, "deprecatedLastTimestamp"); if (deprecated_last_timestamp) { - if(!cJSON_IsString(deprecated_last_timestamp)) + if(!cJSON_IsString(deprecated_last_timestamp) && !cJSON_IsNull(deprecated_last_timestamp)) { goto end; //DateTime } @@ -371,7 +371,7 @@ events_v1_event_t *events_v1_event_parseFromJSON(cJSON *events_v1_eventJSON){ } - if(!cJSON_IsString(event_time)) + if(!cJSON_IsString(event_time) && !cJSON_IsNull(event_time)) { goto end; //DateTime } @@ -459,8 +459,8 @@ events_v1_event_t *events_v1_event_parseFromJSON(cJSON *events_v1_eventJSON){ action ? strdup(action->valuestring) : NULL, api_version ? strdup(api_version->valuestring) : NULL, deprecated_count ? deprecated_count->valuedouble : 0, - deprecated_first_timestamp ? strdup(deprecated_first_timestamp->valuestring) : NULL, - deprecated_last_timestamp ? strdup(deprecated_last_timestamp->valuestring) : NULL, + deprecated_first_timestamp && !cJSON_IsNull(deprecated_first_timestamp) ? strdup(deprecated_first_timestamp->valuestring) : NULL, + deprecated_last_timestamp && !cJSON_IsNull(deprecated_last_timestamp) ? strdup(deprecated_last_timestamp->valuestring) : NULL, deprecated_source ? deprecated_source_local_nonprim : NULL, strdup(event_time->valuestring), kind ? strdup(kind->valuestring) : NULL, diff --git a/kubernetes/model/events_v1_event_series.c b/kubernetes/model/events_v1_event_series.c index 1896cb7..0b94c80 100644 --- a/kubernetes/model/events_v1_event_series.c +++ b/kubernetes/model/events_v1_event_series.c @@ -83,7 +83,7 @@ events_v1_event_series_t *events_v1_event_series_parseFromJSON(cJSON *events_v1_ } - if(!cJSON_IsString(last_observed_time)) + if(!cJSON_IsString(last_observed_time) && !cJSON_IsNull(last_observed_time)) { goto end; //DateTime } diff --git a/kubernetes/model/v1_api_service_condition.c b/kubernetes/model/v1_api_service_condition.c index b7436dc..21a8fbc 100644 --- a/kubernetes/model/v1_api_service_condition.c +++ b/kubernetes/model/v1_api_service_condition.c @@ -113,7 +113,7 @@ v1_api_service_condition_t *v1_api_service_condition_parseFromJSON(cJSON *v1_api // v1_api_service_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_api_service_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v1_api_service_condition_t *v1_api_service_condition_parseFromJSON(cJSON *v1_api v1_api_service_condition_local_var = v1_api_service_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_certificate_signing_request_condition.c b/kubernetes/model/v1_certificate_signing_request_condition.c index 5288a25..b608825 100644 --- a/kubernetes/model/v1_certificate_signing_request_condition.c +++ b/kubernetes/model/v1_certificate_signing_request_condition.c @@ -127,7 +127,7 @@ v1_certificate_signing_request_condition_t *v1_certificate_signing_request_condi // v1_certificate_signing_request_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_certificate_signing_request_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -136,7 +136,7 @@ v1_certificate_signing_request_condition_t *v1_certificate_signing_request_condi // v1_certificate_signing_request_condition->last_update_time cJSON *last_update_time = cJSON_GetObjectItemCaseSensitive(v1_certificate_signing_request_conditionJSON, "lastUpdateTime"); if (last_update_time) { - if(!cJSON_IsString(last_update_time)) + if(!cJSON_IsString(last_update_time) && !cJSON_IsNull(last_update_time)) { goto end; //DateTime } @@ -186,8 +186,8 @@ v1_certificate_signing_request_condition_t *v1_certificate_signing_request_condi v1_certificate_signing_request_condition_local_var = v1_certificate_signing_request_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, - last_update_time ? strdup(last_update_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, + last_update_time && !cJSON_IsNull(last_update_time) ? strdup(last_update_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_condition.c b/kubernetes/model/v1_condition.c index b6e4ce2..a8120fb 100644 --- a/kubernetes/model/v1_condition.c +++ b/kubernetes/model/v1_condition.c @@ -130,7 +130,7 @@ v1_condition_t *v1_condition_parseFromJSON(cJSON *v1_conditionJSON){ } - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } diff --git a/kubernetes/model/v1_container_state_running.c b/kubernetes/model/v1_container_state_running.c index 9937260..ea7178b 100644 --- a/kubernetes/model/v1_container_state_running.c +++ b/kubernetes/model/v1_container_state_running.c @@ -55,7 +55,7 @@ v1_container_state_running_t *v1_container_state_running_parseFromJSON(cJSON *v1 // v1_container_state_running->started_at cJSON *started_at = cJSON_GetObjectItemCaseSensitive(v1_container_state_runningJSON, "startedAt"); if (started_at) { - if(!cJSON_IsString(started_at)) + if(!cJSON_IsString(started_at) && !cJSON_IsNull(started_at)) { goto end; //DateTime } @@ -63,7 +63,7 @@ v1_container_state_running_t *v1_container_state_running_parseFromJSON(cJSON *v1 v1_container_state_running_local_var = v1_container_state_running_create ( - started_at ? strdup(started_at->valuestring) : NULL + started_at && !cJSON_IsNull(started_at) ? strdup(started_at->valuestring) : NULL ); return v1_container_state_running_local_var; diff --git a/kubernetes/model/v1_container_state_terminated.c b/kubernetes/model/v1_container_state_terminated.c index 8d1dfee..5a3497a 100644 --- a/kubernetes/model/v1_container_state_terminated.c +++ b/kubernetes/model/v1_container_state_terminated.c @@ -153,7 +153,7 @@ v1_container_state_terminated_t *v1_container_state_terminated_parseFromJSON(cJS // v1_container_state_terminated->finished_at cJSON *finished_at = cJSON_GetObjectItemCaseSensitive(v1_container_state_terminatedJSON, "finishedAt"); if (finished_at) { - if(!cJSON_IsString(finished_at)) + if(!cJSON_IsString(finished_at) && !cJSON_IsNull(finished_at)) { goto end; //DateTime } @@ -189,7 +189,7 @@ v1_container_state_terminated_t *v1_container_state_terminated_parseFromJSON(cJS // v1_container_state_terminated->started_at cJSON *started_at = cJSON_GetObjectItemCaseSensitive(v1_container_state_terminatedJSON, "startedAt"); if (started_at) { - if(!cJSON_IsString(started_at)) + if(!cJSON_IsString(started_at) && !cJSON_IsNull(started_at)) { goto end; //DateTime } @@ -199,11 +199,11 @@ v1_container_state_terminated_t *v1_container_state_terminated_parseFromJSON(cJS v1_container_state_terminated_local_var = v1_container_state_terminated_create ( container_id ? strdup(container_id->valuestring) : NULL, exit_code->valuedouble, - finished_at ? strdup(finished_at->valuestring) : NULL, + finished_at && !cJSON_IsNull(finished_at) ? strdup(finished_at->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, signal ? signal->valuedouble : 0, - started_at ? strdup(started_at->valuestring) : NULL + started_at && !cJSON_IsNull(started_at) ? strdup(started_at->valuestring) : NULL ); return v1_container_state_terminated_local_var; diff --git a/kubernetes/model/v1_cron_job_status.c b/kubernetes/model/v1_cron_job_status.c index 64da56f..350bf3f 100644 --- a/kubernetes/model/v1_cron_job_status.c +++ b/kubernetes/model/v1_cron_job_status.c @@ -122,7 +122,7 @@ v1_cron_job_status_t *v1_cron_job_status_parseFromJSON(cJSON *v1_cron_job_status // v1_cron_job_status->last_schedule_time cJSON *last_schedule_time = cJSON_GetObjectItemCaseSensitive(v1_cron_job_statusJSON, "lastScheduleTime"); if (last_schedule_time) { - if(!cJSON_IsString(last_schedule_time)) + if(!cJSON_IsString(last_schedule_time) && !cJSON_IsNull(last_schedule_time)) { goto end; //DateTime } @@ -131,7 +131,7 @@ v1_cron_job_status_t *v1_cron_job_status_parseFromJSON(cJSON *v1_cron_job_status // v1_cron_job_status->last_successful_time cJSON *last_successful_time = cJSON_GetObjectItemCaseSensitive(v1_cron_job_statusJSON, "lastSuccessfulTime"); if (last_successful_time) { - if(!cJSON_IsString(last_successful_time)) + if(!cJSON_IsString(last_successful_time) && !cJSON_IsNull(last_successful_time)) { goto end; //DateTime } @@ -140,8 +140,8 @@ v1_cron_job_status_t *v1_cron_job_status_parseFromJSON(cJSON *v1_cron_job_status v1_cron_job_status_local_var = v1_cron_job_status_create ( active ? activeList : NULL, - last_schedule_time ? strdup(last_schedule_time->valuestring) : NULL, - last_successful_time ? strdup(last_successful_time->valuestring) : NULL + last_schedule_time && !cJSON_IsNull(last_schedule_time) ? strdup(last_schedule_time->valuestring) : NULL, + last_successful_time && !cJSON_IsNull(last_successful_time) ? strdup(last_successful_time->valuestring) : NULL ); return v1_cron_job_status_local_var; diff --git a/kubernetes/model/v1_custom_resource_definition_condition.c b/kubernetes/model/v1_custom_resource_definition_condition.c index d13fc89..253efcb 100644 --- a/kubernetes/model/v1_custom_resource_definition_condition.c +++ b/kubernetes/model/v1_custom_resource_definition_condition.c @@ -113,7 +113,7 @@ v1_custom_resource_definition_condition_t *v1_custom_resource_definition_conditi // v1_custom_resource_definition_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_custom_resource_definition_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v1_custom_resource_definition_condition_t *v1_custom_resource_definition_conditi v1_custom_resource_definition_condition_local_var = v1_custom_resource_definition_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_daemon_set_condition.c b/kubernetes/model/v1_daemon_set_condition.c index 821408b..bd70204 100644 --- a/kubernetes/model/v1_daemon_set_condition.c +++ b/kubernetes/model/v1_daemon_set_condition.c @@ -113,7 +113,7 @@ v1_daemon_set_condition_t *v1_daemon_set_condition_parseFromJSON(cJSON *v1_daemo // v1_daemon_set_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_daemon_set_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v1_daemon_set_condition_t *v1_daemon_set_condition_parseFromJSON(cJSON *v1_daemo v1_daemon_set_condition_local_var = v1_daemon_set_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_deployment_condition.c b/kubernetes/model/v1_deployment_condition.c index 7440050..a193369 100644 --- a/kubernetes/model/v1_deployment_condition.c +++ b/kubernetes/model/v1_deployment_condition.c @@ -127,7 +127,7 @@ v1_deployment_condition_t *v1_deployment_condition_parseFromJSON(cJSON *v1_deplo // v1_deployment_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_deployment_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -136,7 +136,7 @@ v1_deployment_condition_t *v1_deployment_condition_parseFromJSON(cJSON *v1_deplo // v1_deployment_condition->last_update_time cJSON *last_update_time = cJSON_GetObjectItemCaseSensitive(v1_deployment_conditionJSON, "lastUpdateTime"); if (last_update_time) { - if(!cJSON_IsString(last_update_time)) + if(!cJSON_IsString(last_update_time) && !cJSON_IsNull(last_update_time)) { goto end; //DateTime } @@ -186,8 +186,8 @@ v1_deployment_condition_t *v1_deployment_condition_parseFromJSON(cJSON *v1_deplo v1_deployment_condition_local_var = v1_deployment_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, - last_update_time ? strdup(last_update_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, + last_update_time && !cJSON_IsNull(last_update_time) ? strdup(last_update_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_horizontal_pod_autoscaler_status.c b/kubernetes/model/v1_horizontal_pod_autoscaler_status.c index f1d5d19..fc977a9 100644 --- a/kubernetes/model/v1_horizontal_pod_autoscaler_status.c +++ b/kubernetes/model/v1_horizontal_pod_autoscaler_status.c @@ -130,7 +130,7 @@ v1_horizontal_pod_autoscaler_status_t *v1_horizontal_pod_autoscaler_status_parse // v1_horizontal_pod_autoscaler_status->last_scale_time cJSON *last_scale_time = cJSON_GetObjectItemCaseSensitive(v1_horizontal_pod_autoscaler_statusJSON, "lastScaleTime"); if (last_scale_time) { - if(!cJSON_IsString(last_scale_time)) + if(!cJSON_IsString(last_scale_time) && !cJSON_IsNull(last_scale_time)) { goto end; //DateTime } @@ -150,7 +150,7 @@ v1_horizontal_pod_autoscaler_status_t *v1_horizontal_pod_autoscaler_status_parse current_cpu_utilization_percentage ? current_cpu_utilization_percentage->valuedouble : 0, current_replicas->valuedouble, desired_replicas->valuedouble, - last_scale_time ? strdup(last_scale_time->valuestring) : NULL, + last_scale_time && !cJSON_IsNull(last_scale_time) ? strdup(last_scale_time->valuestring) : NULL, observed_generation ? observed_generation->valuedouble : 0 ); diff --git a/kubernetes/model/v1_job_condition.c b/kubernetes/model/v1_job_condition.c index f88a9e5..008e41f 100644 --- a/kubernetes/model/v1_job_condition.c +++ b/kubernetes/model/v1_job_condition.c @@ -127,7 +127,7 @@ v1_job_condition_t *v1_job_condition_parseFromJSON(cJSON *v1_job_conditionJSON){ // v1_job_condition->last_probe_time cJSON *last_probe_time = cJSON_GetObjectItemCaseSensitive(v1_job_conditionJSON, "lastProbeTime"); if (last_probe_time) { - if(!cJSON_IsString(last_probe_time)) + if(!cJSON_IsString(last_probe_time) && !cJSON_IsNull(last_probe_time)) { goto end; //DateTime } @@ -136,7 +136,7 @@ v1_job_condition_t *v1_job_condition_parseFromJSON(cJSON *v1_job_conditionJSON){ // v1_job_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_job_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -186,8 +186,8 @@ v1_job_condition_t *v1_job_condition_parseFromJSON(cJSON *v1_job_conditionJSON){ v1_job_condition_local_var = v1_job_condition_create ( - last_probe_time ? strdup(last_probe_time->valuestring) : NULL, - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_probe_time && !cJSON_IsNull(last_probe_time) ? strdup(last_probe_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_job_status.c b/kubernetes/model/v1_job_status.c index b7c37e2..58f5f3f 100644 --- a/kubernetes/model/v1_job_status.c +++ b/kubernetes/model/v1_job_status.c @@ -195,7 +195,7 @@ v1_job_status_t *v1_job_status_parseFromJSON(cJSON *v1_job_statusJSON){ // v1_job_status->completion_time cJSON *completion_time = cJSON_GetObjectItemCaseSensitive(v1_job_statusJSON, "completionTime"); if (completion_time) { - if(!cJSON_IsString(completion_time)) + if(!cJSON_IsString(completion_time) && !cJSON_IsNull(completion_time)) { goto end; //DateTime } @@ -243,7 +243,7 @@ v1_job_status_t *v1_job_status_parseFromJSON(cJSON *v1_job_statusJSON){ // v1_job_status->start_time cJSON *start_time = cJSON_GetObjectItemCaseSensitive(v1_job_statusJSON, "startTime"); if (start_time) { - if(!cJSON_IsString(start_time)) + if(!cJSON_IsString(start_time) && !cJSON_IsNull(start_time)) { goto end; //DateTime } @@ -268,11 +268,11 @@ v1_job_status_t *v1_job_status_parseFromJSON(cJSON *v1_job_statusJSON){ v1_job_status_local_var = v1_job_status_create ( active ? active->valuedouble : 0, completed_indexes ? strdup(completed_indexes->valuestring) : NULL, - completion_time ? strdup(completion_time->valuestring) : NULL, + completion_time && !cJSON_IsNull(completion_time) ? strdup(completion_time->valuestring) : NULL, conditions ? conditionsList : NULL, failed ? failed->valuedouble : 0, ready ? ready->valuedouble : 0, - start_time ? strdup(start_time->valuestring) : NULL, + start_time && !cJSON_IsNull(start_time) ? strdup(start_time->valuestring) : NULL, succeeded ? succeeded->valuedouble : 0, uncounted_terminated_pods ? uncounted_terminated_pods_local_nonprim : NULL ); diff --git a/kubernetes/model/v1_lease_spec.c b/kubernetes/model/v1_lease_spec.c index f83e1fc..65a0dea 100644 --- a/kubernetes/model/v1_lease_spec.c +++ b/kubernetes/model/v1_lease_spec.c @@ -103,7 +103,7 @@ v1_lease_spec_t *v1_lease_spec_parseFromJSON(cJSON *v1_lease_specJSON){ // v1_lease_spec->acquire_time cJSON *acquire_time = cJSON_GetObjectItemCaseSensitive(v1_lease_specJSON, "acquireTime"); if (acquire_time) { - if(!cJSON_IsString(acquire_time)) + if(!cJSON_IsString(acquire_time) && !cJSON_IsNull(acquire_time)) { goto end; //DateTime } @@ -139,7 +139,7 @@ v1_lease_spec_t *v1_lease_spec_parseFromJSON(cJSON *v1_lease_specJSON){ // v1_lease_spec->renew_time cJSON *renew_time = cJSON_GetObjectItemCaseSensitive(v1_lease_specJSON, "renewTime"); if (renew_time) { - if(!cJSON_IsString(renew_time)) + if(!cJSON_IsString(renew_time) && !cJSON_IsNull(renew_time)) { goto end; //DateTime } @@ -147,11 +147,11 @@ v1_lease_spec_t *v1_lease_spec_parseFromJSON(cJSON *v1_lease_specJSON){ v1_lease_spec_local_var = v1_lease_spec_create ( - acquire_time ? strdup(acquire_time->valuestring) : NULL, + acquire_time && !cJSON_IsNull(acquire_time) ? strdup(acquire_time->valuestring) : NULL, holder_identity ? strdup(holder_identity->valuestring) : NULL, lease_duration_seconds ? lease_duration_seconds->valuedouble : 0, lease_transitions ? lease_transitions->valuedouble : 0, - renew_time ? strdup(renew_time->valuestring) : NULL + renew_time && !cJSON_IsNull(renew_time) ? strdup(renew_time->valuestring) : NULL ); return v1_lease_spec_local_var; diff --git a/kubernetes/model/v1_managed_fields_entry.c b/kubernetes/model/v1_managed_fields_entry.c index 8436ca2..97b9ecf 100644 --- a/kubernetes/model/v1_managed_fields_entry.c +++ b/kubernetes/model/v1_managed_fields_entry.c @@ -196,7 +196,7 @@ v1_managed_fields_entry_t *v1_managed_fields_entry_parseFromJSON(cJSON *v1_manag // v1_managed_fields_entry->time cJSON *time = cJSON_GetObjectItemCaseSensitive(v1_managed_fields_entryJSON, "time"); if (time) { - if(!cJSON_IsString(time)) + if(!cJSON_IsString(time) && !cJSON_IsNull(time)) { goto end; //DateTime } @@ -210,7 +210,7 @@ v1_managed_fields_entry_t *v1_managed_fields_entry_parseFromJSON(cJSON *v1_manag manager ? strdup(manager->valuestring) : NULL, operation ? strdup(operation->valuestring) : NULL, subresource ? strdup(subresource->valuestring) : NULL, - time ? strdup(time->valuestring) : NULL + time && !cJSON_IsNull(time) ? strdup(time->valuestring) : NULL ); return v1_managed_fields_entry_local_var; diff --git a/kubernetes/model/v1_namespace_condition.c b/kubernetes/model/v1_namespace_condition.c index 2695d89..40c7d60 100644 --- a/kubernetes/model/v1_namespace_condition.c +++ b/kubernetes/model/v1_namespace_condition.c @@ -113,7 +113,7 @@ v1_namespace_condition_t *v1_namespace_condition_parseFromJSON(cJSON *v1_namespa // v1_namespace_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_namespace_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v1_namespace_condition_t *v1_namespace_condition_parseFromJSON(cJSON *v1_namespa v1_namespace_condition_local_var = v1_namespace_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_node_condition.c b/kubernetes/model/v1_node_condition.c index b30116f..f89269d 100644 --- a/kubernetes/model/v1_node_condition.c +++ b/kubernetes/model/v1_node_condition.c @@ -127,7 +127,7 @@ v1_node_condition_t *v1_node_condition_parseFromJSON(cJSON *v1_node_conditionJSO // v1_node_condition->last_heartbeat_time cJSON *last_heartbeat_time = cJSON_GetObjectItemCaseSensitive(v1_node_conditionJSON, "lastHeartbeatTime"); if (last_heartbeat_time) { - if(!cJSON_IsString(last_heartbeat_time)) + if(!cJSON_IsString(last_heartbeat_time) && !cJSON_IsNull(last_heartbeat_time)) { goto end; //DateTime } @@ -136,7 +136,7 @@ v1_node_condition_t *v1_node_condition_parseFromJSON(cJSON *v1_node_conditionJSO // v1_node_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_node_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -186,8 +186,8 @@ v1_node_condition_t *v1_node_condition_parseFromJSON(cJSON *v1_node_conditionJSO v1_node_condition_local_var = v1_node_condition_create ( - last_heartbeat_time ? strdup(last_heartbeat_time->valuestring) : NULL, - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_heartbeat_time && !cJSON_IsNull(last_heartbeat_time) ? strdup(last_heartbeat_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_object_meta.c b/kubernetes/model/v1_object_meta.c index 99a8394..987734a 100644 --- a/kubernetes/model/v1_object_meta.c +++ b/kubernetes/model/v1_object_meta.c @@ -361,7 +361,7 @@ v1_object_meta_t *v1_object_meta_parseFromJSON(cJSON *v1_object_metaJSON){ // v1_object_meta->creation_timestamp cJSON *creation_timestamp = cJSON_GetObjectItemCaseSensitive(v1_object_metaJSON, "creationTimestamp"); if (creation_timestamp) { - if(!cJSON_IsString(creation_timestamp)) + if(!cJSON_IsString(creation_timestamp) && !cJSON_IsNull(creation_timestamp)) { goto end; //DateTime } @@ -379,7 +379,7 @@ v1_object_meta_t *v1_object_meta_parseFromJSON(cJSON *v1_object_metaJSON){ // v1_object_meta->deletion_timestamp cJSON *deletion_timestamp = cJSON_GetObjectItemCaseSensitive(v1_object_metaJSON, "deletionTimestamp"); if (deletion_timestamp) { - if(!cJSON_IsString(deletion_timestamp)) + if(!cJSON_IsString(deletion_timestamp) && !cJSON_IsNull(deletion_timestamp)) { goto end; //DateTime } @@ -537,9 +537,9 @@ v1_object_meta_t *v1_object_meta_parseFromJSON(cJSON *v1_object_metaJSON){ v1_object_meta_local_var = v1_object_meta_create ( annotations ? annotationsList : NULL, - creation_timestamp ? strdup(creation_timestamp->valuestring) : NULL, + creation_timestamp && !cJSON_IsNull(creation_timestamp) ? strdup(creation_timestamp->valuestring) : NULL, deletion_grace_period_seconds ? deletion_grace_period_seconds->valuedouble : 0, - deletion_timestamp ? strdup(deletion_timestamp->valuestring) : NULL, + deletion_timestamp && !cJSON_IsNull(deletion_timestamp) ? strdup(deletion_timestamp->valuestring) : NULL, finalizers ? finalizersList : NULL, generate_name ? strdup(generate_name->valuestring) : NULL, generation ? generation->valuedouble : 0, diff --git a/kubernetes/model/v1_persistent_volume_claim_condition.c b/kubernetes/model/v1_persistent_volume_claim_condition.c index 40772a3..44adf46 100644 --- a/kubernetes/model/v1_persistent_volume_claim_condition.c +++ b/kubernetes/model/v1_persistent_volume_claim_condition.c @@ -127,7 +127,7 @@ v1_persistent_volume_claim_condition_t *v1_persistent_volume_claim_condition_par // v1_persistent_volume_claim_condition->last_probe_time cJSON *last_probe_time = cJSON_GetObjectItemCaseSensitive(v1_persistent_volume_claim_conditionJSON, "lastProbeTime"); if (last_probe_time) { - if(!cJSON_IsString(last_probe_time)) + if(!cJSON_IsString(last_probe_time) && !cJSON_IsNull(last_probe_time)) { goto end; //DateTime } @@ -136,7 +136,7 @@ v1_persistent_volume_claim_condition_t *v1_persistent_volume_claim_condition_par // v1_persistent_volume_claim_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_persistent_volume_claim_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -186,8 +186,8 @@ v1_persistent_volume_claim_condition_t *v1_persistent_volume_claim_condition_par v1_persistent_volume_claim_condition_local_var = v1_persistent_volume_claim_condition_create ( - last_probe_time ? strdup(last_probe_time->valuestring) : NULL, - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_probe_time && !cJSON_IsNull(last_probe_time) ? strdup(last_probe_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_pod_condition.c b/kubernetes/model/v1_pod_condition.c index 6b2b5d5..4bbb994 100644 --- a/kubernetes/model/v1_pod_condition.c +++ b/kubernetes/model/v1_pod_condition.c @@ -127,7 +127,7 @@ v1_pod_condition_t *v1_pod_condition_parseFromJSON(cJSON *v1_pod_conditionJSON){ // v1_pod_condition->last_probe_time cJSON *last_probe_time = cJSON_GetObjectItemCaseSensitive(v1_pod_conditionJSON, "lastProbeTime"); if (last_probe_time) { - if(!cJSON_IsString(last_probe_time)) + if(!cJSON_IsString(last_probe_time) && !cJSON_IsNull(last_probe_time)) { goto end; //DateTime } @@ -136,7 +136,7 @@ v1_pod_condition_t *v1_pod_condition_parseFromJSON(cJSON *v1_pod_conditionJSON){ // v1_pod_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_pod_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -186,8 +186,8 @@ v1_pod_condition_t *v1_pod_condition_parseFromJSON(cJSON *v1_pod_conditionJSON){ v1_pod_condition_local_var = v1_pod_condition_create ( - last_probe_time ? strdup(last_probe_time->valuestring) : NULL, - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_probe_time && !cJSON_IsNull(last_probe_time) ? strdup(last_probe_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_pod_status.c b/kubernetes/model/v1_pod_status.c index 5b06c0a..d1af5a0 100644 --- a/kubernetes/model/v1_pod_status.c +++ b/kubernetes/model/v1_pod_status.c @@ -481,7 +481,7 @@ v1_pod_status_t *v1_pod_status_parseFromJSON(cJSON *v1_pod_statusJSON){ // v1_pod_status->start_time cJSON *start_time = cJSON_GetObjectItemCaseSensitive(v1_pod_statusJSON, "startTime"); if (start_time) { - if(!cJSON_IsString(start_time)) + if(!cJSON_IsString(start_time) && !cJSON_IsNull(start_time)) { goto end; //DateTime } @@ -501,7 +501,7 @@ v1_pod_status_t *v1_pod_status_parseFromJSON(cJSON *v1_pod_statusJSON){ pod_ips ? pod_ipsList : NULL, qos_class ? strdup(qos_class->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, - start_time ? strdup(start_time->valuestring) : NULL + start_time && !cJSON_IsNull(start_time) ? strdup(start_time->valuestring) : NULL ); return v1_pod_status_local_var; diff --git a/kubernetes/model/v1_replica_set_condition.c b/kubernetes/model/v1_replica_set_condition.c index b99257e..93659ef 100644 --- a/kubernetes/model/v1_replica_set_condition.c +++ b/kubernetes/model/v1_replica_set_condition.c @@ -113,7 +113,7 @@ v1_replica_set_condition_t *v1_replica_set_condition_parseFromJSON(cJSON *v1_rep // v1_replica_set_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_replica_set_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v1_replica_set_condition_t *v1_replica_set_condition_parseFromJSON(cJSON *v1_rep v1_replica_set_condition_local_var = v1_replica_set_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_replication_controller_condition.c b/kubernetes/model/v1_replication_controller_condition.c index e793eb7..d112a05 100644 --- a/kubernetes/model/v1_replication_controller_condition.c +++ b/kubernetes/model/v1_replication_controller_condition.c @@ -113,7 +113,7 @@ v1_replication_controller_condition_t *v1_replication_controller_condition_parse // v1_replication_controller_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_replication_controller_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v1_replication_controller_condition_t *v1_replication_controller_condition_parse v1_replication_controller_condition_local_var = v1_replication_controller_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_stateful_set_condition.c b/kubernetes/model/v1_stateful_set_condition.c index 5dfb6c2..988f39a 100644 --- a/kubernetes/model/v1_stateful_set_condition.c +++ b/kubernetes/model/v1_stateful_set_condition.c @@ -113,7 +113,7 @@ v1_stateful_set_condition_t *v1_stateful_set_condition_parseFromJSON(cJSON *v1_s // v1_stateful_set_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1_stateful_set_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v1_stateful_set_condition_t *v1_stateful_set_condition_parseFromJSON(cJSON *v1_s v1_stateful_set_condition_local_var = v1_stateful_set_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v1_taint.c b/kubernetes/model/v1_taint.c index 93ce169..9841ddc 100644 --- a/kubernetes/model/v1_taint.c +++ b/kubernetes/model/v1_taint.c @@ -123,7 +123,7 @@ v1_taint_t *v1_taint_parseFromJSON(cJSON *v1_taintJSON){ // v1_taint->time_added cJSON *time_added = cJSON_GetObjectItemCaseSensitive(v1_taintJSON, "timeAdded"); if (time_added) { - if(!cJSON_IsString(time_added)) + if(!cJSON_IsString(time_added) && !cJSON_IsNull(time_added)) { goto end; //DateTime } @@ -142,7 +142,7 @@ v1_taint_t *v1_taint_parseFromJSON(cJSON *v1_taintJSON){ v1_taint_local_var = v1_taint_create ( strdup(effect->valuestring), strdup(key->valuestring), - time_added ? strdup(time_added->valuestring) : NULL, + time_added && !cJSON_IsNull(time_added) ? strdup(time_added->valuestring) : NULL, value ? strdup(value->valuestring) : NULL ); diff --git a/kubernetes/model/v1_token_request_status.c b/kubernetes/model/v1_token_request_status.c index cc6bfc5..7a2f45c 100644 --- a/kubernetes/model/v1_token_request_status.c +++ b/kubernetes/model/v1_token_request_status.c @@ -75,7 +75,7 @@ v1_token_request_status_t *v1_token_request_status_parseFromJSON(cJSON *v1_token } - if(!cJSON_IsString(expiration_timestamp)) + if(!cJSON_IsString(expiration_timestamp) && !cJSON_IsNull(expiration_timestamp)) { goto end; //DateTime } diff --git a/kubernetes/model/v1_volume_error.c b/kubernetes/model/v1_volume_error.c index 13bc59d..dd1652c 100644 --- a/kubernetes/model/v1_volume_error.c +++ b/kubernetes/model/v1_volume_error.c @@ -78,7 +78,7 @@ v1_volume_error_t *v1_volume_error_parseFromJSON(cJSON *v1_volume_errorJSON){ // v1_volume_error->time cJSON *time = cJSON_GetObjectItemCaseSensitive(v1_volume_errorJSON, "time"); if (time) { - if(!cJSON_IsString(time)) + if(!cJSON_IsString(time) && !cJSON_IsNull(time)) { goto end; //DateTime } @@ -87,7 +87,7 @@ v1_volume_error_t *v1_volume_error_parseFromJSON(cJSON *v1_volume_errorJSON){ v1_volume_error_local_var = v1_volume_error_create ( message ? strdup(message->valuestring) : NULL, - time ? strdup(time->valuestring) : NULL + time && !cJSON_IsNull(time) ? strdup(time->valuestring) : NULL ); return v1_volume_error_local_var; diff --git a/kubernetes/model/v1alpha1_storage_version_condition.c b/kubernetes/model/v1alpha1_storage_version_condition.c index 57d6c90..cdeaee5 100644 --- a/kubernetes/model/v1alpha1_storage_version_condition.c +++ b/kubernetes/model/v1alpha1_storage_version_condition.c @@ -124,7 +124,7 @@ v1alpha1_storage_version_condition_t *v1alpha1_storage_version_condition_parseFr // v1alpha1_storage_version_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1alpha1_storage_version_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -186,7 +186,7 @@ v1alpha1_storage_version_condition_t *v1alpha1_storage_version_condition_parseFr v1alpha1_storage_version_condition_local_var = v1alpha1_storage_version_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, observed_generation ? observed_generation->valuedouble : 0, strdup(reason->valuestring), diff --git a/kubernetes/model/v1beta1_flow_schema_condition.c b/kubernetes/model/v1beta1_flow_schema_condition.c index 4d2c5e4..2578b3a 100644 --- a/kubernetes/model/v1beta1_flow_schema_condition.c +++ b/kubernetes/model/v1beta1_flow_schema_condition.c @@ -111,7 +111,7 @@ v1beta1_flow_schema_condition_t *v1beta1_flow_schema_condition_parseFromJSON(cJS // v1beta1_flow_schema_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1beta1_flow_schema_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -155,7 +155,7 @@ v1beta1_flow_schema_condition_t *v1beta1_flow_schema_condition_parseFromJSON(cJS v1beta1_flow_schema_condition_local_var = v1beta1_flow_schema_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, status ? strdup(status->valuestring) : NULL, diff --git a/kubernetes/model/v1beta1_priority_level_configuration_condition.c b/kubernetes/model/v1beta1_priority_level_configuration_condition.c index 10b05f9..67ce2de 100644 --- a/kubernetes/model/v1beta1_priority_level_configuration_condition.c +++ b/kubernetes/model/v1beta1_priority_level_configuration_condition.c @@ -111,7 +111,7 @@ v1beta1_priority_level_configuration_condition_t *v1beta1_priority_level_configu // v1beta1_priority_level_configuration_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1beta1_priority_level_configuration_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -155,7 +155,7 @@ v1beta1_priority_level_configuration_condition_t *v1beta1_priority_level_configu v1beta1_priority_level_configuration_condition_local_var = v1beta1_priority_level_configuration_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, status ? strdup(status->valuestring) : NULL, diff --git a/kubernetes/model/v1beta2_flow_schema_condition.c b/kubernetes/model/v1beta2_flow_schema_condition.c index 86e40b0..b54920b 100644 --- a/kubernetes/model/v1beta2_flow_schema_condition.c +++ b/kubernetes/model/v1beta2_flow_schema_condition.c @@ -111,7 +111,7 @@ v1beta2_flow_schema_condition_t *v1beta2_flow_schema_condition_parseFromJSON(cJS // v1beta2_flow_schema_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1beta2_flow_schema_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -155,7 +155,7 @@ v1beta2_flow_schema_condition_t *v1beta2_flow_schema_condition_parseFromJSON(cJS v1beta2_flow_schema_condition_local_var = v1beta2_flow_schema_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, status ? strdup(status->valuestring) : NULL, diff --git a/kubernetes/model/v1beta2_priority_level_configuration_condition.c b/kubernetes/model/v1beta2_priority_level_configuration_condition.c index 7a7e6c1..79be307 100644 --- a/kubernetes/model/v1beta2_priority_level_configuration_condition.c +++ b/kubernetes/model/v1beta2_priority_level_configuration_condition.c @@ -111,7 +111,7 @@ v1beta2_priority_level_configuration_condition_t *v1beta2_priority_level_configu // v1beta2_priority_level_configuration_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v1beta2_priority_level_configuration_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -155,7 +155,7 @@ v1beta2_priority_level_configuration_condition_t *v1beta2_priority_level_configu v1beta2_priority_level_configuration_condition_local_var = v1beta2_priority_level_configuration_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, status ? strdup(status->valuestring) : NULL, diff --git a/kubernetes/model/v2_horizontal_pod_autoscaler_condition.c b/kubernetes/model/v2_horizontal_pod_autoscaler_condition.c index 2944a9a..3999374 100644 --- a/kubernetes/model/v2_horizontal_pod_autoscaler_condition.c +++ b/kubernetes/model/v2_horizontal_pod_autoscaler_condition.c @@ -113,7 +113,7 @@ v2_horizontal_pod_autoscaler_condition_t *v2_horizontal_pod_autoscaler_condition // v2_horizontal_pod_autoscaler_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v2_horizontal_pod_autoscaler_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v2_horizontal_pod_autoscaler_condition_t *v2_horizontal_pod_autoscaler_condition v2_horizontal_pod_autoscaler_condition_local_var = v2_horizontal_pod_autoscaler_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v2_horizontal_pod_autoscaler_status.c b/kubernetes/model/v2_horizontal_pod_autoscaler_status.c index 21ea840..2b1e365 100644 --- a/kubernetes/model/v2_horizontal_pod_autoscaler_status.c +++ b/kubernetes/model/v2_horizontal_pod_autoscaler_status.c @@ -213,7 +213,7 @@ v2_horizontal_pod_autoscaler_status_t *v2_horizontal_pod_autoscaler_status_parse // v2_horizontal_pod_autoscaler_status->last_scale_time cJSON *last_scale_time = cJSON_GetObjectItemCaseSensitive(v2_horizontal_pod_autoscaler_statusJSON, "lastScaleTime"); if (last_scale_time) { - if(!cJSON_IsString(last_scale_time)) + if(!cJSON_IsString(last_scale_time) && !cJSON_IsNull(last_scale_time)) { goto end; //DateTime } @@ -234,7 +234,7 @@ v2_horizontal_pod_autoscaler_status_t *v2_horizontal_pod_autoscaler_status_parse current_metrics ? current_metricsList : NULL, current_replicas ? current_replicas->valuedouble : 0, desired_replicas->valuedouble, - last_scale_time ? strdup(last_scale_time->valuestring) : NULL, + last_scale_time && !cJSON_IsNull(last_scale_time) ? strdup(last_scale_time->valuestring) : NULL, observed_generation ? observed_generation->valuedouble : 0 ); diff --git a/kubernetes/model/v2beta2_horizontal_pod_autoscaler_condition.c b/kubernetes/model/v2beta2_horizontal_pod_autoscaler_condition.c index b06450f..a8bedf5 100644 --- a/kubernetes/model/v2beta2_horizontal_pod_autoscaler_condition.c +++ b/kubernetes/model/v2beta2_horizontal_pod_autoscaler_condition.c @@ -113,7 +113,7 @@ v2beta2_horizontal_pod_autoscaler_condition_t *v2beta2_horizontal_pod_autoscaler // v2beta2_horizontal_pod_autoscaler_condition->last_transition_time cJSON *last_transition_time = cJSON_GetObjectItemCaseSensitive(v2beta2_horizontal_pod_autoscaler_conditionJSON, "lastTransitionTime"); if (last_transition_time) { - if(!cJSON_IsString(last_transition_time)) + if(!cJSON_IsString(last_transition_time) && !cJSON_IsNull(last_transition_time)) { goto end; //DateTime } @@ -163,7 +163,7 @@ v2beta2_horizontal_pod_autoscaler_condition_t *v2beta2_horizontal_pod_autoscaler v2beta2_horizontal_pod_autoscaler_condition_local_var = v2beta2_horizontal_pod_autoscaler_condition_create ( - last_transition_time ? strdup(last_transition_time->valuestring) : NULL, + last_transition_time && !cJSON_IsNull(last_transition_time) ? strdup(last_transition_time->valuestring) : NULL, message ? strdup(message->valuestring) : NULL, reason ? strdup(reason->valuestring) : NULL, strdup(status->valuestring), diff --git a/kubernetes/model/v2beta2_horizontal_pod_autoscaler_status.c b/kubernetes/model/v2beta2_horizontal_pod_autoscaler_status.c index c3fc917..590aea9 100644 --- a/kubernetes/model/v2beta2_horizontal_pod_autoscaler_status.c +++ b/kubernetes/model/v2beta2_horizontal_pod_autoscaler_status.c @@ -217,7 +217,7 @@ v2beta2_horizontal_pod_autoscaler_status_t *v2beta2_horizontal_pod_autoscaler_st // v2beta2_horizontal_pod_autoscaler_status->last_scale_time cJSON *last_scale_time = cJSON_GetObjectItemCaseSensitive(v2beta2_horizontal_pod_autoscaler_statusJSON, "lastScaleTime"); if (last_scale_time) { - if(!cJSON_IsString(last_scale_time)) + if(!cJSON_IsString(last_scale_time) && !cJSON_IsNull(last_scale_time)) { goto end; //DateTime } @@ -238,7 +238,7 @@ v2beta2_horizontal_pod_autoscaler_status_t *v2beta2_horizontal_pod_autoscaler_st current_metrics ? current_metricsList : NULL, current_replicas->valuedouble, desired_replicas->valuedouble, - last_scale_time ? strdup(last_scale_time->valuestring) : NULL, + last_scale_time && !cJSON_IsNull(last_scale_time) ? strdup(last_scale_time->valuestring) : NULL, observed_generation ? observed_generation->valuedouble : 0 );