Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Capture context from cobra CLI and pass forward (#2551)

Browse Source 
Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2022-09-22 13:54:05 +05:30
committed by GitHub
parent d03395949b
commit e87c84ee2c
33 changed files with 93 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cliwrapper/cli/cli.go
+3
View File
@@ -17,11 +17,14 @@ limitations under the License.
package cli
import (
"context"
"time"
)
type (
Input interface {
Context() context.Context
//Parse(input interface{}) error
// IsSet checks whether a flag has been set by the user
pkg/fission-cli/cliwrapper/driver/cobra/cobra.go
+5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package cobra
import (
"context"
"fmt"
"strings"
"time"
@@ -217,6 +218,10 @@ func WrapperChain(actions ...cmd.CommandAction) func(*cobra.Command, []string) e
}
}
func (u Cli) Context() context.Context {
return u.c.Context()
}
func (u Cli) IsSet(key string) bool {
return u.c.Flags().Changed(key)
}
pkg/fission-cli/cliwrapper/driver/dummy/dummy.go
+5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package dummy
import (
"context"
"time"
fCli "github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
@@ -33,6 +34,10 @@ func TestFlagSet() Cli {
return Cli{c: make(map[string]interface{})}
}
func (u Cli) Context() context.Context {
return context.TODO()
}
// Set allows to set any kinds of value with given key.
// The type of set value should be matched with the returned
// type of GetXXX function.
pkg/fission-cli/cmd/archive/delete.go
+2 -3
View File
@@ -17,7 +17,6 @@ limitations under the License.
package archive
import (
"context"
"fmt"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
@@ -40,14 +39,14 @@ func (opts *DeleteSubCommand) do(input cli.Input) error {
kubeContext := input.String(flagkey.KubeContext)
archiveID := input.String(flagkey.ArchiveID)
storagesvcURL, err := util.GetStorageURL(kubeContext)
storagesvcURL, err := util.GetStorageURL(input.Context(), kubeContext)
if err != nil {
return err
}
client := storagesvcClient.MakeClient(storagesvcURL.String())
err = client.Delete(context.Background(), archiveID)
err = client.Delete(input.Context(), archiveID)
if err != nil {
return err
}
pkg/fission-cli/cmd/archive/download.go
+2 -3
View File
@@ -17,7 +17,6 @@ limitations under the License.
package archive
import (
"context"
"fmt"
"strings"
@@ -46,13 +45,13 @@ func (opts *DownloadSubCommand) do(input cli.Input) error {
archiveOutput = strings.TrimPrefix(archiveID, "/fission/fission-functions/")
}
storageAccessURL, err := util.GetStorageURL(kubeContext)
storageAccessURL, err := util.GetStorageURL(input.Context(), kubeContext)
if err != nil {
return err
}
client := storagesvcClient.MakeClient(storageAccessURL.String())
err = client.Download(context.Background(), archiveID, archiveOutput)
err = client.Download(input.Context(), archiveID, archiveOutput)
if err != nil {
return err
}
pkg/fission-cli/cmd/archive/geturl.go
+2 -2
View File
@@ -41,7 +41,7 @@ func (opts *GetURLSubCommand) do(input cli.Input) error {
kubeContext := input.String(flagkey.KubeContext)
archiveID := input.String(flagkey.ArchiveID)
serverURL, err := util.GetStorageURL(kubeContext)
serverURL, err := util.GetStorageURL(input.Context(), kubeContext)
if err != nil {
return err
}
@@ -61,7 +61,7 @@ func (opts *GetURLSubCommand) do(input cli.Input) error {
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("Error getting URL. Exited with Status: %s", resp.Status)
return fmt.Errorf("error getting URL. Exited with Status: %s", resp.Status)
}
storageType := resp.Header.Get("X-FISSION-STORAGETYPE")
pkg/fission-cli/cmd/archive/list.go
+2 -3
View File
@@ -17,7 +17,6 @@ limitations under the License.
package archive
import (
"context"
"fmt"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
@@ -39,13 +38,13 @@ func (opts *ListSubCommand) do(input cli.Input) error {
kubeContext := input.String(flagkey.KubeContext)
storageAccessURL, err := util.GetStorageURL(kubeContext)
storageAccessURL, err := util.GetStorageURL(input.Context(), kubeContext)
if err != nil {
return err
}
client := storagesvcClient.MakeClient(storageAccessURL.String())
files, err := client.List(context.Background())
files, err := client.List(input.Context())
if err != nil {
return err
}
pkg/fission-cli/cmd/archive/upload.go
+2 -3
View File
@@ -17,7 +17,6 @@ limitations under the License.
package archive
import (
"context"
"fmt"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
@@ -40,13 +39,13 @@ func (opts *UploadSubCommand) do(input cli.Input) error {
kubeContext := input.String(flagkey.KubeContext)
archiveName := input.String(flagkey.ArchiveName)
storagesvcURL, err := util.GetStorageURL(kubeContext)
storagesvcURL, err := util.GetStorageURL(input.Context(), kubeContext)
if err != nil {
return err
}
client := storagesvcClient.MakeClient(storagesvcURL.String())
archiveID, err := client.Upload(context.Background(), archiveName, nil)
archiveID, err := client.Upload(input.Context(), archiveName, nil)
if err != nil {
return err
}
pkg/fission-cli/cmd/function/log.go
+2 -2
View File
@@ -59,7 +59,7 @@ func (opts *LogSubCommand) do(input cli.Input) error {
return errors.Wrap(err, "error getting function")
}
server, err := util.GetApplicationUrl("application=fission-api", kubeContext)
server, err := util.GetApplicationUrl(input.Context(), "application=fission-api", kubeContext)
if err != nil {
return err
}
@@ -72,7 +72,7 @@ func (opts *LogSubCommand) do(input cli.Input) error {
requestChan := make(chan struct{})
responseChan := make(chan struct{})
ctx := context.Background()
ctx := input.Context()
go func(ctx context.Context, requestChan, responseChan chan struct{}) {
t := time.Unix(0, 0*int64(time.Millisecond))
pkg/fission-cli/cmd/function/test.go
+3 -3
View File
@@ -62,7 +62,7 @@ func (opts *TestSubCommand) do(input cli.Input) error {
}
// Portforward to the fission router
localRouterPort, err := util.SetupPortForward(util.GetFissionNamespace(), "application=fission-router", kubeContext)
localRouterPort, err := util.SetupPortForward(input.Context(), util.GetFissionNamespace(), "application=fission-router", kubeContext)
if err != nil {
return err
}
@@ -107,10 +107,10 @@ func (opts *TestSubCommand) do(input cli.Input) error {
testTimeout := input.Duration(flagkey.FnTestTimeout)
if testTimeout <= 0*time.Second {
ctx = context.Background()
ctx = input.Context()
} else {
var closeCtx context.CancelFunc
ctx, closeCtx = context.WithTimeout(context.Background(), input.Duration(flagkey.FnTestTimeout))
ctx, closeCtx = context.WithTimeout(input.Context(), input.Duration(flagkey.FnTestTimeout))
defer closeCtx()
}
pkg/fission-cli/cmd/package/package.go
+2 -4
View File
@@ -17,7 +17,6 @@ limitations under the License.
package _package
import (
"context"
"fmt"
"net/http"
"os"
@@ -128,7 +127,7 @@ func CreateArchive(client client.Interface, input cli.Input, includeFiles []stri
return nil, err
}
file := filepath.Join(tmpDir, id.String())
err = utils.DownloadUrl(context.Background(), http.DefaultClient, fileURL, file)
err = utils.DownloadUrl(input.Context(), http.DefaultClient, fileURL, file)
if err != nil {
return nil, errors.Wrap(err, "error downloading file from the given URL")
}
@@ -193,8 +192,7 @@ func CreateArchive(client client.Interface, input cli.Input, includeFiles []stri
return nil, err
}
ctx := context.Background()
return pkgutil.UploadArchiveFile(ctx, client, archivePath)
return pkgutil.UploadArchiveFile(input.Context(), client, archivePath)
}
// makeArchiveFile creates a zip file from the given list of input files,
pkg/fission-cli/cmd/spec/apply.go
+5 -6
View File
@@ -130,7 +130,7 @@ func (opts *ApplySubCommand) run(input cli.Input) error {
}
// make changes to the cluster based on the specs
pkgMetas, as, err := applyResources(opts.Client(), specDir, fr, deleteResources, input.Bool(flagkey.SpecAllowConflicts))
pkgMetas, as, err := applyResources(input.Context(), opts.Client(), specDir, fr, deleteResources, input.Bool(flagkey.SpecAllowConflicts))
if err != nil {
return errors.Wrap(err, "error applying specs")
}
@@ -141,7 +141,7 @@ func (opts *ApplySubCommand) run(input cli.Input) error {
pbw.addPackages(pkgMetas)
}
ctx, pkgWatchCancel := context.WithCancel(context.Background())
ctx, pkgWatchCancel := context.WithCancel(input.Context())
if watchResources {
// if we're watching for files, we don't need to wait for builds to complete
@@ -283,7 +283,7 @@ func pluralize(num int, word string) string {
}
// applyArchives figures out the set of archives that need to be uploaded, and uploads them.
func applyArchives(fclient client.Interface, specDir string, fr *FissionResources) error {
func applyArchives(ctx context.Context, fclient client.Interface, specDir string, fr *FissionResources) error {
// archive:// URL -> archive map.
archiveFiles := make(map[string]fv1.Archive)
@@ -329,7 +329,6 @@ func applyArchives(fclient client.Interface, specDir string, fr *FissionResource
// doesn't exist, upload
fmt.Printf("uploading archive %v\n", name)
// ar.URL is actually a local filename at this stage
ctx := context.Background()
uploadedAr, err := pkgutil.UploadArchiveFile(ctx, fclient, ar.URL)
if err != nil {
return err
@@ -357,12 +356,12 @@ func applyArchives(fclient client.Interface, specDir string, fr *FissionResource
}
// applyResources applies the given set of fission resources.
func applyResources(fclient client.Interface, specDir string, fr *FissionResources, delete bool, specAllowConflicts bool) (map[string]metav1.ObjectMeta, map[string]ResourceApplyStatus, error) {
func applyResources(ctx context.Context, fclient client.Interface, specDir string, fr *FissionResources, delete bool, specAllowConflicts bool) (map[string]metav1.ObjectMeta, map[string]ResourceApplyStatus, error) {
applyStatus := make(map[string]ResourceApplyStatus)
// upload archives that need to be uploaded. Changes archive references in fr.Packages.
err := applyArchives(fclient, specDir, fr)
err := applyArchives(ctx, fclient, specDir, fr)
if err != nil {
return nil, nil, err
}
pkg/fission-cli/cmd/support/dump.go
+1 -1
View File
@@ -137,7 +137,7 @@ func (opts *DumpSubCommand) do(input cli.Input) error {
wg.Add(1)
go func(res resources.Resource, dir string) {
defer wg.Done()
res.Dump(dir)
res.Dump(input.Context(), dir)
}(res, dir)
}
pkg/fission-cli/cmd/support/resources/crd.go
+2 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package resources
import (
"context"
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -46,7 +47,7 @@ func NewCrdDumper(client client.Interface, crdType string) Resource {
return CrdDumper{client: client, crdType: crdType}
}
func (res CrdDumper) Dump(dumpDir string) {
func (res CrdDumper) Dump(ctx context.Context, dumpDir string) {
switch res.crdType {
case CrdEnvironment:
pkg/fission-cli/cmd/support/resources/fissionversion.go
+2 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package resources
import (
"context"
"fmt"
"path/filepath"
@@ -32,7 +33,7 @@ func NewFissionVersion(client client.Interface) Resource {
return FissionVersion{client: client}
}
func (res FissionVersion) Dump(dumpDir string) {
func (res FissionVersion) Dump(ctx context.Context, dumpDir string) {
ver := util.GetVersion(res.client)
file := filepath.Clean(fmt.Sprintf("%v/%v", dumpDir, "fission-version.txt"))
writeToFile(file, ver)
pkg/fission-cli/cmd/support/resources/kubernetes.go
+11 -11
View File
@@ -50,7 +50,7 @@ func NewKubernetesVersion(clientset kubernetes.Interface) Resource {
return KubernetesVersion{client: clientset}
}
func (res KubernetesVersion) Dump(dumpDir string) {
func (res KubernetesVersion) Dump(ctx context.Context, dumpDir string) {
serverVer, err := res.client.Discovery().ServerVersion()
if err != nil {
console.Error(fmt.Sprintf("Error setting up kubernetes client: %v", err))
@@ -76,10 +76,10 @@ func NewKubernetesObjectDumper(clientset kubernetes.Interface, objType string, s
}
}
func (res KubernetesObjectDumper) Dump(dumpDir string) {
func (res KubernetesObjectDumper) Dump(ctx context.Context, dumpDir string) {
switch res.objType {
case KubernetesService:
objs, err := res.client.CoreV1().Services(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{LabelSelector: res.selector})
objs, err := res.client.CoreV1().Services(metav1.NamespaceAll).List(ctx, metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
console.Error(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
@@ -92,7 +92,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
}
case KubernetesDeployment:
objs, err := res.client.AppsV1().Deployments(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{LabelSelector: res.selector})
objs, err := res.client.AppsV1().Deployments(metav1.NamespaceAll).List(ctx, metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
console.Error(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
@@ -104,7 +104,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
}
case KubernetesPod:
objs, err := res.client.CoreV1().Pods(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{LabelSelector: res.selector})
objs, err := res.client.CoreV1().Pods(metav1.NamespaceAll).List(ctx, metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
console.Error(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
@@ -116,7 +116,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
}
case KubernetesHPA:
objs, err := res.client.AutoscalingV2beta2().HorizontalPodAutoscalers(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{LabelSelector: res.selector})
objs, err := res.client.AutoscalingV2beta2().HorizontalPodAutoscalers(metav1.NamespaceAll).List(ctx, metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
console.Error(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
@@ -128,7 +128,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
}
case KubernetesDaemonSet:
objs, err := res.client.AppsV1().DaemonSets(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{LabelSelector: res.selector})
objs, err := res.client.AppsV1().DaemonSets(metav1.NamespaceAll).List(ctx, metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
console.Error(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
@@ -140,7 +140,7 @@ func (res KubernetesObjectDumper) Dump(dumpDir string) {
}
case KubernetesNode:
objs, err := res.client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{LabelSelector: res.selector})
objs, err := res.client.CoreV1().Nodes().List(ctx, metav1.ListOptions{LabelSelector: res.selector})
if err != nil {
console.Error(fmt.Sprintf("Error getting %v list with selector %v: %v", res.objType, res.selector, err))
return
@@ -195,10 +195,10 @@ func NewKubernetesPodLogDumper(clientset kubernetes.Interface, selector string)
}
}
func (res KubernetesPodLogDumper) Dump(dumpDir string) {
func (res KubernetesPodLogDumper) Dump(ctx context.Context, dumpDir string) {
l, err := res.client.CoreV1().
Pods(metav1.NamespaceAll).
List(context.TODO(), metav1.ListOptions{LabelSelector: res.labelSelector})
List(ctx, metav1.ListOptions{LabelSelector: res.labelSelector})
if err != nil {
console.Error(fmt.Sprintf("Error getting controller list: %v", err))
return
@@ -217,7 +217,7 @@ func (res KubernetesPodLogDumper) Dump(dumpDir string) {
req := res.client.CoreV1().Pods(pod.Namespace).
GetLogs(pod.Name, &corev1.PodLogOptions{Container: container.Name})
stream, err := req.Stream(context.Background())
stream, err := req.Stream(ctx)
if err != nil {
console.Error(fmt.Sprintf("Error streaming logs for pod %v: %v", pod.Name, err))
return
pkg/fission-cli/cmd/support/resources/resource.go
+2 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package resources
import (
"context"
"fmt"
"os"
"path/filepath"
@@ -29,7 +30,7 @@ import (
)
type Resource interface {
Dump(string)
Dump(context.Context, string)
}
func getFileName(dumpdir string, meta metav1.ObjectMeta) string {
pkg/fission-cli/cmd/token/create.go
+1 -1
View File
@@ -66,7 +66,7 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
kubeContext := input.String(flagkey.KubeContext)
// Portforward to the fission router
localRouterPort, err := util.SetupPortForward(util.GetFissionNamespace(), "application=fission-router", kubeContext)
localRouterPort, err := util.SetupPortForward(input.Context(), util.GetFissionNamespace(), "application=fission-router", kubeContext)
if err != nil {
return err
}
pkg/fission-cli/util/portforward.go
+2 -2
View File
@@ -43,7 +43,7 @@ const maxDuration time.Duration = 2000
// is found by looking for a service in the same namespace and using
// its targetPort. Once the port forward is started, wait for it to
// start accepting connections before returning.
func SetupPortForward(namespace, labelSelector string, kubeContext string) (string, error) {
func SetupPortForward(ctx context.Context, namespace, labelSelector string, kubeContext string) (string, error) {
console.Verbose(2, "Setting up port forward to %s in namespace %s",
labelSelector, namespace)
@@ -71,7 +71,7 @@ func SetupPortForward(namespace, labelSelector string, kubeContext string) (stri
console.Verbose(2, "Starting port forward from local port %v", localPort)
readyC, _, err := runPortForward(context.Background(), labelSelector, localPort, namespace, kubeContext)
readyC, _, err := runPortForward(ctx, labelSelector, localPort, namespace, kubeContext)
if err != nil {
fmt.Printf("Error forwarding to port %v: %s", localPort, err.Error())
return "", err
pkg/fission-cli/util/util.go
+6 -5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package util
import (
"context"
"fmt"
"net/url"
"os"
@@ -53,13 +54,13 @@ func GetFissionNamespace() string {
return fissionNamespace
}
func GetApplicationUrl(selector string, kubeContext string) (string, error) {
func GetApplicationUrl(ctx context.Context, selector string, kubeContext string) (string, error) {
var serverUrl string
// Use FISSION_URL env variable if set; otherwise, port-forward to controller.
fissionUrl := os.Getenv("FISSION_URL")
if len(fissionUrl) == 0 {
fissionNamespace := GetFissionNamespace()
localPort, err := SetupPortForward(fissionNamespace, selector, kubeContext)
localPort, err := SetupPortForward(ctx, fissionNamespace, selector, kubeContext)
if err != nil {
return "", err
}
@@ -213,7 +214,7 @@ func GetServerURL(input cli.Input) (serverUrl string, err error) {
kubeContext := input.String(flagkey.KubeContext)
if len(serverUrl) == 0 {
// starts local portforwarder etc.
serverUrl, err = GetApplicationUrl("application=fission-api", kubeContext)
serverUrl, err = GetApplicationUrl(input.Context(), "application=fission-api", kubeContext)
if err != nil {
return "", err
}
@@ -445,8 +446,8 @@ func ApplyLabelsAndAnnotations(input cli.Input, objectMeta *metav1.ObjectMeta) e
return nil
}
func GetStorageURL(kubeContext string) (*url.URL, error) {
storageLocalPort, err := SetupPortForward(GetFissionNamespace(), "application=fission-storage", kubeContext)
func GetStorageURL(ctx context.Context, kubeContext string) (*url.URL, error) {
storageLocalPort, err := SetupPortForward(ctx, GetFissionNamespace(), "application=fission-storage", kubeContext)
if err != nil {
return nil, err
}