Merge pull request #272 from ansible-lockdown/devel

Galaxy compliance
ansible-lockdown · Mar 21, 2023 · af2446a · af2446a
2 parents cd32ffe + 49117ef
commit af2446a
Show file tree

Hide file tree

Showing 13 changed files with 239 additions and 248 deletions.
diff --git a/.github/workflows/linux_benchmark_testing.yml b/.github/workflows/linux_benchmark_testing.yml
@@ -6,106 +6,106 @@ name: linux_benchmark_pipeline
 # Triggers the workflow on push or pull request
 # events but only for the devel branch
 on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches:
-      - devel
-      - main
-    paths:
-      - '**.yml'
-      - '**.sh'
-      - '**.j2'
-      - '**.ps1'
-      - '**.cfg'
+    pull_request_target:
+        types: [opened, reopened, synchronize]
+        branches:
+            - devel
+            - main
+        paths:
+            - '**.yml'
+            - '**.sh'
+            - '**.j2'
+            - '**.ps1'
+            - '**.cfg'
 
 # A workflow run is made up of one or more jobs
 # that can run sequentially or in parallel
 jobs:
   # This will create messages for first time contributers and direct them to the Discord server
-  welcome:
-      runs-on: ubuntu-latest
-
-      steps:
-          - uses: actions/first-interaction@main
-            with:
-                repo-token: ${{ secrets.GITHUB_TOKEN }}
-                pr-message: |-
-                  Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown! 
-                  Please join in the conversation happening on the [Discord Server](https://discord.io/ansible-lockdown) as well.
+    welcome:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/first-interaction@main
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  pr-message: |-
+                    Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown!
+                    Please join in the conversation happening on the [Discord Server](https://discord.io/ansible-lockdown) as well.
   # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    env: 
-      ENABLE_DEBUG: false
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, 
-      # so your job can access it
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Add_ssh_key
-        working-directory: .github/workflows
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-          PRIVATE_KEY: "${{ secrets.SSH_PRV_KEY }}"
-        run: |
-          mkdir .ssh
-          chmod 700 .ssh
-          echo $PRIVATE_KEY > .ssh/github_actions.pem
-          chmod 600 .ssh/github_actions.pem
-
-### Build out the server
-      - name: Terraform_Init
-        working-directory: .github/workflows
-        run: terraform init
-
-      - name: Terraform_Validate
-        working-directory: .github/workflows
-        run: terraform validate
-
-      - name: Terraform_Apply
-        working-directory: .github/workflows
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        run: terraform apply -var-file "OS.tfvars" -var-file "github_vars.tfvars" --auto-approve -input=false
-
-## Debug Section
-      - name: DEBUG - Show Ansible hostfile
-        if: env.ENABLE_DEBUG == 'true'
-        working-directory: .github/workflows
-        run: cat hosts.yml
-
-# Aws deployments taking a while to come up insert sleep or playbook fails
-
-      - name: Sleep for 60 seconds
-        run: sleep 60s
-        shell: bash
-
-# Run the ansible playbook
-      - name: Run_Ansible_Playbook
-        uses: arillso/action.playbook@master
-        with:
-          playbook: site.yml
-          inventory: .github/workflows/hosts.yml
-          galaxy_file: collections/requirements.yml
-          private_key: ${{ secrets.SSH_PRV_KEY }}
-#          verbose: 3
-        env:
-          ANSIBLE_HOST_KEY_CHECKING: "false"
-          ANSIBLE_DEPRECATION_WARNINGS: "false"
-
-# Remove test system - User secrets to keep if necessary
+    build:
+        # The type of runner that the job will run on
+        runs-on: ubuntu-latest
 
-      - name: Terraform_Destroy
-        working-directory: .github/workflows
-        if: always() && env.ENABLE_DEBUG == 'false'
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        run: terraform destroy -var-file "github_vars.tfvars" -var-file "OS.tfvars" --auto-approve -input=false
+            ENABLE_DEBUG: false
+
+        # Steps represent a sequence of tasks that will be executed as part of the job
+        steps:
+            # Checks-out your repository under $GITHUB_WORKSPACE, 
+            # so your job can access it
+            - uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.event.pull_request.head.sha }}
+
+            - name: Add_ssh_key
+              working-directory: .github/workflows
+              env:
+                  SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+                  PRIVATE_KEY: "${{ secrets.SSH_PRV_KEY }}"
+              run: |
+                  mkdir .ssh
+                  chmod 700 .ssh
+                  echo $PRIVATE_KEY > .ssh/github_actions.pem
+                  chmod 600 .ssh/github_actions.pem
+
+      ### Build out the server
+            - name: Terraform_Init
+              working-directory: .github/workflows
+              run: terraform init
+
+            - name: Terraform_Validate
+              working-directory: .github/workflows
+              run: terraform validate
+
+            - name: Terraform_Apply
+              working-directory: .github/workflows
+              env:
+                  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+              run: terraform apply -var-file "OS.tfvars" -var-file "github_vars.tfvars" --auto-approve -input=false
+
+      ## Debug Section
+            - name: DEBUG - Show Ansible hostfile
+              if: env.ENABLE_DEBUG == 'true'
+              working-directory: .github/workflows
+              run: cat hosts.yml
+
+      # Aws deployments taking a while to come up insert sleep or playbook fails
+
+            - name: Sleep for 60 seconds
+              run: sleep 60s
+              shell: bash
+
+      # Run the ansible playbook
+            - name: Run_Ansible_Playbook
+              uses: arillso/action.playbook@master
+              with:
+                  playbook: site.yml
+                  inventory: .github/workflows/hosts.yml
+                  galaxy_file: collections/requirements.yml
+                  private_key: ${{ secrets.SSH_PRV_KEY }}
+      #           verbose: 3
+              env:
+                  ANSIBLE_HOST_KEY_CHECKING: "false"
+                  ANSIBLE_DEPRECATION_WARNINGS: "false"
+
+      # Remove test system - User secrets to keep if necessary
+
+            - name: Terraform_Destroy
+              working-directory: .github/workflows
+              if: always() && env.ENABLE_DEBUG == 'false'
+              env:
+                  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+              run: terraform destroy -var-file "github_vars.tfvars" -var-file "OS.tfvars" --auto-approve -input=false
diff --git a/.github/workflows/update_galaxy.yml b/.github/workflows/update_galaxy.yml
@@ -7,15 +7,15 @@ name: update galaxy
 # Controls when the action will run.
 # Triggers the workflow on merge request events to the main branch
 on:
