Skip to content

Commit bafa421

Browse files
ltamasterltamaster
authored
Merge pull request #394 from rundeck-plugins/RUN-2888
RUN-2888: Support windows authentication
2 parents 56ef33a + 44c297c commit bafa421

6 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎.github/workflows/gradle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
id: get_version
3131
run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
3232
- name: Upload plugin jar
33-
uses: actions/upload-artifact@v1.0.0
33+
uses: actions/upload-artifact@v4
3434
with:
3535
# Artifact name
3636
name: Grails-Plugin-${{ steps.get_version.outputs.VERSION }}

‎functional-test/src/test/groovy/functional/BasicIntegrationSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class BasicIntegrationSpec extends BaseTestConfiguration {
8585
ansibleNodeExecutionStatus.get("failed")==0
8686
ansibleNodeExecutionStatus.get("skipped")==0
8787
ansibleNodeExecutionStatus.get("ignored")==0
88-
logs.findAll {it.log.contains("encryptVariable ansible_ssh_password:")}.size() == 1
88+
logs.findAll {it.log.contains("encryptVariable ansible_password:")}.size() == 1
8989
}
9090

9191
def "test simple inline playbook private-key with passphrase authentication"(){
@@ -301,7 +301,7 @@ class BasicIntegrationSpec extends BaseTestConfiguration {
301301
ansibleNodeExecutionStatus.get("failed")==0
302302
ansibleNodeExecutionStatus.get("skipped")==0
303303
ansibleNodeExecutionStatus.get("ignored")==0
304-
logs.findAll {it.log.contains("encryptVariable ansible_ssh_password:")}.size() == 1
304+
logs.findAll {it.log.contains("encryptVariable ansible_password:")}.size() == 1
305305
logs.findAll {it.log.contains("\"environmentTest\": \"test\"")}.size() == 1
306306
logs.findAll {it.log.contains("\"token\": 13231232312321321321321")}.size() == 1
307307
}

‎src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleDescribable.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public static String[] getValues() {
352352
.title("SSH Key File path")
353353
.description("File Path to the SSH Key to use")
354354
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
355-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
355+
.renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
356356
.build();
357357

358358

@@ -366,50 +366,50 @@ public static String[] getValues() {
366366
.renderingOption(StringRenderingConstants.STORAGE_PATH_ROOT_KEY, "keys")
367367
.renderingOption(StringRenderingConstants.STORAGE_FILE_META_FILTER_KEY, "Rundeck-key-type=private")
368368
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
369-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
369+
.renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
370370
.build();
371371

372372
static final Property SSH_PASSWORD_STORAGE_PROP = PropertyBuilder.builder()
373373
.string(ANSIBLE_SSH_PASSWORD_STORAGE_PATH)
374374
.required(false)
375-
.title("SSH Password Storage Path")
376-
.description("Path to the ssh Password to use within Rundeck Storage.")
375+
.title("Password Storage Path")
376+
.description("Path to the Password to use within Rundeck Storage.")
377377
.renderingOption(StringRenderingConstants.SELECTION_ACCESSOR_KEY,
378378
StringRenderingConstants.SelectionAccessor.STORAGE_PATH)
379379
.renderingOption(StringRenderingConstants.STORAGE_PATH_ROOT_KEY, "keys")
380380
.renderingOption(StringRenderingConstants.STORAGE_FILE_META_FILTER_KEY, "Rundeck-data-type=password")
381381
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
382-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
382+
.renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
383383
.build();
384384

385385
static final Property SSH_PASSWORD_PROP = PropertyBuilder.builder()
386386
.string(ANSIBLE_SSH_PASSWORD)
387387
.required(false)
388-
.title("SSH Password")
389-
.description("Ansible SSH password.")
388+
.title("User Password")
389+
.description("Ansible User Password.")
390390
.renderingOption(StringRenderingConstants.DISPLAY_TYPE_KEY,
391391
StringRenderingConstants.DisplayType.PASSWORD)
392392
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
393-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
393+
.renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
394394
.build();
395395

396396
static final Property SSH_AUTH_TYPE_PROP = PropertyBuilder.builder()
397397
.select(ANSIBLE_SSH_AUTH_TYPE)
398398
.required(false)
399-
.title("SSH Authentication")
400-
.description("Type of SSH Authentication to use.")
399+
.title("Authentication Type")
400+
.description("Type of Authentication to use.")
401401
.values(Arrays.asList(AuthenticationType.getValues()))
402402
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
403-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
403+
.renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
404404
.build();
405405

406406
static final Property SSH_USER_PROP = PropertyBuilder.builder()
407407
.string(ANSIBLE_SSH_USER)
408408
.required(false)
409-
.title("SSH User")
410-
.description("SSH User to authenticate as (default=rundeck).")
409+
.title("User")
410+
.description("User to authenticate as (default=rundeck).")
411411
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
412-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
412+
.renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
413413
.build();
414414

415415
static final Property SSH_TIMEOUT_PROP = PropertyBuilder.builder()
@@ -418,7 +418,7 @@ public static String[] getValues() {
418418
.title("SSH Timeout")
419419
.description("SSH timeout, override the SSH timeout in seconds (default=10).")
420420
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
421-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
421+
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
422422
.build();
423423

424424
static final Property SSH_USE_AGENT = PropertyBuilder.builder()
@@ -427,7 +427,7 @@ public static String[] getValues() {
427427
.title("Use ssh-agent.")
428428
.description("Use ssh-agent to connect with a private key plus a passphrase.")
429429
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
430-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
430+
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
431431
.build();
432432

433433
static final Property SSH_PASSPHRASE = PropertyBuilder.builder()
@@ -440,7 +440,7 @@ public static String[] getValues() {
440440
.renderingOption(StringRenderingConstants.STORAGE_PATH_ROOT_KEY, "keys")
441441
.renderingOption(StringRenderingConstants.STORAGE_FILE_META_FILTER_KEY, "Rundeck-data-type=password")
442442
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
443-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
443+
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
444444
.build();
445445

446446
static final Property SSH_PASSPHRASE_OPTION = PropertyBuilder.builder()
@@ -450,7 +450,7 @@ public static String[] getValues() {
450450
.description("SSH Passphrase from secure option on a job, it just works if the ssh-agent is used.")
451451
.defaultValue(DEFAULT_ANSIBLE_SSH_PASSPHRASE_OPTION)
452452
.renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
453-
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
453+
.renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Extra Configuration")
454454
.build();
455455

456456

‎src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ public int run() throws Exception {
447447
}
448448

449449
if (sshUsePassword) {
450-
String extraVarsPassword = "ansible_ssh_password: " + sshPass;
450+
String extraVarsPassword = "ansible_password: " + sshPass;
451451
String finalextraVarsPassword = extraVarsPassword;
452452

453453
if(useAnsibleVault){

‎src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleFileCopier.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class AnsibleFileCopier implements FileCopier, AnsibleDescribable, ProxyR
4141
builder.property(INVENTORY_INLINE_PROP);
4242
builder.property(CONFIG_FILE_PATH);
4343
builder.property(SSH_AUTH_TYPE_PROP);
44-
builder.property(SSH_USER_PROP);
44+
builder.property(SSH_USER_PROP);
4545
builder.property(SSH_PASSWORD_STORAGE_PROP);
4646
builder.property(SSH_KEY_FILE_PROP);
4747
builder.property(SSH_KEY_STORAGE_PROP);

‎src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ public AnsibleResourceModelSourceFactory(final Framework framework) {
4747
builder.property(SSH_AUTH_TYPE_PROP);
4848
builder.property(SSH_USER_PROP);
4949
builder.property(SSH_PASSWORD_PROP);
50+
builder.property(SSH_PASSWORD_STORAGE_PROP);
5051
builder.property(SSH_KEY_FILE_PROP);
52+
builder.property(SSH_KEY_STORAGE_PROP);
53+
5154
builder.property(SSH_TIMEOUT_PROP);
5255
builder.property(BECOME_PROP);
5356
builder.property(BECOME_AUTH_TYPE_PROP);
@@ -57,10 +60,7 @@ public AnsibleResourceModelSourceFactory(final Framework framework) {
5760
builder.property(VAULT_PASSWORD_PROP);
5861
builder.property(VAULT_KEY_STORAGE_PROP);
5962

60-
builder.property(SSH_PASSWORD_STORAGE_PROP);
61-
builder.property(SSH_KEY_STORAGE_PROP);
6263
builder.property(SSH_PASSPHRASE);
63-
6464
builder.property(SSH_USE_AGENT);
6565
builder.property(BECOME_PASSWORD_STORAGE_PROP);
6666

0 commit comments

Comments
 (0)