Merge pull request #199 from cyberark/remove-unused-ignores

Correct role paths and update ignore files

.github/workflows/ansible-test.yml

@@ -74,7 +74,7 @@ jobs:
       # The docker container has all the pinned dependencies that are required.
       # Explicitly specify the version of Python we want to test
       - name: Run sanity tests
-        run: ansible-test sanity --docker -v --color --python ${{ matrix.python }}
+        run: ansible-test sanity --docker -v --color --python ${{ matrix.python }} --exclude dev/ --exclude ci/ --exclude secrets.yml
         working-directory: ./ansible_collections/cyberark/conjur
 
 ###

.gitignore

@@ -21,6 +21,7 @@ reports
 *.js
 *.html
 output/
+importer_result.json
 
 # Pycache directories and files
 **/__pycache__/

dev/docker-compose.yml

@@ -25,8 +25,8 @@ services:
     volumes:
       - .:/cyberark/dev
       - /cyberark/dev/conjur-intro/
-      - ../roles/conjur_host_identity:/roles/cyberark.conjur.conjur-host-identity/
-      - ../roles/conjur_host_identity/tests:/cyberark/tests/conjur-host-identity/
+      - ../roles/conjur_host_identity:/roles/cyberark.conjur.conjur_host_identity/
+      - ../roles/conjur_host_identity/tests:/cyberark/tests/conjur_host_identity/
       - ../plugins:/root/.ansible/plugins
       - ../tests/conjur_variable:/cyberark/tests/conjur_variable
       - /var/run/docker.sock:/var/run/docker.sock

dev/playbooks/conjur-identity-setup/conjur_role_playbook.yml

@@ -2,7 +2,7 @@
 - name: Configuring conjur identity on remote hosts
   hosts: testapp
   roles:
-    - role: "cyberark.conjur.conjur-host-identity"
+    - role: "cyberark.conjur.conjur_host_identity"
       conjur_account: "{{lookup('env', 'CONJUR_ACCOUNT')}}"
       conjur_appliance_url: "{{lookup('env', 'CONJUR_APPLIANCE_URL')}}"
       conjur_host_factory_token: "{{lookup('env', 'HFTOKEN')}}"

roles/conjur_host_identity/tests/test.sh