-  push:
-    branches:
-      - main
+    push:
+        branches:
+            - main
 jobs:
     update_role:
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v3
-        - uses: robertdebock/galaxy-action@master
-          with:
-            galaxy_api_key: ${{ secrets.GALAXY_API_KEY }}
-            git_branch: main
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: robertdebock/galaxy-action@master
+              with:
+                  galaxy_api_key: ${{ secrets.GALAXY_API_KEY }}
+                  git_branch: main
diff --git a/.yamllint b/.yamllint
@@ -1,33 +1,25 @@
 ---
+# Based on ansible-lint config
 extends: default
 
-ignore: |
-    tests/
-    molecule/
-    .github/
-    .gitlab-ci.yml
-    *molecule.yml
-
 rules:
-    indentation:
-        # Requiring 4 space indentation
-        spaces: 4
-        # Requiring consistent indentation within a file, either indented or not
-        indent-sequences: consistent
-    braces:
-        max-spaces-inside: 1
-        level: error
-    brackets:
-        max-spaces-inside: 1
-        level: error
-    empty-lines:
-        max: 1
-    line-length: disable
-    key-duplicates: enable
-    new-line-at-end-of-file: enable
-    new-lines:
-        type: unix
-    trailing-spaces: enable
-    truthy:
-        allowed-values: ['true', 'false']
-        check-keys: false
+  braces: {max-spaces-inside: 1, level: error}
+  brackets: {max-spaces-inside: 1, level: error}
+  colons: {max-spaces-after: -1, level: error}
+  commas: {max-spaces-after: -1, level: error}
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines: {max: 3, level: error}
+  hyphens: {level: error}
+  indentation:
+     # Requiring 4 space indentation
+     spaces: 4
+     # Requiring consistent indentation within a file, either indented or not
+     indent-sequences: consistent
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines: {type: unix}
+  trailing-spaces: disable
+  truthy: disable
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,10 @@
 # Changes to rhel8CIS
 
