Merge pull request #58 from serverscom/add-hosts-feature-set-command

Add hosts ebm feature-set auth-method and ssh-key-fingerprint flags

Author: abozhiy

cmd/entities/hosts/features.go

@@ -25,11 +25,11 @@ func newListEBMFeaturesCmd(cmdContext *base.CmdContext) *cobra.Command {
 }
 
 type featureSetFlags struct {
-	Feature            string
-	State              string
-	IPXEConfig         string
-	AuthMethods        []string
-	SSHKeyFingerprints []string
+	Feature           string
+	State             string
+	IPXEConfig        string
+	AuthMethod        []string
+	SSHKeyFingerprint []string
 }
 
 func newEBMFeatureSetCmd(cmdContext *base.CmdContext) *cobra.Command {
@@ -78,8 +78,8 @@ func newEBMFeatureSetCmd(cmdContext *base.CmdContext) *cobra.Command {
 	cmd.Flags().StringVar(&flags.Feature, "feature", "", "feature name (required)")
 	cmd.Flags().StringVar(&flags.State, "state", "", "desired state: activate or deactivate (required)")
 	cmd.Flags().StringVar(&flags.IPXEConfig, "ipxe-config", "", "iPXE config script (for private_ipxe_boot)")
-	cmd.Flags().StringArrayVar(&flags.AuthMethods, "auth-methods", nil, "auth methods: password, ssh_key (for host_rescue_mode)")
-	cmd.Flags().StringArrayVar(&flags.SSHKeyFingerprints, "ssh-key-fingerprints", nil, "SSH key fingerprints (for host_rescue_mode with ssh_key auth)")
+	cmd.Flags().StringArrayVar(&flags.AuthMethod, "auth-method", nil, "auth method: password, ssh_key (for host_rescue_mode)")
+	cmd.Flags().StringArrayVar(&flags.SSHKeyFingerprint, "ssh-key-fingerprint", nil, "SSH key fingerprint (for host_rescue_mode with ssh_key auth)")
 
 	_ = cmd.MarkFlagRequired("feature")
 	_ = cmd.MarkFlagRequired("state")
@@ -103,8 +103,8 @@ func activateEBMFeature(ctx context.Context, client *serverscom.Client, id strin
 		return client.Hosts.ActivateNoPublicNetworkFeature(ctx, id)
 	case "host_rescue_mode":
 		return client.Hosts.ActivateHostRescueModeFeature(ctx, id, serverscom.HostRescueModeFeatureInput{
-			AuthMethods:        flags.AuthMethods,
-			SSHKeyFingerprints: flags.SSHKeyFingerprints,
+			AuthMethods:        flags.AuthMethod,
+			SSHKeyFingerprints: flags.SSHKeyFingerprint,
 		})
 	case "private_ipxe_boot":
 		return client.Hosts.ActivatePrivateIpxeBootFeature(ctx, id, serverscom.PrivateIpxeBootFeatureInput{

cmd/entities/hosts/features_test.go

@@ -204,7 +204,7 @@ func TestEBMFeatureSetCmd(t *testing.T) {
 		},
 		{
 			name:           "activate host_rescue_mode with password auth",
-			args:           []string{testServerID, "--feature", "host_rescue_mode", "--state", "activate", "--auth-methods", "password", "--output", "json"},
+			args:           []string{testServerID, "--feature", "host_rescue_mode", "--state", "activate", "--auth-method", "password", "--output", "json"},
 			expectedOutput: testutils.ReadFixture(filepath.Join(featuresFixtureBasePath, "feature_set_host_rescue_mode.json")),
 			configureMock: func(mock *mocks.MockHostsService) {
 				mock.EXPECT().
@@ -216,7 +216,7 @@ func TestEBMFeatureSetCmd(t *testing.T) {
 		},
 		{
 			name:           "activate host_rescue_mode with ssh_key auth",
-			args:           []string{testServerID, "--feature", "host_rescue_mode", "--state", "activate", "--auth-methods", "ssh_key", "--ssh-key-fingerprints", "aa:bb:cc", "--output", "json"},
+			args:           []string{testServerID, "--feature", "host_rescue_mode", "--state", "activate", "--auth-method", "ssh_key", "--ssh-key-fingerprint", "aa:bb:cc", "--output", "json"},
 			expectedOutput: testutils.ReadFixture(filepath.Join(featuresFixtureBasePath, "feature_set_host_rescue_mode.json")),
 			configureMock: func(mock *mocks.MockHostsService) {
 				mock.EXPECT().