knative
/
client
mirror of https://github.com/knative/client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace aliase `clientservingv1alpha` into `clientservingv1` (#755) 

* The `clientservingv1alpha` has been deprecated.
This commit is contained in:
Lv Jiawei 2020-03-24 15:07:09 +08:00 committed by GitHub
parent a0a762b87e
commit 3edb032f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kn/commands/revision/list.go
View File

@ -27,7 +27,7 @@ import (
"knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/kn/commands"
"knative.dev/client/pkg/kn/commands/flags" "knative.dev/client/pkg/kn/commands/flags"
clientservingv1alpha "knative.dev/client/pkg/serving/v1" clientservingv1 "knative.dev/client/pkg/serving/v1"
) )
// Service name filter, used with "-s" // Service name filter, used with "-s"
@ -64,7 +64,7 @@ func NewRevisionListCommand(p *commands.KnParams) *cobra.Command {
} }
// Create list filters // Create list filters
var params []clientservingv1alpha.ListConfig var params []clientservingv1.ListConfig
params, err = appendServiceFilter(params, client, cmd) params, err = appendServiceFilter(params, client, cmd)
if err != nil { if err != nil {
return err return err
@ -119,7 +119,7 @@ func NewRevisionListCommand(p *commands.KnParams) *cobra.Command {
} }
// If a service option is given append a filter to the list of filters // If a service option is given append a filter to the list of filters
func appendServiceFilter(lConfig []clientservingv1alpha.ListConfig, client clientservingv1alpha.KnServingClient, cmd *cobra.Command) ([]clientservingv1alpha.ListConfig, error) { func appendServiceFilter(lConfig []clientservingv1.ListConfig, client clientservingv1.KnServingClient, cmd *cobra.Command) ([]clientservingv1.ListConfig, error) {
if !cmd.Flags().Changed("service") { if !cmd.Flags().Changed("service") {
return lConfig, nil return lConfig, nil
} }
@ -131,11 +131,11 @@ func appendServiceFilter(lConfig []clientservingv1alpha.ListConfig, client clien
if err != nil { if err != nil {
return nil, err return nil, err
} }
return append(lConfig, clientservingv1alpha.WithService(serviceName)), nil return append(lConfig, clientservingv1.WithService(serviceName)), nil
} }
// If an additional name is given append this as a revision name filter to the given list // If an additional name is given append this as a revision name filter to the given list
func appendRevisionNameFilter(lConfigs []clientservingv1alpha.ListConfig, client clientservingv1alpha.KnServingClient, args []string) ([]clientservingv1alpha.ListConfig, error) { func appendRevisionNameFilter(lConfigs []clientservingv1.ListConfig, client clientservingv1.KnServingClient, args []string) ([]clientservingv1.ListConfig, error) {
switch len(args) { switch len(args) {
case 0: case 0:
@ -143,7 +143,7 @@ func appendRevisionNameFilter(lConfigs []clientservingv1alpha.ListConfig, client
return lConfigs, nil return lConfigs, nil
case 1: case 1:
// Exactly one name given // Exactly one name given
return append(lConfigs, clientservingv1alpha.WithName(args[0])), nil return append(lConfigs, clientservingv1.WithName(args[0])), nil
default: default:
return nil, fmt.Errorf("'kn revision list' accepts maximum 1 argument, not %d arguments as given", len(args)) return nil, fmt.Errorf("'kn revision list' accepts maximum 1 argument, not %d arguments as given", len(args))
} }
@ -195,7 +195,7 @@ func revisionListSortFunc(revisionList *servingv1.RevisionList) func(i int, j in
} }
// Service factory function for a namespace // Service factory function for a namespace
type serviceFactoryFunc func(namespace string) (clientservingv1alpha.KnServingClient, error) type serviceFactoryFunc func(namespace string) (clientservingv1.KnServingClient, error)
// A function which looks up a service by name // A function which looks up a service by name
type serviceGetFunc func(namespace, serviceName string) (*servingv1.Service, error) type serviceGetFunc func(namespace, serviceName string) (*servingv1.Service, error)
@ -231,7 +231,7 @@ func serviceLookup(serviceFactory serviceFactoryFunc) serviceGetFunc {
// Two caches: For service & clients (clients might not be necessary though) // Two caches: For service & clients (clients might not be necessary though)
serviceCache := make(map[string]*servingv1.Service) serviceCache := make(map[string]*servingv1.Service)
clientCache := make(map[string]clientservingv1alpha.KnServingClient) clientCache := make(map[string]clientservingv1.KnServingClient)
return func(namespace, serviceName string) (*servingv1.Service, error) { return func(namespace, serviceName string) (*servingv1.Service, error) {
if service, exists := serviceCache[serviceName]; exists { if service, exists := serviceCache[serviceName]; exists {