forked from knative/client
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add kn revision delete command (knative#207)
* Adds kn revision delete command * Adds unit tests for revision delete command * Adds integration tests for revision delete command Added revision delete command tests in new workflow namely TestRevisionWorkflow. * Removes extra line and renames an import alias * Adds 10 seconds sleep between service create and revision delete Also adds check for 'No resources found' while grabbing revision name. * Clean up imports * Removes the pause after service create * Updates testing output strings in unit and e2e * Updates post goimports on hack and test dirs
- Loading branch information
1 parent
263d2c0
commit 0ea4430
Showing
13 changed files
with
230 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
## kn revision delete | ||
|
||
Delete a revision. | ||
|
||
### Synopsis | ||
|
||
Delete a revision. | ||
|
||
``` | ||
kn revision delete NAME [flags] | ||
``` | ||
|
||
### Examples | ||
|
||
``` | ||
# Delete a revision 'svc1-abcde' in default namespace | ||
kn revision delete svc1-abcde | ||
``` | ||
|
||
### Options | ||
|
||
``` | ||
-h, --help help for delete | ||
-n, --namespace string List the requested object(s) in given namespace. | ||
``` | ||
|
||
### Options inherited from parent commands | ||
|
||
``` | ||
--config string config file (default is $HOME/.kn/config.yaml) | ||
--kubeconfig string kubectl config file (default is $HOME/.kube/config) | ||
``` | ||
|
||
### SEE ALSO | ||
|
||
* [kn revision](kn_revision.md) - Revision command group | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
// Copyright © 2019 The Knative Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package revision | ||
|
||
import ( | ||
"errors" | ||
"fmt" | ||
|
||
"github.com/knative/client/pkg/kn/commands" | ||
"github.com/spf13/cobra" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
) | ||
|
||
// NewRevisionDeleteCommand represent 'revision delete' command | ||
func NewRevisionDeleteCommand(p *commands.KnParams) *cobra.Command { | ||
RevisionDeleteCommand := &cobra.Command{ | ||
Use: "delete NAME", | ||
Short: "Delete a revision.", | ||
Example: ` | ||
# Delete a revision 'svc1-abcde' in default namespace | ||
kn revision delete svc1-abcde`, | ||
RunE: func(cmd *cobra.Command, args []string) error { | ||
if len(args) != 1 { | ||
return errors.New("'revision delete' requires the revision name given as single argument") | ||
} | ||
client, err := p.ServingFactory() | ||
if err != nil { | ||
return err | ||
} | ||
namespace, err := p.GetNamespace(cmd) | ||
if err != nil { | ||
return err | ||
} | ||
err = client.Revisions(namespace).Delete( | ||
args[0], | ||
&metav1.DeleteOptions{}, | ||
) | ||
if err != nil { | ||
return err | ||
} | ||
fmt.Fprintf(cmd.OutOrStdout(), "Revision '%s' successfully deleted in namespace '%s'.\n", args[0], namespace) | ||
return nil | ||
}, | ||
} | ||
commands.AddNamespaceFlags(RevisionDeleteCommand.Flags(), false) | ||
return RevisionDeleteCommand | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
// Copyright © 2019 The Knative Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package revision | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/knative/client/pkg/kn/commands" | ||
"k8s.io/apimachinery/pkg/runtime" | ||
client_testing "k8s.io/client-go/testing" | ||
) | ||
|
||
func fakeRevisionDelete(args []string) (action client_testing.Action, name string, output string, err error) { | ||
knParams := &commands.KnParams{} | ||
cmd, fakeServing, buf := commands.CreateTestKnCommand(NewRevisionCommand(knParams), knParams) | ||
fakeServing.AddReactor("delete", "revisions", | ||
func(a client_testing.Action) (bool, runtime.Object, error) { | ||
deleteAction, _ := a.(client_testing.DeleteAction) | ||
action = deleteAction | ||
name = deleteAction.GetName() | ||
return true, nil, nil | ||
}) | ||
cmd.SetArgs(args) | ||
err = cmd.Execute() | ||
if err != nil { | ||
return | ||
} | ||
output = buf.String() | ||
return | ||
} | ||
|
||
func TestRevisionDelete(t *testing.T) { | ||
revName := "foo-12345" | ||
action, name, output, err := fakeRevisionDelete([]string{"revision", "delete", revName}) | ||
if err != nil { | ||
t.Error(err) | ||
return | ||
} | ||
if action == nil { | ||
t.Errorf("No action") | ||
} else if !action.Matches("delete", "revisions") { | ||
t.Errorf("Bad action %v", action) | ||
} else if name != revName { | ||
t.Errorf("Bad revision name returned after delete.") | ||
} | ||
commands.TestContains(t, output, []string{"Revision", revName, "deleted", "namespace", commands.FakeNamespace}, "word in output") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,6 +16,7 @@ package commands | |
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/spf13/cobra" | ||
) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
// Copyright 2019 The Knative Authors | ||
|
||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
|
||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or im | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
// +build e2e | ||
|
||
package e2e | ||
|
||
import ( | ||
"strings" | ||
"testing" | ||
|
||
"github.com/knative/client/pkg/kn/commands" | ||
) | ||
|
||
func TestRevisionWorkflow(t *testing.T) { | ||
teardown := Setup(t) | ||
defer teardown(t) | ||
|
||
testServiceCreate(t, k, "hello") | ||
testDeleteRevision(t, k, "hello") | ||
testServiceDelete(t, k, "hello") | ||
} | ||
|
||
func testDeleteRevision(t *testing.T, k kn, serviceName string) { | ||
revName, err := k.RunWithOpts([]string{"revision", "list", "-o=jsonpath={.items[0].metadata.name}"}, runOpts{}) | ||
if err != nil { | ||
t.Errorf("Error executing 'revision list -o' command. Error: %s", err.Error()) | ||
} | ||
if strings.Contains(revName, "No resources found.") { | ||
t.Errorf("Could not find revision name.") | ||
} | ||
out, err := k.RunWithOpts([]string{"revision", "delete", revName}, runOpts{}) | ||
if err != nil { | ||
t.Errorf("Error executing 'revision delete %s' command. Error: %s", revName, err.Error()) | ||
} | ||
commands.TestContains(t, out, []string{"Revision", revName, "deleted", "namespace", k.namespace}, "word in output") | ||
} |