+## 1.5.6
+
+- updates to yamllint to increase galaxy score - doesnt honour local files or exclusions
+- removed blank lines from all
+
 ## 1.5.5
 
 - improved conditional for 1.1.2.1

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -5,26 +5,25 @@
   gather_facts: true
 
   vars:
-    role_name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
-    ansible_user: root
-    system_is_container: true
-    rhel8cis_selinux_disable: true
-    rhel8cis_rule_5_3_4: false
-    rhel8cis_rule_1_1_10: false
-    rhel8cis_rsyslog_ansiblemanaged: false
-    rhel8cis_rule_3_4_1_3: false
-    rhel8cis_rule_3_4_1_4: false
-    rhel8cis_rule_4_1_1_1: false
-    rhel8cis_rule_4_1_1_2: false
-    rhel8cis_rule_4_1_1_3: false
-    rhel8cis_rule_4_1_1_4: false
-    rhel8cis_rule_4_2_1_2: false
-    rhel8cis_rule_4_2_1_4: false
-    rhel8cis_rule_5_1_1: false
+      role_name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
+      ansible_user: root
+      system_is_container: true
+      rhel8cis_selinux_disable: true
+      rhel8cis_rule_5_3_4: false
+      rhel8cis_rule_1_1_10: false
+      rhel8cis_rsyslog_ansiblemanaged: false
+      rhel8cis_rule_3_4_1_3: false
+      rhel8cis_rule_3_4_1_4: false
+      rhel8cis_rule_4_1_1_1: false
+      rhel8cis_rule_4_1_1_2: false
+      rhel8cis_rule_4_1_1_3: false
+      rhel8cis_rule_4_1_1_4: false
+      rhel8cis_rule_4_2_1_2: false
+      rhel8cis_rule_4_2_1_4: false
+      rhel8cis_rule_5_1_1: false
 
   pre_tasks:
   tasks:
-    - name: "Include tasks"
-      ansible.builtin.include_role:
-        name: "{{ role_name }}"
-
+      - name: "Include tasks"
+        ansible.builtin.include_role:
+            name: "{{ role_name }}"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -3,32 +3,31 @@
 # https://molecule.readthedocs.io/en/latest/
 
 driver:
-  name: docker
+    name: docker
 
 platforms:
-  - name: ubi8
-    image: registry.access.redhat.com/ubi8/ubi-init
-    pre_build_image: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    privileged: true
-    command: "/usr/sbin/init"
-    capabilities:
-      - SYS_ADMIN
+    - name: ubi8
+      image: registry.access.redhat.com/ubi8/ubi-init
+      pre_build_image: true
+      volumes:
+          - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      privileged: true
+      command: "/usr/sbin/init"
+      capabilities:
+          - SYS_ADMIN
 
 provisioner:
-  name: ansible
-  config_options:
-    defaults:
-      interpreter_python: auto_silent
-      callbacks_enabled: profile_tasks, timer
+    name: ansible
+    config_options:
+        defaults:
+            interpreter_python: auto_silent
+            callbacks_enabled: profile_tasks, timer
 
 lint: |
-  set -e
-  yamllint .
-  ansible-lint
-  flake8
+    set -e
+    yamllint .
+    ansible-lint
+    flake8
 
 verifier:
-  name: ansible
-
+    name: ansible