Skip to content

Add queryParameters to Generic_list* api #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −18
Open

Add queryParameters to Generic_list* api #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/generic/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ int main(int argc, char *argv[])

genericClient_t *genericClient = genericClient_create(apiClient, "apps", "v1", "deployments");

char *list = Generic_listNamespaced(genericClient, "default");
char *list = Generic_listNamespaced(genericClient, "default", NULL);
printf("%s\n", list);
free(list);

Expand Down
4 changes: 2 additions & 2 deletions kubernetes/include/generic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ void genericClient_free(genericClient_t* client);
char* Generic_readNamespacedResource(genericClient_t *client, const char *ns, const char *name);
char* Generic_readResource(genericClient_t *client, const char *name);

char* Generic_listNamespaced(genericClient_t *client, const char *ns);
char* Generic_list(genericClient_t *client);
char* Generic_listNamespaced(genericClient_t *client, const char *ns, list_t *queryParameters);
char* Generic_list(genericClient_t *client, list_t *queryParameters);

char* Generic_deleteNamespacedResource(genericClient_t *client, const char *ns, const char *name);
char* Generic_deleteResource(genericClient_t *client, const char* name);
Expand Down
30 changes: 15 additions & 15 deletions kubernetes/src/generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ void makeNamespacedResourcePath(char* path, genericClient_t *client, const char*
void makeResourcePath(char* path, genericClient_t *client, const char* name);
char* callInternal(genericClient_t *client,
const char *path, list_t *queryParameters, list_t *headerParameters, list_t *formParameters, list_t *headerType, list_t *contentType, const char *body, const char *method);
char *callSimplifiedInternal(genericClient_t *client, const char *path, const char *method, const char *body);
char *callSimplifiedInternal(genericClient_t *client, const char *path, const char *method, const char *body, list_t *queryParameters);

genericClient_t* genericClient_create(apiClient_t *client, const char *apiGroup, const char* apiVersion, const char* resourcePlural) {
genericClient_t *result = malloc(sizeof(genericClient_t));
Expand Down Expand Up @@ -80,26 +80,26 @@ char* callInternal(genericClient_t *client,
return elementToReturn;
}

char *callSimplifiedInternal(genericClient_t *client, const char *path, const char *method, const char *body)
char *callSimplifiedInternal(genericClient_t *client, const char *path, const char *method, const char *body, list_t *queryParameters)
{
return callInternal(client, path, NULL, NULL, NULL, NULL, NULL, body, method);
return callInternal(client, path, queryParameters, NULL, NULL, NULL, NULL, body, method);
}

char* Generic_readNamespacedResource(genericClient_t *client, const char *namespace, const char *name) {
char path[128];

makeNamespacedResourcePath(path, client, namespace, name);
return callSimplifiedInternal(client, path, "GET", NULL);
return callSimplifiedInternal(client, path, "GET", NULL, NULL);
}

char* Generic_readResource(genericClient_t *client, const char *name) {
char path[128];

makeResourcePath(path, client, name);
return callSimplifiedInternal(client, path, "GET", NULL);
return callSimplifiedInternal(client, path, "GET", NULL, NULL);
}

char *Generic_listNamespaced(genericClient_t *client, const char *namespace) {
char *Generic_listNamespaced(genericClient_t *client, const char *namespace, list_t *queryParameters) {
char path[128];
if (client->apiGroup && strlen(client->apiGroup)) {
snprintf(path, 128, "/apis/%s/%s/namespaces/%s/%s",
Expand All @@ -108,10 +108,10 @@ char *Generic_listNamespaced(genericClient_t *client, const char *namespace) {
snprintf(path, 128, "/api/%s/namespaces/%s/%s",
client->apiVersion, namespace, client->resourcePlural);
}
return callSimplifiedInternal(client, path, "GET", NULL);
return callSimplifiedInternal(client, path, "GET", NULL, queryParameters);
}

char *Generic_list(genericClient_t *client) {
char *Generic_list(genericClient_t *client, list_t *queryParameters) {
char path[128];
if (client->apiGroup && strlen(client->apiGroup)) {
snprintf(path, 128, "/apis/%s/%s/%s",
Expand All @@ -120,43 +120,43 @@ char *Generic_list(genericClient_t *client) {
snprintf(path, 128, "/api/%s/%s",
client->apiVersion, client->resourcePlural);
}
return callSimplifiedInternal(client, path, "GET", NULL);
return callSimplifiedInternal(client, path, "GET", NULL, queryParameters);
}

char* Generic_deleteNamespacedResource(genericClient_t *client, const char *namespace, const char *name) {
char path[128];
makeNamespacedResourcePath(path, client, namespace, name);
return callSimplifiedInternal(client, path, "DELETE", NULL);
return callSimplifiedInternal(client, path, "DELETE", NULL, NULL);
}

char* Generic_deleteResource(genericClient_t *client, const char* name) {
char path[128];
makeResourcePath(path, client, name);
return callSimplifiedInternal(client, path, "DELETE", NULL);
return callSimplifiedInternal(client, path, "DELETE", NULL, NULL);
}

char* Generic_createNamespacedResource(genericClient_t *client, const char *ns, const char* body) {
char path[128];
makeNamespacedResourcePath(path, client, ns, "");
return callSimplifiedInternal(client, path, "POST", body);
return callSimplifiedInternal(client, path, "POST", body, NULL);
}

char* Generic_createResource(genericClient_t *client, const char* body) {
char path[128];
makeResourcePath(path, client, "");
return callSimplifiedInternal(client, path, "POST", body);
return callSimplifiedInternal(client, path, "POST", body, NULL);
}

char* Generic_replaceNamespacedResource(genericClient_t *client, const char *ns, const char *name, const char* body) {
char path[128];
makeNamespacedResourcePath(path, client, ns, name);
return callSimplifiedInternal(client, path, "PUT", body);
return callSimplifiedInternal(client, path, "PUT", body, NULL);
}

char* Generic_replaceResource(genericClient_t *client, const char *name, const char* body) {
char path[128];
makeResourcePath(path, client, name);
return callSimplifiedInternal(client, path, "PUT", body);
return callSimplifiedInternal(client, path, "PUT", body, NULL);
}

char* Generic_patchNamespacedResource(genericClient_t * client,
Expand Down