From 23f4643c6edadefc55c628269bdf0a58c8686170 Mon Sep 17 00:00:00 2001 From: Pradeep Lakshmi Narasimha Date: Mon, 4 Oct 2021 12:52:50 +0530 Subject: [PATCH] refactor: Replaced context.TODO() with request.Context() in API files (#2214) --- pkg/controller/api.go | 8 ++++---- pkg/controller/canaryConfigApi.go | 11 +++++------ pkg/controller/configmapApi.go | 3 +-- pkg/controller/environmentApi.go | 13 ++++++------- pkg/controller/functionApi.go | 16 ++++++++-------- pkg/controller/httpTriggerApi.go | 20 ++++++++++---------- pkg/controller/mqTriggerApi.go | 13 ++++++------- pkg/controller/packageApi.go | 13 ++++++------- pkg/controller/secretApi.go | 3 +-- pkg/controller/timeTriggerApi.go | 13 ++++++------- pkg/controller/watchApi.go | 11 +++++------ 11 files changed, 58 insertions(+), 66 deletions(-) diff --git a/pkg/controller/api.go b/pkg/controller/api.go index e731c41d..df7f4f47 100644 --- a/pkg/controller/api.go +++ b/pkg/controller/api.go @@ -131,20 +131,20 @@ func (api *API) extractQueryParamFromRequest(r *http.Request, queryParam string) } // check if namespace exists, if not create it. -func (api *API) createNsIfNotExists(ns string) error { +func (api *API) createNsIfNotExists(ctx context.Context, ns string) error { if ns == metav1.NamespaceDefault { // we don't have to create default ns return nil } - _, err := api.kubernetesClient.CoreV1().Namespaces().Get(context.TODO(), ns, metav1.GetOptions{}) + _, err := api.kubernetesClient.CoreV1().Namespaces().Get(ctx, ns, metav1.GetOptions{}) if err != nil && kerrors.IsNotFound(err) { ns := &apiv1.Namespace{ ObjectMeta: metav1.ObjectMeta{ Name: ns, }, } - _, err = api.kubernetesClient.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{}) + _, err = api.kubernetesClient.CoreV1().Namespaces().Create(ctx, ns, metav1.CreateOptions{}) } return err @@ -186,7 +186,7 @@ func (api *API) HealthHandler(w http.ResponseWriter, r *http.Request) { func (api *API) GetSvcName(w http.ResponseWriter, r *http.Request) { appLabelSelector := "application=" + r.URL.Query().Get("application") - services, err := api.kubernetesClient.CoreV1().Services(podNamespace).List(context.TODO(), metav1.ListOptions{ + services, err := api.kubernetesClient.CoreV1().Services(podNamespace).List(r.Context(), metav1.ListOptions{ LabelSelector: appLabelSelector, }) if err != nil || len(services.Items) > 1 || len(services.Items) == 0 { diff --git a/pkg/controller/canaryConfigApi.go b/pkg/controller/canaryConfigApi.go index bca4f058..63525a03 100644 --- a/pkg/controller/canaryConfigApi.go +++ b/pkg/controller/canaryConfigApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "encoding/json" "fmt" "io/ioutil" @@ -123,7 +122,7 @@ func (a *API) CanaryConfigApiCreate(w http.ResponseWriter, r *http.Request) { return } - canaryCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(canaryCfg.ObjectMeta.Namespace).Create(context.TODO(), &canaryCfg, metav1.CreateOptions{}) + canaryCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(canaryCfg.ObjectMeta.Namespace).Create(r.Context(), &canaryCfg, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -154,7 +153,7 @@ func (a *API) CanaryConfigApiGet(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - canaryCfg, err := a.fissionClient.CoreV1().CanaryConfigs(ns).Get(context.TODO(), name, metav1.GetOptions{}) + canaryCfg, err := a.fissionClient.CoreV1().CanaryConfigs(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -181,7 +180,7 @@ func (a *API) CanaryConfigApiList(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - canaryCfgs, err := a.fissionClient.CoreV1().CanaryConfigs(ns).List(context.TODO(), metav1.ListOptions{}) + canaryCfgs, err := a.fissionClient.CoreV1().CanaryConfigs(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -216,7 +215,7 @@ func (a *API) CanaryConfigApiUpdate(w http.ResponseWriter, r *http.Request) { return } - canayCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(c.ObjectMeta.Namespace).Update(context.TODO(), &c, metav1.UpdateOptions{}) + canayCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(c.ObjectMeta.Namespace).Update(r.Context(), &c, metav1.UpdateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -245,7 +244,7 @@ func (a *API) CanaryConfigApiDelete(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().CanaryConfigs(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().CanaryConfigs(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/pkg/controller/configmapApi.go b/pkg/controller/configmapApi.go index 9356611a..af653fba 100644 --- a/pkg/controller/configmapApi.go +++ b/pkg/controller/configmapApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "net/http" "github.com/gorilla/mux" @@ -33,7 +32,7 @@ func (a *API) ConfigMapExists(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - _, err := a.kubernetesClient.CoreV1().ConfigMaps(ns).Get(context.TODO(), name, metav1.GetOptions{}) + _, err := a.kubernetesClient.CoreV1().ConfigMaps(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.logger.Error("error getting config map", zap.Error(err), zap.String("config_map_name", name), zap.String("namespace", ns)) a.respondWithError(w, err) diff --git a/pkg/controller/environmentApi.go b/pkg/controller/environmentApi.go index dc83a5c2..85704fd5 100644 --- a/pkg/controller/environmentApi.go +++ b/pkg/controller/environmentApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "encoding/json" "io/ioutil" "net/http" @@ -106,7 +105,7 @@ func (a *API) EnvironmentApiList(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceAll } - envs, err := a.fissionClient.CoreV1().Environments(ns).List(context.TODO(), metav1.ListOptions{}) + envs, err := a.fissionClient.CoreV1().Environments(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -137,13 +136,13 @@ func (a *API) EnvironmentApiCreate(w http.ResponseWriter, r *http.Request) { } // check if namespace exists, if not create it. - err = a.createNsIfNotExists(env.ObjectMeta.Namespace) + err = a.createNsIfNotExists(r.Context(), env.ObjectMeta.Namespace) if err != nil { a.respondWithError(w, err) return } - enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Create(context.TODO(), &env, metav1.CreateOptions{}) + enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Create(r.Context(), &env, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -168,7 +167,7 @@ func (a *API) EnvironmentApiGet(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - env, err := a.fissionClient.CoreV1().Environments(ns).Get(context.TODO(), name, metav1.GetOptions{}) + env, err := a.fissionClient.CoreV1().Environments(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -206,7 +205,7 @@ func (a *API) EnvironmentApiUpdate(w http.ResponseWriter, r *http.Request) { return } - enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Update(context.TODO(), &env, metav1.UpdateOptions{}) + enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Update(r.Context(), &env, metav1.UpdateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -230,7 +229,7 @@ func (a *API) EnvironmentApiDelete(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().Environments(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().Environments(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/pkg/controller/functionApi.go b/pkg/controller/functionApi.go index a96b1871..8dca09b8 100644 --- a/pkg/controller/functionApi.go +++ b/pkg/controller/functionApi.go @@ -117,7 +117,7 @@ func (a *API) FunctionApiList(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceAll } - funcs, err := a.fissionClient.CoreV1().Functions(ns).List(context.TODO(), metav1.ListOptions{}) + funcs, err := a.fissionClient.CoreV1().Functions(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -147,13 +147,13 @@ func (a *API) FunctionApiCreate(w http.ResponseWriter, r *http.Request) { } // check if namespace exists, if not create it. - err = a.createNsIfNotExists(f.ObjectMeta.Namespace) + err = a.createNsIfNotExists(r.Context(), f.ObjectMeta.Namespace) if err != nil { a.respondWithError(w, err) return } - fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Create(context.TODO(), &f, metav1.CreateOptions{}) + fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Create(r.Context(), &f, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -177,7 +177,7 @@ func (a *API) FunctionApiGet(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - f, err := a.fissionClient.CoreV1().Functions(ns).Get(context.TODO(), name, metav1.GetOptions{}) + f, err := a.fissionClient.CoreV1().Functions(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -214,7 +214,7 @@ func (a *API) FunctionApiUpdate(w http.ResponseWriter, r *http.Request) { return } - fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Update(context.TODO(), &f, metav1.UpdateOptions{}) + fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Update(r.Context(), &f, metav1.UpdateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -236,7 +236,7 @@ func (a *API) FunctionApiDelete(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().Functions(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().Functions(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return @@ -299,7 +299,7 @@ func (a *API) FunctionPodLogs(w http.ResponseWriter, r *http.Request) { podNs = ns } - f, err := a.fissionClient.CoreV1().Functions(ns).Get(context.TODO(), fnName, metav1.GetOptions{}) + f, err := a.fissionClient.CoreV1().Functions(ns).Get(r.Context(), fnName, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -311,7 +311,7 @@ func (a *API) FunctionPodLogs(w http.ResponseWriter, r *http.Request) { fv1.ENVIRONMENT_NAME: f.Spec.Environment.Name, fv1.ENVIRONMENT_NAMESPACE: f.Spec.Environment.Namespace, } - podList, err := a.kubernetesClient.CoreV1().Pods(podNs).List(context.TODO(), metav1.ListOptions{ + podList, err := a.kubernetesClient.CoreV1().Pods(podNs).List(r.Context(), metav1.ListOptions{ LabelSelector: labels.Set(selector).AsSelector().String(), }) if err != nil { diff --git a/pkg/controller/httpTriggerApi.go b/pkg/controller/httpTriggerApi.go index 0a3174b4..e8e380f0 100644 --- a/pkg/controller/httpTriggerApi.go +++ b/pkg/controller/httpTriggerApi.go @@ -107,7 +107,7 @@ func (a *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceAll } - triggers, err := a.fissionClient.CoreV1().HTTPTriggers(ns).List(context.TODO(), metav1.ListOptions{}) + triggers, err := a.fissionClient.CoreV1().HTTPTriggers(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -123,8 +123,8 @@ func (a *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) { } // checkHTTPTriggerDuplicates checks whether the tuple (Method, Host, URL) is duplicate or not. -func (a *API) checkHTTPTriggerDuplicates(t *fv1.HTTPTrigger) error { - triggers, err := a.fissionClient.CoreV1().HTTPTriggers(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{}) +func (a *API) checkHTTPTriggerDuplicates(ctx context.Context, t *fv1.HTTPTrigger) error { + triggers, err := a.fissionClient.CoreV1().HTTPTriggers(metav1.NamespaceAll).List(ctx, metav1.ListOptions{}) if err != nil { return err } @@ -172,20 +172,20 @@ func (a *API) HTTPTriggerApiCreate(w http.ResponseWriter, r *http.Request) { } // Ensure we don't have a duplicate HTTP route defined (same URL and method) - err = a.checkHTTPTriggerDuplicates(&t) + err = a.checkHTTPTriggerDuplicates(r.Context(), &t) if err != nil { a.respondWithError(w, err) return } // check if namespace exists, if not create it. - err = a.createNsIfNotExists(t.ObjectMeta.Namespace) + err = a.createNsIfNotExists(r.Context(), t.ObjectMeta.Namespace) if err != nil { a.respondWithError(w, err) return } - tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Create(context.TODO(), &t, metav1.CreateOptions{}) + tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Create(r.Context(), &t, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -209,7 +209,7 @@ func (a *API) HTTPTriggerApiGet(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - t, err := a.fissionClient.CoreV1().HTTPTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{}) + t, err := a.fissionClient.CoreV1().HTTPTriggers(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -247,13 +247,13 @@ func (a *API) HTTPTriggerApiUpdate(w http.ResponseWriter, r *http.Request) { return } - err = a.checkHTTPTriggerDuplicates(&t) + err = a.checkHTTPTriggerDuplicates(r.Context(), &t) if err != nil { a.respondWithError(w, err) return } - tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Update(context.TODO(), &t, metav1.UpdateOptions{}) + tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Update(r.Context(), &t, metav1.UpdateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -275,7 +275,7 @@ func (a *API) HTTPTriggerApiDelete(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().HTTPTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().HTTPTriggers(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/pkg/controller/mqTriggerApi.go b/pkg/controller/mqTriggerApi.go index 80ebcf92..41202a0e 100644 --- a/pkg/controller/mqTriggerApi.go +++ b/pkg/controller/mqTriggerApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "encoding/json" "io/ioutil" "net/http" @@ -106,7 +105,7 @@ func (a *API) MessageQueueTriggerApiList(w http.ResponseWriter, r *http.Request) ns = metav1.NamespaceAll } - triggers, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).List(context.TODO(), metav1.ListOptions{}) + triggers, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -134,13 +133,13 @@ func (a *API) MessageQueueTriggerApiCreate(w http.ResponseWriter, r *http.Reques } // check if namespace exists, if not create it. - err = a.createNsIfNotExists(mqTrigger.ObjectMeta.Namespace) + err = a.createNsIfNotExists(r.Context(), mqTrigger.ObjectMeta.Namespace) if err != nil { a.respondWithError(w, err) return } - tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Create(context.TODO(), &mqTrigger, metav1.CreateOptions{}) + tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Create(r.Context(), &mqTrigger, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -163,7 +162,7 @@ func (a *API) MessageQueueTriggerApiGet(w http.ResponseWriter, r *http.Request) ns = metav1.NamespaceDefault } - mqTrigger, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{}) + mqTrigger, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -199,7 +198,7 @@ func (a *API) MessageQueueTriggerApiUpdate(w http.ResponseWriter, r *http.Reques return } - tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Update(context.TODO(), &mqTrigger, metav1.UpdateOptions{}) + tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Update(r.Context(), &mqTrigger, metav1.UpdateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -221,7 +220,7 @@ func (a *API) MessageQueueTriggerApiDelete(w http.ResponseWriter, r *http.Reques ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/pkg/controller/packageApi.go b/pkg/controller/packageApi.go index d2edaef7..611e041c 100644 --- a/pkg/controller/packageApi.go +++ b/pkg/controller/packageApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "encoding/json" "fmt" "io/ioutil" @@ -106,7 +105,7 @@ func (a *API) PackageApiList(w http.ResponseWriter, r *http.Request) { if len(ns) == 0 { ns = metav1.NamespaceAll } - funcs, err := a.fissionClient.CoreV1().Packages(ns).List(context.TODO(), metav1.ListOptions{}) + funcs, err := a.fissionClient.CoreV1().Packages(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -150,13 +149,13 @@ func (a *API) PackageApiCreate(w http.ResponseWriter, r *http.Request) { } // check if namespace exists, if not create it. - err = a.createNsIfNotExists(f.ObjectMeta.Namespace) + err = a.createNsIfNotExists(r.Context(), f.ObjectMeta.Namespace) if err != nil { a.respondWithError(w, err) return } - fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Create(context.TODO(), &f, metav1.CreateOptions{}) + fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Create(r.Context(), &f, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -181,7 +180,7 @@ func (a *API) PackageApiGet(w http.ResponseWriter, r *http.Request) { } raw := r.FormValue("raw") // just the deployment pkg - f, err := a.fissionClient.CoreV1().Packages(ns).Get(context.TODO(), name, metav1.GetOptions{}) + f, err := a.fissionClient.CoreV1().Packages(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -223,7 +222,7 @@ func (a *API) PackageApiUpdate(w http.ResponseWriter, r *http.Request) { return } - fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Update(context.TODO(), &f, metav1.UpdateOptions{}) + fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Update(r.Context(), &f, metav1.UpdateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -245,7 +244,7 @@ func (a *API) PackageApiDelete(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().Packages(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().Packages(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/pkg/controller/secretApi.go b/pkg/controller/secretApi.go index 595ae2c9..5c0b2a58 100644 --- a/pkg/controller/secretApi.go +++ b/pkg/controller/secretApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "net/http" "github.com/gorilla/mux" @@ -33,7 +32,7 @@ func (a *API) SecretExists(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - _, err := a.kubernetesClient.CoreV1().Secrets(ns).Get(context.TODO(), name, metav1.GetOptions{}) + _, err := a.kubernetesClient.CoreV1().Secrets(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.logger.Error("error getting secret", zap.Error(err), diff --git a/pkg/controller/timeTriggerApi.go b/pkg/controller/timeTriggerApi.go index 37638031..d5ea479b 100644 --- a/pkg/controller/timeTriggerApi.go +++ b/pkg/controller/timeTriggerApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "encoding/json" "io/ioutil" "net/http" @@ -106,7 +105,7 @@ func (a *API) TimeTriggerApiList(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceAll } - triggers, err := a.fissionClient.CoreV1().TimeTriggers(ns).List(context.TODO(), metav1.ListOptions{}) + triggers, err := a.fissionClient.CoreV1().TimeTriggers(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -144,13 +143,13 @@ func (a *API) TimeTriggerApiCreate(w http.ResponseWriter, r *http.Request) { } // check if namespace exists, if not create it. - err = a.createNsIfNotExists(t.ObjectMeta.Namespace) + err = a.createNsIfNotExists(r.Context(), t.ObjectMeta.Namespace) if err != nil { a.respondWithError(w, err) return } - tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Create(context.TODO(), &t, metav1.CreateOptions{}) + tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Create(r.Context(), &t, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -174,7 +173,7 @@ func (a *API) TimeTriggerApiGet(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - t, err := a.fissionClient.CoreV1().TimeTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{}) + t, err := a.fissionClient.CoreV1().TimeTriggers(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -219,7 +218,7 @@ func (a *API) TimeTriggerApiUpdate(w http.ResponseWriter, r *http.Request) { return } - tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Update(context.TODO(), &t, metav1.UpdateOptions{}) + tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Update(r.Context(), &t, metav1.UpdateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -241,7 +240,7 @@ func (a *API) TimeTriggerApiDelete(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().TimeTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().TimeTriggers(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return diff --git a/pkg/controller/watchApi.go b/pkg/controller/watchApi.go index 2dedbc4c..1fab10ab 100644 --- a/pkg/controller/watchApi.go +++ b/pkg/controller/watchApi.go @@ -17,7 +17,6 @@ limitations under the License. package controller import ( - "context" "encoding/json" "io/ioutil" "net/http" @@ -105,7 +104,7 @@ func (a *API) WatchApiList(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceAll } - watches, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).List(context.TODO(), metav1.ListOptions{}) + watches, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).List(r.Context(), metav1.ListOptions{}) if err != nil { a.respondWithError(w, err) return @@ -137,13 +136,13 @@ func (a *API) WatchApiCreate(w http.ResponseWriter, r *http.Request) { // TODO check for duplicate watches // TODO check for duplicate watches -> we probably wont need it? // check if namespace exists, if not create it. - err = a.createNsIfNotExists(watch.ObjectMeta.Namespace) + err = a.createNsIfNotExists(r.Context(), watch.ObjectMeta.Namespace) if err != nil { a.respondWithError(w, err) return } - wnew, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(watch.ObjectMeta.Namespace).Create(context.TODO(), &watch, metav1.CreateOptions{}) + wnew, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(watch.ObjectMeta.Namespace).Create(r.Context(), &watch, metav1.CreateOptions{}) if err != nil { a.respondWithError(w, err) return @@ -167,7 +166,7 @@ func (a *API) WatchApiGet(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - watch, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{}) + watch, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Get(r.Context(), name, metav1.GetOptions{}) if err != nil { a.respondWithError(w, err) return @@ -195,7 +194,7 @@ func (a *API) WatchApiDelete(w http.ResponseWriter, r *http.Request) { ns = metav1.NamespaceDefault } - err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{}) + err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Delete(r.Context(), name, metav1.DeleteOptions{}) if err != nil { a.respondWithError(w, err) return