@@ -20,15 +20,15 @@ function run_test_case {
 
   docker exec -e HFTOKEN="$(hf_token)" \
     "$(ansible_cid)" bash -ec "
-      cd /cyberark/tests/conjur-host-identity
+      cd /cyberark/tests/conjur_host_identity
 
       # You can add -vvvvv here for debugging
       ansible-playbook test_cases/$test_case/playbook.yml
     "
 
   if [ -d "test_cases/${test_case}/tests/" ]; then
     docker exec "$(ansible_cid)" bash -ec "
-      cd /cyberark/tests/conjur-host-identity
+      cd /cyberark/tests/conjur_host_identity
       py.test --junitxml=./junit/${test_case} --connection docker -v test_cases/${test_case}/tests/test_default.py
     "
   fi

roles/conjur_host_identity/tests/test_cases/bad-ssl-config/playbook.yml

@@ -5,7 +5,7 @@
     - name: Attempt to configure Conjur identity
       block:
         - import_role:
-            name: "cyberark.conjur.conjur-host-identity"
+            name: "cyberark.conjur.conjur_host_identity"
           vars:
             conjur_account: cucumber
             conjur_appliance_url: "https://conjur-proxy-nginx"

roles/conjur_host_identity/tests/test_cases/cleanup-conjur-identity/playbook.yml

@@ -2,7 +2,7 @@
 - name: Configuring Conjur identity on remote hosts
   hosts: testapp
   roles:
-    - role: "cyberark.conjur.conjur-host-identity"
+    - role: "cyberark.conjur.conjur_host_identity"
       conjur_account: "{{lookup('env', 'CONJUR_ACCOUNT')}}"
       conjur_appliance_url: "{{lookup('env', 'CONJUR_APPLIANCE_URL')}}"
       conjur_host_factory_token: "{{lookup('env', 'HFTOKEN')}}"
@@ -13,5 +13,5 @@
 - name: Revoke Conjur identity from remote hosts
   hosts: testapp
   roles:
-    - role: "cyberark.conjur.conjur-host-identity"
+    - role: "cyberark.conjur.conjur_host_identity"
       state: absent

roles/conjur_host_identity/tests/test_cases/configure-conjur-identity/playbook.yml

@@ -2,7 +2,7 @@
 - name: Configuring Conjur identity on remote hosts
   hosts: testapp
   roles:
-    - role: "cyberark.conjur.conjur-host-identity"
+    - role: "cyberark.conjur.conjur_host_identity"
       conjur_account: "{{lookup('env', 'CONJUR_ACCOUNT')}}"
       conjur_appliance_url: "{{lookup('env', 'CONJUR_APPLIANCE_URL')}}"
       conjur_host_factory_token: "{{lookup('env', 'HFTOKEN')}}"

roles/conjur_host_identity/tests/test_cases/misconfig-conjur-identity/playbook.yml

@@ -5,7 +5,7 @@
     - name: Attempt to configure Conjur identity
       block:
         - import_role:
-            name: "cyberark.conjur.conjur-host-identity"
+            name: "cyberark.conjur.conjur_host_identity"
           vars:
             conjur_account: cucumber
             # conjur_appliance_url: "https://conjur-proxy-nginx"

roles/conjur_host_identity/tests/test_cases/not-conjurized/playbook.yml

@@ -13,7 +13,7 @@
     - name: Attempt to configure Conjur identity
       block:
         - import_role:
-            name: "cyberark.conjur.conjur-host-identity"
+            name: "cyberark.conjur.conjur_host_identity"
           vars:
             conjur_account: "{{lookup('env', 'CONJUR_ACCOUNT')}}"
             conjur_appliance_url: "{{lookup('env', 'CONJUR_APPLIANCE_URL')}}"

tests/sanity/ignore-2.10.txt

@@ -1,9 +1,3 @@
-dev/start.sh shebang
 Jenkinsfile shebang
 tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml
 roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
-ci/build_release shebang
-ci/publish_to_galaxy shebang
-ci/test.sh shebang
-secrets.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
-dev/policy/root.yml yamllint:unparsable-with-libyaml

tests/sanity/ignore-2.11.txt

@@ -1,9 +1,3 @@
 Jenkinsfile shebang
-dev/start.sh shebang
 tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml
 roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by summon utility (in Jenkinsfile), not via Python
-ci/build_release shebang
-ci/publish_to_galaxy shebang
-ci/test.sh shebang
-secrets.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
-dev/policy/root.yml yamllint:unparsable-with-libyaml

tests/sanity/ignore-2.12.txt

@@ -1,9 +1,3 @@
 Jenkinsfile shebang
-dev/start.sh shebang
 tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
 roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
-ci/build_release shebang
-ci/publish_to_galaxy shebang
-ci/test.sh shebang
-secrets.yml yamllint:unparsable-with-libyaml # File loaded by Summon utility (in Jenkinsfile), not via Python
-dev/policy/root.yml yamllint:unparsable-with-libyaml

tests/sanity/ignore-2.13.txt

@@ -1,10 +1,2 @@
-ci/build_release shebang
-ci/publish_to_galaxy shebang
-ci/test.sh shebang
-dev/policy/root.yml yamllint:unparsable-with-libyaml
-dev/start.sh shebang
-dev/stop.sh shebang
-dev/util.sh shebang
 Jenkinsfile shebang
 plugins/lookup/conjur_variable.py validate-modules:version-added-must-be-major-or-minor
-secrets.yml yamllint:unparsable-with-libyaml

tests/sanity/ignore-2.14.txt

@@ -1,10 +1,2 @@
-ci/build_release shebang
-ci/publish_to_galaxy shebang
-ci/test.sh shebang
-dev/policy/root.yml yamllint:unparsable-with-libyaml
-dev/start.sh shebang
-dev/stop.sh shebang
-dev/util.sh shebang
 Jenkinsfile shebang
 plugins/lookup/conjur_variable.py validate-modules:version-added-must-be-major-or-minor
-secrets.yml yamllint:unparsable-with-libyaml

tests/sanity/ignore-2.15.txt

@@ -1,10 +1,2 @@
-ci/build_release shebang
-ci/publish_to_galaxy shebang
-ci/test.sh shebang
-dev/policy/root.yml yamllint:unparsable-with-libyaml
-dev/start.sh shebang
-dev/stop.sh shebang
-dev/util.sh shebang
 Jenkinsfile shebang
 plugins/lookup/conjur_variable.py validate-modules:version-added-must-be-major-or-minor
-secrets.yml yamllint:unparsable-with-libyaml

tests/sanity/ignore-2.9.txt

@@ -1,7 +1,3 @@
 Jenkinsfile shebang
-dev/start.sh shebang
 tests/conjur_variable/test.sh shebang
 roles/conjur_host_identity/tests/test.sh shebang
-ci/build_release shebang
-ci/publish_to_galaxy shebang
-ci/test.sh shebang