Merge pull request #194 from janog-netcon/add-exec-command-for-admin

Add execCommandForAdmin subcommand

Author: proelbtn

cmd/access-helper/exec.go

@@ -22,10 +22,12 @@ func (h *ExecAccessHelper) access(
 	ctx context.Context,
 	nodeDefinition containerlab.NodeDefinition,
 	containerDetails containerlab.ContainerDetails,
-	_isAdmin bool,
+	isAdmin bool,
 ) error {
 	execCommand := defaultExecCommand
-	if v, ok := nodeDefinition.Labels[execCommandKey]; ok {
+	if v, ok := nodeDefinition.Labels[execCommandForAdminKey]; ok && isAdmin {
+		execCommand = v
+	} else if v, ok := nodeDefinition.Labels[execCommandKey]; ok {
 		execCommand = v
 	}
 

cmd/access-helper/labels.go

@@ -12,6 +12,10 @@ const (
 	// ref: https://uokada.hatenablog.jp/entry/2015/05/20/001208
 	defaultSSHPassword string = "clab@123"
 
+	defaultSSHPort uint16 = 22
+
+	defaultExecCommand = "sh"
+
 	// AccessMethodKey is the label key to specify the access method.
 	// The possible values are either "ssh" or "exec".
 	// With "ssh", access-helper will try to connect to the Node via SSH.
@@ -40,11 +44,10 @@ const (
 
 	// sshPortKey is the label key to specify port number for SSH access.
 	// The default value is defaultPort.
-	sshPortKey            = "netcon.janog.gr.jp/sshPort"
-	defaultSSHPort uint16 = 22
+	sshPortKey = "netcon.janog.gr.jp/sshPort"
 
 	// execCommandKey is the label key to specify command for exec access.
 	// The default value is defaultExecCommand.
-	execCommandKey     = "netcon.janog.gr.jp/execCommand"
-	defaultExecCommand = "sh"
+	execCommandKey         = "netcon.janog.gr.jp/execCommand"
+	execCommandForAdminKey = "netcon.janog.gr.jp/execCommandForAdmin"
 )