Fixes projectriff#963

Author: markfisher

cmd/commands/function.go

@@ -30,8 +30,8 @@ const (
 )
 
 const (
-	functionBuildFunctionNameIndex = iota
-	functionBuildNumberOfArgs
+	functionUpdateFunctionNameIndex = iota
+	functionUpdateNumberOfArgs
 )
 
 func Function() *cobra.Command {
@@ -123,24 +123,24 @@ func FunctionCreate(fcTool *core.Client, defaults FunctionCreateDefaults) *cobra
 	return command
 }
 
-func FunctionBuild(fcTool *core.Client) *cobra.Command {
+func FunctionUpdate(fcTool *core.Client) *cobra.Command {
 
-	buildFunctionOptions := core.BuildFunctionOptions{}
+	updateFunctionOptions := core.UpdateFunctionOptions{}
 
 	command := &cobra.Command{
-		Use:     "build",
-		Short:   "Trigger a revision build for a function resource",
-		Example: `  ` + env.Cli.Name + ` function build square`,
+		Use:     "update",
+		Short:   "Trigger a build to generate a new revision for a function resource",
+		Example: `  ` + env.Cli.Name + ` function update square`,
 		Args: ArgValidationConjunction(
-			cobra.ExactArgs(functionBuildNumberOfArgs),
-			AtPosition(functionBuildFunctionNameIndex, ValidName()),
+			cobra.ExactArgs(functionUpdateNumberOfArgs),
+			AtPosition(functionUpdateFunctionNameIndex, ValidName()),
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 
-			fnName := args[functionBuildFunctionNameIndex]
+			fnName := args[functionUpdateFunctionNameIndex]
 
-			buildFunctionOptions.Name = fnName
-			err := (*fcTool).BuildFunction(buildFunctionOptions, cmd.OutOrStdout())
+			updateFunctionOptions.Name = fnName
+			err := (*fcTool).UpdateFunction(updateFunctionOptions, cmd.OutOrStdout())
 			if err != nil {
 				return err
 			}
@@ -153,10 +153,10 @@ func FunctionBuild(fcTool *core.Client) *cobra.Command {
 
 	LabelArgs(command, "FUNCTION_NAME")
 
-	command.Flags().StringVarP(&buildFunctionOptions.Namespace, "namespace", "n", "", "the `namespace` of the function")
-	command.Flags().StringVarP(&buildFunctionOptions.LocalPath, "local-path", "l", "", "path to local source to build the image from; only build-pack builds are supported at this time")
-	command.Flags().BoolVarP(&buildFunctionOptions.Verbose, "verbose", "v", false, verboseUsage)
-	command.Flags().BoolVarP(&buildFunctionOptions.Wait, "wait", "w", false, waitUsage)
+	command.Flags().StringVarP(&updateFunctionOptions.Namespace, "namespace", "n", "", "the `namespace` of the function")
+	command.Flags().StringVarP(&updateFunctionOptions.LocalPath, "local-path", "l", "", "path to local source to build the image from; only build-pack builds are supported at this time")
+	command.Flags().BoolVarP(&updateFunctionOptions.Verbose, "verbose", "v", false, verboseUsage)
+	command.Flags().BoolVarP(&updateFunctionOptions.Wait, "wait", "w", false, waitUsage)
 
 	return command
 }

cmd/commands/function_test.go

@@ -241,23 +241,23 @@ status: {}
 ---
 `
 
-var _ = Describe("The riff function build command", func() {
+var _ = Describe("The riff function update command", func() {
 	Context("when given wrong args or flags", func() {
 		var (
 			mockClient core.Client
 			fc         *cobra.Command
 		)
 		BeforeEach(func() {
 			mockClient = nil
-			fc = commands.FunctionBuild(&mockClient)
+			fc = commands.FunctionUpdate(&mockClient)
 		})
 		It("should fail with no args", func() {
 			fc.SetArgs([]string{})
 			err := fc.Execute()
 			Expect(err).To(MatchError("accepts 1 arg(s), received 0"))
 		})
 		It("should fail with invalid function name", func() {
-			//fc = commands.FunctionBuild(&mockClient)
+			//fc = commands.FunctionUpdate(&mockClient)
 			fc.SetArgs([]string{"invålid"})
 			err := fc.Execute()
 			Expect(err).To(MatchError(ContainSubstring("must start and end with an alphanumeric character")))
@@ -274,7 +274,7 @@ var _ = Describe("The riff function build command", func() {
 			client = new(mocks.Client)
 			asMock = client.(*mocks.Client)
 
-			fc = commands.FunctionBuild(&client)
+			fc = commands.FunctionUpdate(&client)
 		})
 		AfterEach(func() {
 			asMock.AssertExpectations(GinkgoT())
@@ -283,19 +283,19 @@ var _ = Describe("The riff function build command", func() {
 		It("should involve the core.Client", func() {
 			fc.SetArgs([]string{"square", "--namespace", "ns"})
 
-			o := core.BuildFunctionOptions{}
+			o := core.UpdateFunctionOptions{}
 			o.Name = "square"
 			o.Namespace = "ns"
 
-			asMock.On("BuildFunction", o, mock.Anything).Return(nil)
+			asMock.On("UpdateFunction", o, mock.Anything).Return(nil)
 			err := fc.Execute()
 			Expect(err).NotTo(HaveOccurred())
 		})
 		It("should propagate core.Client errors", func() {
 			fc.SetArgs([]string{"square", "--namespace", "ns"})
 
 			e := fmt.Errorf("some error")
-			asMock.On("BuildFunction", mock.Anything, mock.Anything).Return(e)
+			asMock.On("UpdateFunction", mock.Anything, mock.Anything).Return(e)
 			err := fc.Execute()
 			Expect(err).To(MatchError(e))
 		})

cmd/commands/wiring.go

@@ -102,7 +102,7 @@ See https://projectriff.io and https://github.com/knative/docs`,
 	installKubeConfigSupport(function, &client, &kc)
 	function.AddCommand(
 		FunctionCreate(&client, FunctionCreateDefaults{LocalBuilder: localBuilder, DefaultRunImage: defaultRunImage}),
-		FunctionBuild(&client),
+		FunctionUpdate(&client),
 	)
 
 	service := Service()

docs/riff_function.md

@@ -17,6 +17,6 @@ Interact with function related resources
 ### SEE ALSO
 
 * [riff](riff.md)	 - Commands for creating and managing function resources
-* [riff function build](riff_function_build.md)	 - Trigger a revision build for a function resource
 * [riff function create](riff_function_create.md)	 - Create a new function resource
+* [riff function update](riff_function_update.md)	 - Trigger a build to generate a new revision for a function resource
 

docs/riff_function_build.md renamed to docs/riff_function_update.md

@@ -1,25 +1,25 @@
-## riff function build
+## riff function update
 
-Trigger a revision build for a function resource
+Trigger a build to generate a new revision for a function resource
 
 ### Synopsis
 
-Trigger a revision build for a function resource
+Trigger a build to generate a new revision for a function resource
 
 ```
-riff function build [flags]
+riff function update [flags]
 ```
 
 ### Examples
 
 ```
-  riff function build square
+  riff function update square
 ```
 
 ### Options
 
 ```
-  -h, --help                  help for build
+  -h, --help                  help for update
   -l, --local-path string     path to local source to build the image from; only build-pack builds are supported at this time
   -n, --namespace namespace   the namespace of the function
   -v, --verbose               print details of command progress

pkg/core/client.go

@@ -31,7 +31,7 @@ import (
 
 type Client interface {
 	CreateFunction(options CreateFunctionOptions, log io.Writer) (*serving.Service, error)
-	BuildFunction(options BuildFunctionOptions, log io.Writer) error
+	UpdateFunction(options UpdateFunctionOptions, log io.Writer) error
 
 	CreateSubscription(options CreateSubscriptionOptions) (*eventing.Subscription, error)
 	DeleteSubscription(options DeleteSubscriptionOptions) error

pkg/core/function.go

@@ -484,7 +484,7 @@ func (selectorDisjunction) String() string {
 	panic("implement me")
 }
 
-type BuildFunctionOptions struct {
+type UpdateFunctionOptions struct {
 	Namespace string
 	Name      string
 	LocalPath string
@@ -500,7 +500,7 @@ func (c *client) getServiceSpecGeneration(namespace string, name string) (int64,
 	return s.Spec.Generation, nil
 }
 
-func (c *client) BuildFunction(options BuildFunctionOptions, log io.Writer) error {
+func (c *client) UpdateFunction(options UpdateFunctionOptions, log io.Writer) error {
 	ns := c.explicitOrConfigNamespace(options.Namespace)
 
 	service, err := c.service(options.Namespace, options.Name)
@@ -525,7 +525,7 @@ func (c *client) BuildFunction(options BuildFunctionOptions, log io.Writer) erro
 	c.bumpNonceAnnotation(service)
 
 	if build == nil {
-		// function was build locally, attempt to reconstruct configuration
+		// function was built locally, attempt to reconstruct configuration
 		appDir := options.LocalPath
 		buildImage := annotations[buildpackBuildImageAnnotation]
 		runImage := annotations[buildpackRunImageAnnotation]
@@ -559,7 +559,7 @@ func (c *client) BuildFunction(options BuildFunctionOptions, log io.Writer) erro
 		)
 		for i := 0; i < 10; i++ {
 			if i >= 10 {
-				return fmt.Errorf("build unsuccesful for \"%s\", service resource was never updated", options.Name)
+				return fmt.Errorf("update unsuccesful for \"%s\", service resource was never updated", options.Name)
 			}
 			time.Sleep(500 * time.Millisecond)
 			nextGen, err = c.getServiceSpecGeneration(options.Namespace, options.Name)