diff --git a/.github/workflows/conventional-commit.yaml b/workflows/conventional-commit.yaml similarity index 100% rename from .github/workflows/conventional-commit.yaml rename to workflows/conventional-commit.yaml diff --git a/.github/workflows/markdownlint.yaml b/workflows/markdownlint.yaml similarity index 96% rename from .github/workflows/markdownlint.yaml rename to workflows/markdownlint.yaml index da9ba37..cd1052e 100644 --- a/.github/workflows/markdownlint.yaml +++ b/workflows/markdownlint.yaml @@ -48,7 +48,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 - name: Lint Markdown files - uses: DavidAnson/markdownlint-cli2-action@v14 + uses: 'DavidAnson/markdownlint-cli2-action@v14' with: config: ${{ inputs.config_file }} fix: ${{ inputs.fix }} diff --git a/.github/workflows/pre-commit.yaml b/workflows/pre-commit.yaml similarity index 100% rename from .github/workflows/pre-commit.yaml rename to workflows/pre-commit.yaml diff --git a/.github/workflows/puppet-build.yaml b/workflows/puppet-build.yaml similarity index 80% rename from .github/workflows/puppet-build.yaml rename to workflows/puppet-build.yaml index 518816d..e1cf207 100644 --- a/.github/workflows/puppet-build.yaml +++ b/workflows/puppet-build.yaml @@ -17,6 +17,11 @@ description: The version of Puppet to use in PDK required: false type: string + ruby_version: + description: The version of Ruby to use for the run. + default: '3.2' + required: false + type: string timeout_minutes: description: The maximum time (in minutes) for a job to run. default: 5 @@ -37,7 +42,7 @@ jobs: steps: - name: 'Checkout repo' uses: 'actions/checkout@v4' - - name: 'Set up Ruby' + - name: "Set up Ruby ${{ inputs.ruby_version }}" uses: 'ruby/setup-ruby@v1.161.0' env: BUNDLE_SILENCE_ROOT_WARNING: '1' @@ -45,10 +50,10 @@ jobs: PUPPET_GEM_VERSION: "~> ${{ inputs.puppet_version }}" with: bundler-cache: true - ruby-version: '3.2' + ruby-version: "${{ inputs.ruby_version }}" rubygems: 'latest' - name: 'Module build' run: 'bundle exec pdk build --force' - name: 'Test module install' - run: 'bundle exec puppet module install pkg/${{ inputs.puppet_package_name }}-*.tar.gz' + run: "bundle exec puppet module install pkg/${{ inputs.puppet_package_name }}-*.tar.gz" timeout-minutes: ${{ inputs.timeout_minutes }} diff --git a/.github/workflows/puppet-forge-deploy.yml b/workflows/puppet-forge-deploy.yaml similarity index 85% rename from .github/workflows/puppet-forge-deploy.yml rename to workflows/puppet-forge-deploy.yaml index 9c19feb..1f7e63d 100644 --- a/.github/workflows/puppet-forge-deploy.yml +++ b/workflows/puppet-forge-deploy.yaml @@ -12,6 +12,11 @@ description: The version of Puppet to use in PDK required: false type: string + ruby_version: + description: The version of Ruby to use for the run. + default: '3.2' + required: false + type: string timeout_minutes: description: The maximum time (in minutes) for a job to run. default: 5 @@ -35,7 +40,7 @@ jobs: steps: - name: 'Checkout repo' uses: 'actions/checkout@v4' - - name: 'Set up Ruby' + - name: "Set up Ruby ${{ inputs.ruby_version }}" uses: 'ruby/setup-ruby@v1.161.0' env: BUNDLE_SILENCE_ROOT_WARNING: '1' @@ -43,7 +48,7 @@ jobs: PUPPET_GEM_VERSION: "~> ${{ inputs.puppet_version }}" with: bundler-cache: true - ruby-version: '3.2' + ruby-version: "${{ inputs.ruby_version }}" rubygems: 'latest' - name: 'Module build' run: 'bundle exec pdk build --force' diff --git a/.github/workflows/puppet-lint.yaml b/workflows/puppet-lint.yaml similarity index 83% rename from .github/workflows/puppet-lint.yaml rename to workflows/puppet-lint.yaml index 43e5c77..2db7bbc 100644 --- a/.github/workflows/puppet-lint.yaml +++ b/workflows/puppet-lint.yaml @@ -12,6 +12,11 @@ description: The version of Puppet to use in PDK required: false type: string + ruby_version: + description: The version of Ruby to use for the run. + default: '3.2' + required: false + type: string timeout_minutes: description: The maximum time (in minutes) for a job to run. default: 5 @@ -32,7 +37,7 @@ jobs: steps: - name: 'Checkout repo' uses: 'actions/checkout@v4' - - name: 'Set up Ruby' + - name: "Set up Ruby ${{ inputs.ruby_version }}" uses: 'ruby/setup-ruby@v1.161.0' env: BUNDLE_SILENCE_ROOT_WARNING: '1' @@ -40,7 +45,7 @@ jobs: PUPPET_GEM_VERSION: "~> ${{ inputs.puppet_version }}" with: bundler-cache: true - ruby-version: '3.2' + ruby-version: "${{ inputs.ruby_version }}" rubygems: 'latest' - name: 'Run static analysis' run: bundle exec pdk validate --puppet-version=${{ inputs.puppet_version }} diff --git a/.github/workflows/puppet-unit-test.yaml b/workflows/puppet-unit-test.yaml similarity index 93% rename from .github/workflows/puppet-unit-test.yaml rename to workflows/puppet-unit-test.yaml index 48e6a23..f15da81 100644 --- a/.github/workflows/puppet-unit-test.yaml +++ b/workflows/puppet-unit-test.yaml @@ -35,7 +35,7 @@ jobs: steps: - name: 'Checkout repo' uses: 'actions/checkout@v4' - - name: 'Set up Ruby' + - name: "Set up Ruby ${{ matrix.ruby }}" uses: 'ruby/setup-ruby@v1.161.0' env: BUNDLE_SILENCE_ROOT_WARNING: '1' @@ -43,7 +43,7 @@ jobs: PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}" with: bundler-cache: true - ruby-version: ${{ matrix.ruby }} + ruby-version: "${{ matrix.ruby }}" rubygems: 'latest' - name: 'Run unit tests' run: 'bundle exec pdk test unit --puppet-version=${{ matrix.puppet }} -v' diff --git a/.github/workflows/python-deploy-to-pypi.yaml b/workflows/python-deploy-to-pypi.yaml similarity index 87% rename from .github/workflows/python-deploy-to-pypi.yaml rename to workflows/python-deploy-to-pypi.yaml index cbbc2cc..f3f1fd0 100644 --- a/.github/workflows/python-deploy-to-pypi.yaml +++ b/workflows/python-deploy-to-pypi.yaml @@ -14,6 +14,11 @@ name: pypi_deploy description: The runner group on which jobs will run. required: false type: string + python_version: + description: The version of Python to use for the run. + default: '3.11' + required: false + type: string timeout_minutes: description: The maximum time (in minutes) for a job to run. default: 5 @@ -43,11 +48,11 @@ jobs: uses: actions/checkout@v4 - name: Install poetry run: pipx install poetry - - name: Set up Python 3.11 + - name: "Set up Python ${{ inputs.python_version }}" uses: actions/setup-python@v4 with: cache: poetry - python-version: '3.11' + python-version: "${{ inputs.python_version }}" - name: Configure Poetry run: poetry config virtualenvs.in-project true - name: Install dependencies diff --git a/.github/workflows/python-lint.yaml b/workflows/python-lint.yaml similarity index 87% rename from .github/workflows/python-lint.yaml rename to workflows/python-lint.yaml index 446c943..4a2b051 100644 --- a/.github/workflows/python-lint.yaml +++ b/workflows/python-lint.yaml @@ -14,6 +14,11 @@ name: python-linting description: The runner group on which jobs will run. required: false type: string + python_version: + description: The version of Python to use for the run. + default: '3.11' + required: false + type: string ruff_version: default: '0.1.0' description: The version of ruff to run. @@ -54,11 +59,11 @@ jobs: uses: actions/checkout@v4 - name: Install poetry run: pipx install poetry - - name: Set up Python 3.11 + - name: "Set up Python ${{ inputs.python_version }}" uses: actions/setup-python@v4 with: cache: poetry - python-version: '3.11' + python-version: "${{ inputs.python_version }}" - name: Configure Poetry run: poetry config virtualenvs.in-project true - name: Install dependencies @@ -72,5 +77,5 @@ jobs: if: ${{ inputs.use_ruff }} uses: chartboost/ruff-action@v1 with: - version: ${{ inputs.ruff_version }} + version: "${{ inputs.ruff_version }}" timeout-minutes: ${{ inputs.timeout_minutes }} diff --git a/.github/workflows/python-test-deploy-to-pypi.yaml b/workflows/python-test-deploy-to-pypi.yaml similarity index 87% rename from .github/workflows/python-test-deploy-to-pypi.yaml rename to workflows/python-test-deploy-to-pypi.yaml index cb54aad..be61929 100644 --- a/.github/workflows/python-test-deploy-to-pypi.yaml +++ b/workflows/python-test-deploy-to-pypi.yaml @@ -14,6 +14,11 @@ name: pypi_test_deploy description: The runner group on which jobs will run. required: false type: string + python_version: + description: The version of Python to use for the run. + default: '3.11' + required: false + type: string timeout_minutes: description: The maximum time (in minutes) for a job to run. default: 5 @@ -43,11 +48,11 @@ jobs: uses: actions/checkout@v4 - name: Install poetry run: pipx install poetry - - name: Set up Python 3.11 + - name: "Set up Python ${{ inputs.python_version }}" uses: actions/setup-python@v4 with: cache: poetry - python-version: '3.11' + python-version: "${{ inputs.python_version }}" - name: Configure Poetry run: poetry config virtualenvs.in-project true - name: Install dependencies diff --git a/.github/workflows/python-unit-test.yaml b/workflows/python-unit-test.yaml similarity index 97% rename from .github/workflows/python-unit-test.yaml rename to workflows/python-unit-test.yaml index 01e597c..94a82d9 100644 --- a/.github/workflows/python-unit-test.yaml +++ b/workflows/python-unit-test.yaml @@ -56,7 +56,7 @@ jobs: uses: actions/setup-python@v4 with: cache: poetry - python-version: ${{ matrix.python-version }} + python-version: "${{ matrix.python-version }}" - name: Configure Poetry run: poetry config virtualenvs.in-project true - name: Check pyproject.toml diff --git a/.github/workflows/terraform-lint.yaml b/workflows/terraform-lint.yaml similarity index 89% rename from .github/workflows/terraform-lint.yaml rename to workflows/terraform-lint.yaml index 14a5e03..c26a288 100644 --- a/.github/workflows/terraform-lint.yaml +++ b/workflows/terraform-lint.yaml @@ -33,9 +33,7 @@ jobs: - name: 'Checkout repo' uses: 'actions/checkout@v4' - name: 'Setup TFLint' - uses: terraform-linters/setup-tflint@v4 - - name: 'Run pre-commit' - uses: 'pre-commit/action@v3.0.0' + uses: 'terraform-linters/setup-tflint@v4' - name: 'Run TFLint' run: tflint -c ${{ inputs.tflint_config_path }} timeout-minutes: ${{ inputs.timeout_minutes }} diff --git a/.github/workflows/terraform-static-analyze.yaml b/workflows/terraform-static-analyze.yaml similarity index 97% rename from .github/workflows/terraform-static-analyze.yaml rename to workflows/terraform-static-analyze.yaml index 8c90bf0..f16521a 100644 --- a/.github/workflows/terraform-static-analyze.yaml +++ b/workflows/terraform-static-analyze.yaml @@ -57,7 +57,7 @@ jobs: github_token: ${{ secrets.wf_github_token }} - name: Run Trivy vulnerability scanner in IaC mode if: ${{ inputs.run_trivy == true }} - uses: aquasecurity/trivy-action@0.14.0 + uses: 'aquasecurity/trivy-action@0.14.0' with: scan-type: 'config' hide-progress: false diff --git a/.github/workflows/terraform-validate.yaml b/workflows/terraform-validate.yaml similarity index 89% rename from .github/workflows/terraform-validate.yaml rename to workflows/terraform-validate.yaml index 87ba23b..d102327 100644 --- a/.github/workflows/terraform-validate.yaml +++ b/workflows/terraform-validate.yaml @@ -73,22 +73,22 @@ jobs: - name: Check terragrunt HCL uses: gruntwork-io/terragrunt-action@v2 with: - tf_version: ${{ inputs.terraform_version }} - tg_version: ${{ inputs.terragrunt_version }} + tf_version: "${{ inputs.terraform_version }}" + tg_version: "${{ inputs.terragrunt_version }}" tg_dir: ${{ inputs.working_directory }} tg_command: hclfmt --terragrunt-check --terragrunt-diff - name: Initialize Terraform uses: gruntwork-io/terragrunt-action@v2 with: - tf_version: ${{ inputs.terraform_version }} - tg_version: ${{ inputs.terragrunt_version }} + tf_version: "${{ inputs.terraform_version }}" + tg_version: "${{ inputs.terragrunt_version }}" tg_dir: "${{ inputs.working_directory }}/${{ inputs.terragrunt_directory }}" tg_command: init - name: Validate Terraform uses: gruntwork-io/terragrunt-action@v2 with: - tf_version: ${{ inputs.terraform_version }} - tg_version: ${{ inputs.terragrunt_version }} + tf_version: "${{ inputs.terraform_version }}" + tg_version: "${{ inputs.terragrunt_version }}" tg_dir: "${{ inputs.working_directory }}/${{ inputs.terragrunt_directory }}" tg_command: validate timeout-minutes: ${{ inputs.timeout_minutes }}