Skip to content
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.

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

chore: update all references to kn-plugin-func #1311

Merged
merged 3 commits into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .chglog/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ style: github
template: CHANGELOG.tpl.md
info:
title: CHANGELOG
repository_url: https://github.com/knative-sandbox/kn-plugin-func
repository_url: https://github.com/knative/func
options:
commits:
filters:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-embedded-fs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
run: |
if ! go test -run "^\QTestFileSystems\E$/^\Qembedded\E$"; then
echo "Content of templates directory and embedded FS (zz_filesystem_generated.go) doesn't match!"
echo "Consult https://github.com/knative-sandbox/kn-plugin-func/blob/main/docs/CONTRIBUTING.md#templates ."
echo "Consult https://github.com/knative/func/blob/main/docs/CONTRIBUTING.md#templates ."
exit 1
fi
2 changes: 1 addition & 1 deletion .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
defaultBaseImage: gcr.io/distroless/static:nonroot
baseImageOverrides:
knative.dev/kn-plugin-func/cmd/func: docker.io/library/alpine:latest
knative.dev/func/cmd/func: docker.io/library/alpine:latest
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Func

[![CI Status](https://github.com/knative-sandbox/kn-plugin-func/actions/workflows/ci.yaml/badge.svg)](https://github.com/knative-sandbox/kn-plugin-func/actions/workflows/ci.yaml)
[![Client API Documentation](https://pkg.go.dev/badge/knative.dev/kn-plugin-func?utm_source=godoc)](https://pkg.go.dev/knative.dev/kn-plugin-func)
[![Issues](https://img.shields.io/github/issues/knative-sandbox/kn-plugin-func.svg)](https://github.com/knative-sandbox/kn-plugin-func/issues)
[![License](https://img.shields.io/github/license/knative-sandbox/kn-plugin-func)](https://github.com/knative-sandbox/kn-plugin-func/blob/main/LICENSE)
[![Releases](https://img.shields.io/github/v/release/knative-sandbox/kn-plugin-func.svg?label=Release)](https://github.com/knative-sandbox/kn-plugin-func/releases)
[![codecov](https://codecov.io/gh/knative-sandbox/kn-plugin-func/branch/main/graph/badge.svg)](https://codecov.io/gh/knative-sandbox/kn-plugin-func)
[![CI Status](https://github.com/knative/func/actions/workflows/ci.yaml/badge.svg)](https://github.com/knative/func/actions/workflows/ci.yaml)
[![Client API Documentation](https://pkg.go.dev/badge/knative.dev/func?utm_source=godoc)](https://pkg.go.dev/knative.dev/func)
[![Issues](https://img.shields.io/github/issues/knative/func.svg)](https://github.com/knative/func/issues)
[![License](https://img.shields.io/github/license/knative/func)](https://github.com/knative/func/blob/main/LICENSE)
[![Releases](https://img.shields.io/github/v/release/knative/func.svg?label=Release)](https://github.com/knative/func/releases)
[![codecov](https://codecov.io/gh/knative/func/branch/main/graph/badge.svg)](https://codecov.io/gh/knative/func)

`func` is a Client Library and CLI enabling the development and deployment of Functions.

Expand Down
2 changes: 1 addition & 1 deletion builders/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

fn "knative.dev/kn-plugin-func"
fn "knative.dev/func"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions builders/builders_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"testing"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/builders"
fn "knative.dev/func"
"knative.dev/func/builders"
)

// TestImage_Named ensures that a builder image is returned when
Expand Down
6 changes: 3 additions & 3 deletions buildpacks/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/docker/docker/client"
"github.com/heroku/color"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/builders"
"knative.dev/kn-plugin-func/docker"
fn "knative.dev/func"
"knative.dev/func/builders"
"knative.dev/func/docker"
)

// DefaultName when no WithName option is provided to NewBuilder
Expand Down
4 changes: 2 additions & 2 deletions buildpacks/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

pack "github.com/buildpacks/pack/pkg/client"
fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/builders"
fn "knative.dev/func"
"knative.dev/func/builders"
)

// Test_BuilderImageDefault ensures that a Function bing built which does not
Expand Down
2 changes: 1 addition & 1 deletion client.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"runtime/debug"
"time"

"knative.dev/kn-plugin-func/config"
"knative.dev/func/config"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions client_int_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"testing"
"time"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/buildpacks"
"knative.dev/kn-plugin-func/docker"
"knative.dev/kn-plugin-func/knative"
. "knative.dev/kn-plugin-func/testing"
fn "knative.dev/func"
"knative.dev/func/buildpacks"
"knative.dev/func/docker"
"knative.dev/func/knative"
. "knative.dev/func/testing"
)

/*
Expand Down
8 changes: 4 additions & 4 deletions client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"time"

cloudevents "github.com/cloudevents/sdk-go/v2"
fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/builders"
"knative.dev/kn-plugin-func/mock"
. "knative.dev/kn-plugin-func/testing"
fn "knative.dev/func"
"knative.dev/func/builders"
"knative.dev/func/mock"
. "knative.dev/func/testing"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions cmd/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"github.com/ory/viper"
"github.com/spf13/cobra"

"knative.dev/kn-plugin-func/buildpacks"
"knative.dev/kn-plugin-func/config"
"knative.dev/kn-plugin-func/s2i"
"knative.dev/func/buildpacks"
"knative.dev/func/config"
"knative.dev/func/s2i"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/builders"
fn "knative.dev/func"
"knative.dev/func/builders"
)

func NewBuildCmd(newClient ClientFactory) *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"gotest.tools/v3/assert"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/mock"
fn "knative.dev/func"
"knative.dev/func/mock"
)

// TestBuild_ImageFlag ensures that the image flag is used when specified.
Expand Down
18 changes: 9 additions & 9 deletions cmd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (
"net/http"
"os"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/buildpacks"
"knative.dev/kn-plugin-func/docker"
"knative.dev/kn-plugin-func/docker/creds"
fnhttp "knative.dev/kn-plugin-func/http"
"knative.dev/kn-plugin-func/knative"
"knative.dev/kn-plugin-func/openshift"
"knative.dev/kn-plugin-func/pipelines/tekton"
"knative.dev/kn-plugin-func/progress"
fn "knative.dev/func"
"knative.dev/func/buildpacks"
"knative.dev/func/docker"
"knative.dev/func/docker/creds"
fnhttp "knative.dev/func/http"
"knative.dev/func/knative"
"knative.dev/func/openshift"
"knative.dev/func/pipelines/tekton"
"knative.dev/func/progress"
)

// ClientConfig settings for use with NewClient
Expand Down
4 changes: 2 additions & 2 deletions cmd/completion_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/knative"
fn "knative.dev/func"
"knative.dev/func/knative"
)

func CompleteFunctionList(cmd *cobra.Command, args []string, toComplete string) (strings []string, directive cobra.ShellCompDirective) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/ory/viper"
"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
fn "knative.dev/func"
)

type functionLoader interface {
Expand Down
6 changes: 3 additions & 3 deletions cmd/config_envs.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/ory/viper"
"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/k8s"
"knative.dev/kn-plugin-func/utils"
fn "knative.dev/func"
"knative.dev/func/k8s"
"knative.dev/func/utils"
)

func NewConfigEnvsCmd(loadSaver functionLoaderSaver) *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/config_labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/utils"
fn "knative.dev/func"
"knative.dev/func/utils"
)

func NewConfigLabelsCmd(loaderSaver functionLoaderSaver) *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/config_labels_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/Netflix/go-expect"
"github.com/hinshun/vt10x"
"github.com/spf13/cobra"
fn "knative.dev/kn-plugin-func"
fn "knative.dev/func"
)

type mockFunctionLoaderSaver struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"

"github.com/ory/viper"
fn "knative.dev/kn-plugin-func"
fnCmd "knative.dev/kn-plugin-func/cmd"
fn "knative.dev/func"
fnCmd "knative.dev/func/cmd"
)

func TestListEnvs(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/config_volumes.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/AlecAivazis/survey/v2/terminal"
"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/k8s"
fn "knative.dev/func"
"knative.dev/func/k8s"
)

func NewConfigVolumesCmd() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/ory/viper"
"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/config"
"knative.dev/kn-plugin-func/utils"
fn "knative.dev/func"
"knative.dev/func/config"
"knative.dev/func/utils"
)

// ErrNoRuntime indicates that the language runtime flag was not passed.
Expand Down
2 changes: 1 addition & 1 deletion cmd/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path/filepath"
"testing"

"knative.dev/kn-plugin-func/utils"
"knative.dev/func/utils"
)

// TestCreate_Execute ensures that an invocation of create with minimal settings
Expand Down
4 changes: 2 additions & 2 deletions cmd/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/ory/viper"
"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/config"
fn "knative.dev/func"
"knative.dev/func/config"
)

func NewDeleteCmd(newClient ClientFactory) *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/delete_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"testing"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/mock"
fn "knative.dev/func"
"knative.dev/func/mock"
)

// TestDelete_ByName ensures that running delete specifying the name of the
Expand Down
20 changes: 10 additions & 10 deletions cmd/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import (
"github.com/spf13/cobra"
"knative.dev/client/pkg/util"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/builders"
"knative.dev/kn-plugin-func/buildpacks"
"knative.dev/kn-plugin-func/config"
"knative.dev/kn-plugin-func/docker"
"knative.dev/kn-plugin-func/docker/creds"
"knative.dev/kn-plugin-func/k8s"
"knative.dev/kn-plugin-func/s2i"
fn "knative.dev/func"
"knative.dev/func/builders"
"knative.dev/func/buildpacks"
"knative.dev/func/config"
"knative.dev/func/docker"
"knative.dev/func/docker/creds"
"knative.dev/func/k8s"
"knative.dev/func/s2i"
)

func NewDeployCmd(newClient ClientFactory) *cobra.Command {
Expand All @@ -42,7 +42,7 @@ SYNOPSIS
[--platform] [-c|--confirm] [-v|--verbose]

DESCRIPTION

Deploys a function to the currently configured Knative-enabled cluster.

By default the function in the current working directory is deployed, or at
Expand All @@ -56,7 +56,7 @@ DESCRIPTION
determine the final built image tag for the function. This final image name
can be provided explicitly using --image, in which case it is used in place
of --registry.

To run deploy using an interactive mode, use the --confirm (-c) option.
This mode is useful for the first deployment in particular, since subsdequent
deployments remember most of the settings provided.
Expand Down
6 changes: 3 additions & 3 deletions cmd/deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

"github.com/ory/viper"
"github.com/spf13/cobra"
fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/builders"
"knative.dev/kn-plugin-func/mock"
fn "knative.dev/func"
"knative.dev/func/builders"
"knative.dev/func/mock"
)

const TestRegistry = "example.com/alice"
Expand Down
4 changes: 2 additions & 2 deletions cmd/func/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"os/signal"
"syscall"

"knative.dev/kn-plugin-func/cmd"
"knative.dev/kn-plugin-func/docker"
"knative.dev/func/cmd"
"knative.dev/func/docker"
)

// Statically-populated build metadata set by `make build`.
Expand Down
2 changes: 1 addition & 1 deletion cmd/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"

fn "knative.dev/kn-plugin-func"
fn "knative.dev/func"
)

func NewInfoCmd(newClient ClientFactory) *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/invoke.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/ory/viper"
"github.com/spf13/cobra"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/config"
"knative.dev/kn-plugin-func/utils"
fn "knative.dev/func"
"knative.dev/func/config"
"knative.dev/func/utils"
)

func NewInvokeCmd(newClient ClientFactory) *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/invoke_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"sync/atomic"
"testing"

fn "knative.dev/kn-plugin-func"
"knative.dev/kn-plugin-func/mock"
fn "knative.dev/func"
"knative.dev/func/mock"
)

// TestInvoke command executes the invocation path.
Expand Down
Loading