regroup auth parameters

rundeck-plugins · Oct 10, 2024 · 064baec · 064baec
1 parent ee63e7f
commit 064baec
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleDescribable.java b/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleDescribable.java
@@ -352,7 +352,7 @@ public static String[] getValues() {
             .title("SSH Key File path")
             .description("File Path to the SSH Key to use")
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
             .build();
 
 
@@ -366,7 +366,7 @@ public static String[] getValues() {
             .renderingOption(StringRenderingConstants.STORAGE_PATH_ROOT_KEY, "keys")
             .renderingOption(StringRenderingConstants.STORAGE_FILE_META_FILTER_KEY, "Rundeck-key-type=private")
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
             .build();
 
     static final Property SSH_PASSWORD_STORAGE_PROP = PropertyBuilder.builder()
@@ -396,11 +396,11 @@ public static String[] getValues() {
     static final Property SSH_AUTH_TYPE_PROP = PropertyBuilder.builder()
             .select(ANSIBLE_SSH_AUTH_TYPE)
             .required(false)
-            .title("SSH Authentication")
-            .description("Type of SSH Authentication to use.")
+            .title("Authentication Type")
+            .description("Type of Authentication to use.")
             .values(Arrays.asList(AuthenticationType.getValues()))
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
             .build();
 
     static final Property SSH_USER_PROP = PropertyBuilder.builder()
@@ -418,7 +418,7 @@ public static String[] getValues() {
             .title("SSH Timeout")
             .description("SSH timeout, override the SSH timeout in seconds (default=10).")
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
             .build();
 
     static final Property SSH_USE_AGENT = PropertyBuilder.builder()
@@ -427,7 +427,7 @@ public static String[] getValues() {
             .title("Use ssh-agent.")
             .description("Use ssh-agent to connect with a private key plus a passphrase.")
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
             .build();
 
     static final Property SSH_PASSPHRASE = PropertyBuilder.builder()
@@ -440,7 +440,7 @@ public static String[] getValues() {
             .renderingOption(StringRenderingConstants.STORAGE_PATH_ROOT_KEY, "keys")
             .renderingOption(StringRenderingConstants.STORAGE_FILE_META_FILTER_KEY, "Rundeck-data-type=password")
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
             .build();
 
     static final Property SSH_PASSPHRASE_OPTION = PropertyBuilder.builder()
@@ -450,7 +450,7 @@ public static String[] getValues() {
             .description("SSH Passphrase from secure option on a job, it just works if the ssh-agent is used.")
             .defaultValue(DEFAULT_ANSIBLE_SSH_PASSPHRASE_OPTION)
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
             .build();
 
 

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleFileCopier.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleFileCopier.java
@@ -40,9 +40,9 @@ public class AnsibleFileCopier implements FileCopier, AnsibleDescribable, ProxyR
         builder.property(BINARIES_DIR_PATH_PROP);
         builder.property(INVENTORY_INLINE_PROP);
         builder.property(CONFIG_FILE_PATH);
-        builder.property(SSH_USER_PROP);
-        builder.property(SSH_PASSWORD_STORAGE_PROP);
         builder.property(SSH_AUTH_TYPE_PROP);
+         builder.property(SSH_USER_PROP);
+        builder.property(SSH_PASSWORD_STORAGE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_TIMEOUT_PROP);

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java
@@ -36,9 +36,9 @@ public class AnsibleNodeExecutor implements NodeExecutor, AnsibleDescribable, Pr
         builder.property(WINDOWS_EXECUTABLE_PROP);
         builder.property(CONFIG_FILE_PATH);
         builder.property(GENERATE_INVENTORY_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_TIMEOUT_PROP);

diff --git a/...main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java b/...main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java
@@ -46,9 +46,9 @@ public class AnsiblePlaybookInlineWorkflowNodeStep implements NodeStepPlugin, An
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java
@@ -47,9 +47,9 @@ public class AnsiblePlaybookInlineWorkflowStep implements StepPlugin, AnsibleDes
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java
@@ -45,9 +45,9 @@ public class AnsiblePlaybookWorflowNodeStep implements NodeStepPlugin, AnsibleDe
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java
@@ -46,9 +46,9 @@ public class AnsiblePlaybookWorkflowStep implements StepPlugin, AnsibleDescribab
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);

diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceFactory.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceFactory.java
@@ -44,10 +44,13 @@ public AnsibleResourceModelSourceFactory(final Framework framework) {
         builder.property(IMPORT_INVENTORY_VARS_PROP);
         builder.property(IGNORE_INVENTORY_VARS_PROP);
         builder.property(EXTRA_ATTRS_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
+        builder.property(SSH_PASSWORD_STORAGE_PROP);
+        builder.property(SSH_KEY_STORAGE_PROP);
+
         builder.property(SSH_TIMEOUT_PROP);
         builder.property(BECOME_PROP);
         builder.property(BECOME_AUTH_TYPE_PROP);
@@ -57,10 +60,7 @@ public AnsibleResourceModelSourceFactory(final Framework framework) {
         builder.property(VAULT_PASSWORD_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
 
-        builder.property(SSH_PASSWORD_STORAGE_PROP);
-        builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_PASSPHRASE);
-
         builder.property(SSH_USE_AGENT);
         builder.property(BECOME_PASSWORD_STORAGE_PROP);