-
Notifications
You must be signed in to change notification settings - Fork 702
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
feat(plugins): adding halyard commands for plugins #1386
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
7ebb027
feat(plugins): adding halyard commands for plugins
link108 7d580c5
Merge branch 'master' into plugins-command
link108 a9b4a9e
Merge branch 'master' into plugins-command
link108 ab615bc
chore(refactor): use toMap instead of a concurrentMap collector
link108 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
46 changes: 46 additions & 0 deletions
46
halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/command/v1/PluginCommand.java
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,46 @@ | ||
/* | ||
* Copyright 2019 Armory, Inc. | ||
* | ||
* 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 com.netflix.spinnaker.halyard.cli.command.v1; | ||
|
||
import com.beust.jcommander.Parameters; | ||
import com.netflix.spinnaker.halyard.cli.command.v1.config.AbstractConfigCommand; | ||
import com.netflix.spinnaker.halyard.cli.command.v1.plugins.*; | ||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
|
||
@Parameters(separators = "=") | ||
public class PluginCommand extends AbstractConfigCommand { | ||
@Getter(AccessLevel.PUBLIC) | ||
private String commandName = "plugins"; | ||
|
||
@Getter(AccessLevel.PUBLIC) | ||
private String shortDescription = "Show Spinnaker's configured plugins."; | ||
|
||
public PluginCommand() { | ||
registerSubcommand(new AddPluginCommand()); | ||
registerSubcommand(new EditPluginCommand()); | ||
registerSubcommand(new DeletePluginCommand()); | ||
registerSubcommand(new ListPluginsCommand()); | ||
registerSubcommand(new PluginEnableDisableCommandBuilder().setEnable(true).build()); | ||
registerSubcommand(new PluginEnableDisableCommandBuilder().setEnable(false).build()); | ||
} | ||
|
||
@Override | ||
protected void executeThis() { | ||
showHelp(); | ||
} | ||
} |
56 changes: 56 additions & 0 deletions
56
...n/java/com/netflix/spinnaker/halyard/cli/command/v1/plugins/AbstractHasPluginCommand.java
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,56 @@ | ||
/* | ||
* Copyright 2019 Armory, Inc. | ||
* | ||
* 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 com.netflix.spinnaker.halyard.cli.command.v1.plugins; | ||
|
||
import com.beust.jcommander.Parameter; | ||
import com.beust.jcommander.Parameters; | ||
import com.netflix.spinnaker.halyard.cli.command.v1.config.AbstractConfigCommand; | ||
import com.netflix.spinnaker.halyard.cli.services.v1.Daemon; | ||
import com.netflix.spinnaker.halyard.cli.services.v1.OperationHandler; | ||
import com.netflix.spinnaker.halyard.config.model.v1.plugins.Plugin; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
/** An abstract definition for commands that accept plugins as a main parameter */ | ||
@Parameters(separators = "=") | ||
public abstract class AbstractHasPluginCommand extends AbstractConfigCommand { | ||
@Parameter(description = "The name of the plugin to operate on.", arity = 1) | ||
List<String> plugins = new ArrayList<>(); | ||
|
||
@Override | ||
public String getMainParameter() { | ||
return "plugin"; | ||
} | ||
|
||
public Plugin getPlugin() { | ||
return new OperationHandler<Plugin>() | ||
.setFailureMesssage("Failed to get plugin") | ||
.setOperation(Daemon.getPlugin(getCurrentDeployment(), plugins.get(0), false)) | ||
.get(); | ||
} | ||
|
||
public String getPluginName() { | ||
switch (plugins.size()) { | ||
case 0: | ||
throw new IllegalArgumentException("No plugin supplied"); | ||
case 1: | ||
return plugins.get(0); | ||
default: | ||
throw new IllegalArgumentException("More than one plugin supplied"); | ||
} | ||
} | ||
} |
60 changes: 60 additions & 0 deletions
60
.../src/main/java/com/netflix/spinnaker/halyard/cli/command/v1/plugins/AddPluginCommand.java
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,60 @@ | ||
/* | ||
* Copyright 2019 Armory Inc. | ||
* | ||
* 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 com.netflix.spinnaker.halyard.cli.command.v1.plugins; | ||
|
||
import com.beust.jcommander.Parameter; | ||
import com.beust.jcommander.Parameters; | ||
import com.netflix.spinnaker.halyard.cli.services.v1.Daemon; | ||
import com.netflix.spinnaker.halyard.cli.services.v1.OperationHandler; | ||
import com.netflix.spinnaker.halyard.config.model.v1.plugins.Plugin; | ||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
|
||
@Parameters(separators = "=") | ||
public class AddPluginCommand extends AbstractHasPluginCommand { | ||
@Getter(AccessLevel.PUBLIC) | ||
private String commandName = "add"; | ||
|
||
@Getter(AccessLevel.PUBLIC) | ||
private String shortDescription = "Add a plugin"; | ||
|
||
@Parameter( | ||
names = "--manifest-location", | ||
description = "The location of the plugin's manifest file.", | ||
required = true) | ||
private String manifestLocation; | ||
|
||
@Parameter(names = "--enabled", description = "To enable or disable the plugin.") | ||
private String enabled; | ||
|
||
@Override | ||
protected void executeThis() { | ||
String currentDeployment = getCurrentDeployment(); | ||
String name = getPluginName(); | ||
Plugin plugin = | ||
new Plugin() | ||
.setName(name) | ||
.setEnabled(isSet(enabled) ? Boolean.parseBoolean(enabled) : false) | ||
.setManifestLocation(manifestLocation); | ||
|
||
new OperationHandler<Void>() | ||
.setFailureMesssage("Failed to add plugin: " + name + ".") | ||
.setSuccessMessage("Successfully added plugin" + name + ".") | ||
.setOperation(Daemon.addPlugin(currentDeployment, !noValidate, plugin)) | ||
.get(); | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
...c/main/java/com/netflix/spinnaker/halyard/cli/command/v1/plugins/DeletePluginCommand.java
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,46 @@ | ||
/* | ||
* Copyright 2019 Armory, Inc. | ||
* | ||
* 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 com.netflix.spinnaker.halyard.cli.command.v1.plugins; | ||
|
||
import com.beust.jcommander.Parameters; | ||
import com.netflix.spinnaker.halyard.cli.services.v1.Daemon; | ||
import com.netflix.spinnaker.halyard.cli.services.v1.OperationHandler; | ||
import com.netflix.spinnaker.halyard.config.model.v1.plugins.Plugin; | ||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
|
||
@Parameters(separators = "=") | ||
public class DeletePluginCommand extends AbstractHasPluginCommand { | ||
@Getter(AccessLevel.PUBLIC) | ||
private String commandName = "delete"; | ||
|
||
@Getter(AccessLevel.PUBLIC) | ||
private String shortDescription = "Delete a plugin"; | ||
|
||
@Override | ||
protected void executeThis() { | ||
String currentDeployment = getCurrentDeployment(); | ||
Plugin plugin = getPlugin(); | ||
String name = plugin.getName(); | ||
|
||
new OperationHandler<Void>() | ||
.setFailureMesssage("Failed to delete plugin " + name + ".") | ||
.setSuccessMessage("Successfully deleted plugin " + name + ".") | ||
.setOperation(Daemon.deletePlugin(currentDeployment, name, !noValidate)) | ||
.get(); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can be
private