Refactor Workflow Linter

.github/workflows/lint-ci.yml

@@ -3,14 +3,15 @@
 name: CI-Lint
 
 on:
-  push:
+  pull_request:
     paths:
       - "lint-workflow/**"
+      - "lint-workflow-v2/**"
   workflow_dispatch: {}
 
 jobs:
-  CI:
-    name: CI
+  ci-lint:
+    name: CI workflow-linter (v1)
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -31,3 +32,31 @@ jobs:
       - name: Test lint
         working-directory: lint-workflow
         run: pipenv run pytest tests
+
+
+  ci-lint-v2:
+    name: CI workflow-linter (v2)
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Set up Python
+        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        working-directory: lint-workflow-v2
+        run: |
+          python -m pip install --upgrade pip
+          pip install pipenv
+          pipenv install --dev
+
+      - name: Test lint
+        working-directory: lint-workflow-v2
+        run: pipenv run pytest tests --cov=src
+
+      - name: Check type hinting
+        working-directory: lint-workflow-v2
+        run: pipenv run pytype src

lint-workflow-v2/.gitignore

@@ -0,0 +1,7 @@
+.coverage
+dist
+
+## Dev Environments
+Session.vim
+flake.nix
+flake.lock

lint-workflow-v2/.yamllint.yml

@@ -0,0 +1,36 @@
+---
+
+extends: default
+
+rules:
+  braces:
+    level: warning
+  brackets:
+    level: warning
+  colons:
+    level: warning
+  commas:
+    level: warning
+  comments:
+    min-spaces-from-content: 1
+  empty-lines:
+    level: warning
+  hyphens:
+    level: warning
+  indentation:
+    level: warning
+    spaces: 2
+  key-duplicates:
+    level: warning
+  line-length:
+    level: warning
+    max: 120
+  new-line-at-end-of-file:
+    level: warning
+  new-lines:
+    level: warning
+  trailing-spaces:
+    level: warning
+  truthy:
+    check-keys: false
+    level: warning

lint-workflow-v2/Pipfile

@@ -0,0 +1,24 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+pyyaml = "*"
+urllib3 = "*"
+pydantic = "*"
+"ruamel.yaml" = "*"
+dataclasses-json = "*"
+
+[dev-packages]
+black = "*"
+pytest = "*"
+coverage = "*"
+pytest-cov = "*"
+pylint = "*"
+pytype = "*"
+hatchling = "*"
+build = "*"
+
+[requires]
+python_version = "3.11"

lint-workflow-v2/README.md

