Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .flake8

This file was deleted.

7 changes: 3 additions & 4 deletions .github/actions/terraform-deploy-sm2a/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ runs:
using: "composite"

steps:
- name: Set up Python
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
- name: Set up uv
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
with:
python-version: "3.11"
cache: "pip"
enable-cache: true

- name: Setup Terraform
uses: hashicorp/setup-terraform@ed3a0531877aca392eb870f440d9ae7aba83a6bd #v1.4.0
Expand Down
39 changes: 28 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,69 @@
version: 2
updates:

- package-ecosystem: "uv"
directory: "/"
- package-ecosystem: uv
directory: /
cooldown:
default-days: 5
semver-major-days: 30
semver-minor-days: 7
schedule:
interval: weekly
groups:
all:
python-dependencies:
patterns:
- "*"
commit-message:
prefix: "chore(deps):"

- package-ecosystem: "terraform"
directory: "/"
- package-ecosystem: terraform
directory: /
cooldown:
default-days: 7
schedule:
interval: weekly
groups:
all:
terraform:
patterns:
- "*"
commit-message:
prefix: "build(deps):"

- package-ecosystem: "docker"
directory: "/"
- package-ecosystem: docker
directory: /
cooldown:
default-days: 7
schedule:
interval: weekly
groups:
docker:
patterns:
- "*"
commit-message:
prefix: "chore(deps):"

- package-ecosystem: "github-actions"
directory: "/"
- package-ecosystem: github-actions
directory: /
cooldown:
default-days: 7
schedule:
interval: "weekly"
groups:
all:
github-actions:
patterns:
- "*"
commit-message:
prefix: "ci(deps):"

- package-ecosystem: pre-commit
directory: /
cooldown:
default-days: 7
schedule:
interval: "weekly"
groups:
pre-commit:
patterns:
- "*"
commit-message:
prefix: "chore(deps):"
22 changes: 12 additions & 10 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0

- uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 #v5.4.2
- uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
name: Setup uv
with:
python-version: 3.12
enable-cache: true

- name: Run uv sync
run: uv sync --all-groups
run: uv sync --locked --all-groups

- name: Test Airflow DAGs
run: |
export AIRFLOW_HOME=/tmp
uv run airflow db migrate
uv run pytest

define-environment:
name: Set ✨ environment ✨
needs: [gitflow-enforcer, test-dags]
Expand Down Expand Up @@ -75,13 +75,14 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
lfs: "true"
submodules: "recursive"
persist-credentials: false

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 #v2.2.0
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c #v6.2.3
with:
role-to-assume: ${{ secrets.DEPLOYMENT_ROLE_ARN }}
role-session-name: "veda-airflow-github-development-planner"
Expand All @@ -108,13 +109,14 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
lfs: "true"
submodules: "recursive"
persist-credentials: false

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 #v2.2.0
uses: aws-actions/configure-aws-credentials@e6de054238d6b7531b4efff3b6587d9aade6a06c #v6.2.3
with:
role-to-assume: ${{ secrets.DEPLOYMENT_ROLE_ARN }}
role-session-name: "veda-airflow-github-${{ needs.define-environment.outputs.env_name }}-deployment"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
contents: write # Required to create release
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: Bump version and push tag
id: tag_version
uses: mathieudutour/github-tag-action@a22cf08638b34d5badda920f9daf6e72c477b07b #v6.2
Expand Down
29 changes: 22 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
repos:
- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black
args: [--target-version=py38]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.0.0
rev: v6.0.0
hooks:
- id: check-yaml
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.16.1
hooks:
- id: ruff-check
args: [--fix]
- id: ruff-format
types_or: [python, pyi, pyproject]

- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.23.2
hooks:
- id: flake8
- id: markdownlint-cli2
args:
- "--fix"
- "--config"
- "pyproject.toml"
- "--configPointer"
- "/tool/markdownlint-cli2"
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ sm2a-local-build:
sm2a-deploy:
ifeq ($(GITHUB_ACTIONS_ENV),true)
@echo "Installing the deployment dependency"
pip install -r ./deploy_requirements.txt
uv sync --locked --group deploy
@echo "Deploying SM2A"
python scripts/generate_env_file.py --secret-id ${SECRET_NAME} --env-file ${ENV_FILE}
uv run scripts/generate_env_file.py --secret-id ${SECRET_NAME} --env-file ${ENV_FILE}
@bash -c './scripts/deploy.sh ${ENV_FILE} <<< init'
@bash -c './scripts/deploy.sh ${ENV_FILE} <<< deploy'
else
Expand All @@ -63,9 +63,9 @@ endif

sm2a-plan:
@echo "Installing the deployment dependency"
pip install -r ./deploy_requirements.txt
uv sync --locked --group deploy
@echo "Shopwing Plan for Deploying SM2A"
python scripts/generate_env_file.py --secret-id ${SECRET_NAME} --env-file ${ENV_FILE}
uv run scripts/generate_env_file.py --secret-id ${SECRET_NAME} --env-file ${ENV_FILE}
@bash -c './scripts/deploy.sh ${ENV_FILE} <<< init'
@bash -c './scripts/deploy.sh ${ENV_FILE} <<< plan'

Expand Down
Loading
Loading