feat: Add support to combine service create --filename with other options #937

dsimansk · 2020-07-16T19:36:26Z

Description

Add enhancement to the command kn service create -f to accept other options to modify the created service.

Per discussion in #923 we should decide how name is handled:

Provided cmdline name overrides the name in the file
Keep the current implementation that if name is provided on cmdline it must match the name in the file.

Changes

Add support to combine service create --filename with other options

Reference

Fixes #923

…ions

knative-prow-robot

@dsimansk: 0 warnings.

In response to this:

Description

Add enhancement to the command kn service create -f to accept other options to modify the created service.

Per discussion in #923 we should decide how name is handled:

Provided cmdline name overrides the name in the file

Keep the current implementation that if name is provided on cmdline it must match the name in the file.

Changes

Add support to combine service create --filename with other options

Reference

Fixes #923

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

maximilien

/ok-to-test

Thanks for contribution. Left couple comments. Please try and address.

maximilien · 2020-07-16T20:43:14Z

docs/cmd/kn_service_create.md

@@ -64,7 +64,7 @@ kn service create NAME --image IMAGE
      --concurrency-utilization int   Percentage of concurrent requests utilization before scaling up. (default 70)
  -e, --env stringArray               Environment variable to set. NAME=value; you may provide this flag any number of times to set multiple environment variables. To unset, specify the environment variable name followed by a "-" (e.g., NAME-).
      --env-from stringArray          Add environment variables from a ConfigMap (prefix cm: or config-map:) or a Secret (prefix secret:). Example: --env-from cm:myconfigmap or --env-from secret:mysecret. You can use this flag multiple times. To unset a ConfigMap/Secret reference, append "-" to the name, e.g. --env-from cm:myconfigmap-.
-  -f, --filename string               Create a service from file.
+  -f, --filename string               Create a service from file. The created service can be further modified by combining with other options.Example: -f /path/to/file --env NAME=value will also add environment variable.


"options.Example:" => "options, e.g.," OR "options. For example:"

"also add environment variable" --> "also add an environment variable"

maximilien · 2020-07-16T20:43:51Z

pkg/kn/commands/service/configuration_edit_flags.go

-	command.Flags().StringVarP(&p.Filename, "filename", "f", "", "Create a service from file.")
+	command.Flags().StringVarP(&p.Filename, "filename", "f", "", "Create a service from file. "+
+		"The created service can be further modified by combining with other options."+
+		"Example: -f /path/to/file --env NAME=value will also add environment variable.")


Same as above. Use same resolution

maximilien · 2020-07-16T20:51:14Z

pkg/kn/commands/service/create.go

 	if err != nil {
 		return nil, err
 	}


I could comment these lines and all tests are still passing. So this tells me no test for errors when editFlags.Apply(...)

But isn't editFlags.Apply() already covered ? Ideally, there is a dedicated unit test only for this method, and should not be tested indirectly within tests that test that intend to test other stuff.

If I look at the overall test suite I see, that editFlags.Apply() is already tested to a high degree. Looking at that method though it looks like that it deserves some refactoring, it is far too large.

pkg/kn/commands/service/configuration_edit_flags.go

rhuss · 2020-07-21T09:30:34Z

pkg/kn/commands/service/create.go

@@ -303,12 +303,11 @@ func constructServiceFromFile(cmd *cobra.Command, editFlags ConfigurationEditFla
 	// Set namespace in case it's specified as --namespace
 	service.ObjectMeta.Namespace = namespace

-	// We need to generate revision to have --force replace working
-	revName, err := servinglib.GenerateRevisionName(editFlags.RevisionName, &service)


Why has this been removed ?

It's superseded by combination of markFlagMakesRevision and editFlags.Apply, per my suggestion/proposal from previous PR.

https://github.com/knative/client/pull/937/files#diff-74b189b0b506d256ede4322475d950f5R285

I see, and I think it makes sense.

Co-authored-by: Roland Huß <[email protected]>

knative-metrics-robot · 2020-07-21T12:35:17Z

The following is the coverage report on the affected files.
Say /test pull-knative-client-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage	Delta
pkg/kn/commands/service/configuration_edit_flags.go	85.0%	85.1%	0.1
pkg/kn/commands/service/create.go	81.9%	82.6%	0.7

rhuss

Thanks !

/lgtm
/approve

knative-prow-robot · 2020-07-21T13:04:51Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dsimansk, rhuss

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [rhuss]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

feat: Add support to combine service create --filename with other opt…

42c4076

…ions

googlebot added the cla: yes Indicates the PR's author has signed the CLA. label Jul 16, 2020

mattmoor reviewed Jul 16, 2020

View reviewed changes

knative-prow-robot requested review from evankanderson and rhuss July 16, 2020 19:36

knative-prow-robot reviewed Jul 16, 2020

View reviewed changes

knative-prow-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 16, 2020

fix: Fix spelling in usage message

ba133ed

maximilien suggested changes Jul 16, 2020

View reviewed changes

knative-prow-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jul 16, 2020

dsimansk added 2 commits July 17, 2020 09:39

fix: Fix usage message

2c7338d

fix: Add test to cover errors

857c046

rhuss reviewed Jul 21, 2020

View reviewed changes

pkg/kn/commands/service/configuration_edit_flags.go Outdated Show resolved Hide resolved

rhuss reviewed Jul 21, 2020

View reviewed changes

dsimansk and others added 3 commits July 21, 2020 12:06

fix: Usage message wording

1f8bf11

Co-authored-by: Roland Huß <[email protected]>

fix: Update codegen

d76201c

chore: Add changelog entry

3e0a752

knative-prow-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 21, 2020

fix: Fix changelog formatting

062345d

rhuss approved these changes Jul 21, 2020

View reviewed changes

knative-prow-robot assigned rhuss Jul 21, 2020

knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 21, 2020

knative-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 21, 2020

knative-prow-robot merged commit 879e5bd into knative:master Jul 21, 2020

dsimansk deleted the filename-with-options branch July 21, 2020 13:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add support to combine service create --filename with other options #937

feat: Add support to combine service create --filename with other options #937

dsimansk commented Jul 16, 2020

knative-prow-robot left a comment

maximilien left a comment

maximilien Jul 16, 2020

rhuss Jul 21, 2020

maximilien Jul 16, 2020

maximilien Jul 16, 2020

rhuss Jul 17, 2020

rhuss Jul 17, 2020

rhuss Jul 21, 2020

dsimansk Jul 21, 2020 •

edited

Loading

rhuss Jul 21, 2020

knative-metrics-robot commented Jul 21, 2020

rhuss left a comment

knative-prow-robot commented Jul 21, 2020

feat: Add support to combine service create --filename with other options #937

feat: Add support to combine service create --filename with other options #937

Conversation

dsimansk commented Jul 16, 2020

Description

Changes

Reference

knative-prow-robot left a comment

Choose a reason for hiding this comment

Description

Changes

Reference

maximilien left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dsimansk Jul 21, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

knative-metrics-robot commented Jul 21, 2020

rhuss left a comment

Choose a reason for hiding this comment

knative-prow-robot commented Jul 21, 2020

dsimansk Jul 21, 2020 •

edited

Loading