@@ -0,0 +1,146 @@
+# Bitwarden Workflow Linter
+
+## Installation
+
+## PyPi
+```
+Not yet implemented
+```
+
+### Locally
+```
+git clone [email protected]:bitwarden/gh-actions.git
+cd gh-actions/lint-workflow-v2
+
+pip install -e .
+```
+
+## Usage
+### Setup settings.yaml
+
+If a non-default configuration is desired (different than `src/bitwarden_workflow_linter/default_settings.yaml`), copy
+the below and create a `settings.yaml` in the directory that `bwwl` will be running from.
+
+```yaml
+enabled_rules:
+  - bitwarden_workflow_linter.rules.name_exists.RuleNameExists
+  - bitwarden_workflow_linter.rules.name_capitalized.RuleNameCapitalized
+  - bitwarden_workflow_linter.rules.pinned_job_runner.RuleJobRunnerVersionPinned
+  - bitwarden_workflow_linter.rules.job_environment_prefix.RuleJobEnvironmentPrefix
+  - bitwarden_workflow_linter.rules.step_pinned.RuleStepUsesPinned
+
+approved_actions_path: default_actions.json
+```
+
+
+```
+usage: bwwl [-h] [-v] {lint,actions} ...
+
+positional arguments:
+  {lint,actions}
+    lint          Verify that a GitHub Action Workflow follows all of the Rules.
+    actions       Add or Update Actions in the pre-approved list.
+
+options:
+  -h, --help      show this help message and exit
+  -v, --verbose
+```
+
+## Development
+### Requirements
+
+- Python 3.11
+- pipenv
+
+### Setup
+
+```
+pipenv install --dev
+pipenv shell
+```
+
+### Testing
+
+All built-in `src/bitwarden_workflow_linter/rules` should have 100% code coverage and we should shoot for an overall coverage of 80%+.
+We are lax on the
+[imperative shell](https://www.destroyallsoftware.com/screencasts/catalog/functional-core-imperative-shell)
+(code interacting with other systems; ie. disk, network, etc), but we strive to maintain a high coverage over the
+functional core (objects and models).
+
+```
+pipenv shell
+pytest tests --cov=src
+```
+
+### Code Reformatting
+
+We adhere to PEP8 and use `black` to maintain this adherence. `black` should be run on any change being merged
+to `main`.
+
+```
+pipenv shell
+black .
+```
+
+### Linting
+
+We loosely use [Google's Python style guide](https://google.github.io/styleguide/pyguide.html), but yield to
+`black` when there is a conflict
+
+```
+pipenv shell
+pylint --rcfile pylintrc src/ tests/
+```
+
+### Add a new Rule
+
+A new Rule is created by extending the Rule base class and overriding the `fn(obj: Union[Workflow, Job, Step])` method.
+Available attributes of `Workflows`, `Jobs` and `Steps` can be found in their definitons under `src/models`.
+
+For a simple example, we'll take a look at enforcing the existence of the `name` key in a Job. This is already done by
+default with the src.rules.name_exists.RuleNameExists, but provides a simple enough example to walk through.
+
+```python
+from typing import Union, Tuple
+
+from ..rule import Rule
+from ..models.job import Job
+from ..models.workflow import Workflow
+from ..models.step import Step
+from ..utils import LintLevels, Settings
+
+
+class RuleJobNameExists(Rule):
+    def __init__(self, settings: Settings = None) -> None:
+        self.message = "name must exist"
+        self.on_fail: LintLevels = LintLevels.ERROR
+        self.compatibility: List[Union[Workflow, Job, Step]] = [Job]
+        self.settings: Settings = settings
+
+    def fn(self, obj: Job) -> Tuple[bool, str]:
+        """<doc block goes here> """
+        if obj.name is not None:
+            return True, ""
+        return False, self.message
+```
+
+By default, a new Rule needs five things:
+
+- `self.message`: The message to return to the user on a lint failure
+- `self.on_fail`: The level of failure on a lint failure (NONE, WARNING, ERROR).
+  NONE and WARNING will exit with a code of 0 (unless using `strict` mode for WARNING).
+  ERROR will exit with a non-zero exit code
+- `self.compatibility`: The list of objects this rule is compatible with. This is used to create separate instances of
+  the Rule for each object in the Rules collection.
+- `self.settings`: In general, this should default to what is shown here, but allows for overrides
+- `self.fn`: The function doing the actual work to check the object and enforce the standard.
+
+`fn` can be as simple or as complex as it needs to be to run a check on a _single_ object. This linter currently does
+not support Rules that check against multiple objects at a time OR file level formatting (one empty between each step or
+two empty lines between each job)
+
+
+### ToDo
+
+- [ ] Add Rule to assert correct format for single line run
+

lint-workflow-v2/Taskfile.yml

@@ -0,0 +1,71 @@
+# https://taskfile.dev
+
+version: '3'
+
+tasks:
+  fmt:
+    silent: true
+    cmds:
+      - pipenv run black .
+
+  lint:
+    silent: true
+    cmds:
+      - pipenv run pylint --rcflie pylintrc {{.CLI_ARGS}}
+
+  type:
+    silent: true
+    cmds:
+      - pipenv run pytype src
+
+  update:
+    silent: true
+    cmds:
+      - |
+        deps=$(pipenv requirements --exclude-markers | tail -n +2 | awk '{print "\t\""$0"\","}')
+        export DEPS=$(printf "$deps")
+        envsubst < pyproject.toml.tpl > pyproject.toml
+
+  install:
+    silent: true
+    cmds:
+      - task: update
+      - pipenv run python -m pip install -e .
+
+  test:unit:
+    cmds:
+      - pipenv run pytest tests
+
+  test:unit:single:
+    cmds:
+      - pipenv run pytest {{.CLI_ARGS}}
+
+  test:cov:
+    cmds:
+      - pipenv run pytest --cov-report term --cov=src tests
+
+  test:cov:detailed:
+    cmds:
+      - pipenv run pytest --cov-report term-missing --cov=src tests
+
+  test:e2e:lint:
+    cmds:
+      - pipenv run bwwl lint --files tests/fixtures
+
+  test:e2e:lint:single:
+    cmds:
+      - pipenv run bwwl lint --files tests/fixtures/test_a.yml
+
+  test:e2e:actions:add:
+    cmds:
+      - pipenv run bwwl actions --output test.json add bitwarden/sm-action
+
+  test:e2e:actions:update:
+    cmds:
+      - pipenv run bwwl actions --output test.json update
+
+  dist:
+    silent: true
+    cmds:
+      - task: update
+      - pipenv run python -m build

lint-workflow-v2/action.yml

@@ -0,0 +1,32 @@
+name: 'Lint Workflow'
+description: 'Lints GitHub Actions Workflow'
+inputs:
+  workflows:
+    description: "Path to workflow file(s)"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Install dependencies
+      run: pip install --user yamllint
+      shell: bash
+
+    - name: Setup
+      id: setup 
+      run: |
+        FORMAT_PATH=$(echo ${{ inputs.workflows }} | sed 's/ *$//')
+        echo "path=$FORMAT_PATH" >> $GITHUB_OUTPUT
+      shell: bash
+
+    - name: Python lint
+      run: python ${{ github.action_path }}/lint.py "${{ steps.setup.outputs.path }}"
+      shell: bash
+
+    - name: YAML lint
+      run: |
+        WORKFLOWS=($(echo "${{ steps.setup.outputs.path }}" | tr ' ' '\n'))
+        for WORKFLOW in "${WORKFLOWS[@]}"; do
+          yamllint -f colored -c ${{ github.action_path }}/.yamllint.yml $WORKFLOW
+        done
+      shell: bash
+      working-directory: ${{ github.workspace }}