Skip to content

Commit 1119768

Browse files
SylfwoodSylfwood
committed
chore: consolidate integration tests
1 parent edc082c commit 1119768

File tree

9 files changed

+147
-120
lines changed

9 files changed

+147
-120
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Test modules
1+
name: Test Modules
22

33
on:
44
workflow_dispatch:
5-
push: # test
5+
push:
66
pull_request:
77
branches:
88
- master
@@ -41,7 +41,7 @@ jobs:
4141
working-directory: tests/integration
4242

4343
- name: Run get-vaults
44-
run: ansible-playbook test_get_vault.yml
44+
run: ansible-playbook test_manage_server.yml
4545
working-directory: tests/integration
4646
env:
4747
DVLS_APP_KEY: ${{ secrets.DVLS_APP_KEY }}
@@ -50,16 +50,7 @@ jobs:
5050
DVLS_VAULT_ID: ${{ secrets.DVLS_VAULT_ID }}
5151

5252
- name: Run get-secrets
53-
run: ansible-playbook test_get_secret.yml
54-
working-directory: tests/integration
55-
env:
56-
DVLS_APP_KEY: ${{ secrets.DVLS_APP_KEY }}
57-
DVLS_APP_SECRET: ${{ secrets.DVLS_APP_SECRET }}
58-
DVLS_SERVER_BASE_URL: ${{ secrets.DVLS_SERVER_BASE_URL }}
59-
DVLS_VAULT_ID: ${{ secrets.DVLS_VAULT_ID }}
60-
61-
- name: Run create-secrets
62-
run: ansible-playbook test_create_secret.yml
53+
run: ansible-playbook test_manage_secrets.yml
6354
working-directory: tests/integration
6455
env:
6556
DVLS_APP_KEY: ${{ secrets.DVLS_APP_KEY }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# ansible-galaxy build
22
*.tar.gz
33
.lock
4+
.ansible
45

56
# vscode..
67
.vscode

‎galaxy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ repository: https://github.com/Devolutions/ansible-dvls
1616
documentation: https://github.com/Devolutions/ansible-dvls
1717
homepage: https://github.com/Devolutions/ansible-dvls
1818
issues: https://github.com/Devolutions/ansible-dvls/issues
19-
build_ignore: [.github, requirements.txt]
19+
build_ignore: [.github, requirements.txt, tests]

‎tests/integration/configurations.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
configs:
2+
- secret_name: "fetch-secret-from-file"

‎tests/integration/secrets.yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎tests/integration/test_create_secret.yml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎tests/integration/test_get_secret.yml‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎tests/integration/test_manage_secrets.yml‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
---
2+
- name: Fetch DVLS
3+
hosts: localhost
4+
vars_files:
5+
- configurations.yml
6+
tasks:
7+
- name: Fetch all secrets
8+
devolutions.dvls.fetch_secrets:
9+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
10+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
11+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
12+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
13+
register: all_secrets
14+
15+
- name: Check secrets
16+
ansible.builtin.debug:
17+
msg: "Number of secret in vault: {{ all_secrets | length }}"
18+
19+
- name: Fetch secrets using file
20+
devolutions.dvls.fetch_secrets:
21+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
22+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
23+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
24+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
25+
secrets: "{{ configs }}"
26+
register: secrets_from_file
27+
28+
- name: Check secrets from file
29+
ansible.builtin.debug:
30+
msg: "Number of secret in file: {{ secrets_from_file }}"
31+
32+
- name: Get secret from ID
33+
devolutions.dvls.fetch_secrets:
34+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
35+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
36+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
37+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
38+
secrets:
39+
- secret_id: 252caf59-a6ab-4d6a-b031-c410ea30461f
40+
register: secret_from_id
41+
42+
- name: Check secret from ID
43+
ansible.builtin.debug:
44+
msg: "Secret from ID: {{ secret_from_id }}"
45+
46+
- name: Get secret from name
47+
devolutions.dvls.fetch_secrets:
48+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
49+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
50+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
51+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
52+
secrets:
53+
- secret_name: fetch-secret-from-name
54+
register: secret_from_name
55+
56+
- name: Check secret from name
57+
ansible.builtin.debug:
58+
msg: "Secret from name: {{ secret_from_name }}"
59+
60+
- name: Create default secret
61+
devolutions.dvls.create_secret:
62+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
63+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
64+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
65+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
66+
secret:
67+
secret_path: "tests\\create-secrets"
68+
secret_name: "default-secret"
69+
value: "{{ lookup('ansible.builtin.password', '/dev/null', chars=['ascii_lowercase', 'digits'], length=32) }}"
70+
71+
- name: Get updated secret
72+
devolutions.dvls.fetch_secrets:
73+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
74+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
75+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
76+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
77+
secrets:
78+
- secret_name: default-secret
79+
register: created_secret
80+
81+
- name: Check created secret
82+
ansible.builtin.debug:
83+
msg: "Created secret: {{ created_secret }}"
84+
85+
- name: Updating an already existing secret
86+
devolutions.dvls.create_secret:
87+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
88+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
89+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
90+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
91+
secret:
92+
secret_path: "tests\\create-secrets"
93+
secret_name: "default-secret"
94+
value: "{{ lookup('ansible.builtin.password', '/dev/null', chars=['ascii_lowercase', 'digits'], length=32) }}"
95+
96+
- name: Get updated secret
97+
devolutions.dvls.fetch_secrets:
98+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
99+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
100+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
101+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
102+
secrets:
103+
- secret_name: default-secret
104+
register: updated_secret
105+
106+
- name: Check secret from name
107+
ansible.builtin.debug:
108+
msg: "Updated secret: {{ updated_secret }}"
109+
110+
- name: Create secret specifying type
111+
devolutions.dvls.create_secret:
112+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
113+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
114+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
115+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
116+
secret:
117+
secret_path: "tests\\create-secrets"
118+
secret_type: "Credential"
119+
secret_subtype: "Default"
120+
secret_name: "default-secret-type"
121+
value: "{{ lookup('ansible.builtin.password', '/dev/null', chars=['ascii_lowercase', 'digits'], length=32) }}"
122+
123+
- name: Get secrets from path
124+
devolutions.dvls.fetch_secrets:
125+
server_base_url: "{{ lookup('env', 'DVLS_SERVER_BASE_URL') }}"
126+
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
127+
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
128+
vault_id: "{{ lookup('env', 'DVLS_VAULT_ID') }}"
129+
secrets:
130+
- secret_path: "tests\\create-secrets"
131+
register: secrets_from_path
132+
133+
- name: Check secrets from path
134+
ansible.builtin.debug:
135+
msg: "secret in path: {{ secrets_from_path }}"

‎tests/integration/test_get_vault.yml‎ renamed to ‎tests/integration/test_manage_server.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@
88
app_key: "{{ lookup('env', 'DVLS_APP_KEY') }}"
99
app_secret: "{{ lookup('env', 'DVLS_APP_SECRET') }}"
1010
register: server
11+
12+
- name: Check server version
13+
ansible.builtin.debug:
14+
var: server.version

0 commit comments

Comments
 (0)