Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
- name: Run tests modules
env:
TERRAFORM: ${{ matrix.flavour }}
run: pytest -vv -n4 --tb=line --junit-xml=test-results-raw.xml tests
run: pytest -vv -n1 --tb=line --junit-xml=test-results-raw.xml tests

- name: Create report
uses: ./.github/actions/secops-test-report
Expand Down
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ Generate tfdoc (example for `secops-tenant`)
./tools/tfdoc.py blueprints/secops-tenant
```

#### Python Code formatting

```shell
yapf -i . --parallel --recursive --exclude "**/.terraform/" --exclude "tools/" --exclude "tests/" --exclude "**/__pycache__" --exclude "venv/" --exclude "**/data/"
```

### Code reviews

Expand Down
35 changes: 0 additions & 35 deletions blueprints/secops-gke-forwarder/versions.tf

This file was deleted.

35 changes: 0 additions & 35 deletions blueprints/secops-gke-forwarder/versions.tofu

This file was deleted.

6 changes: 3 additions & 3 deletions modules/secops-data-rbac/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
# Fabric release: v39.1.0

terraform {
required_version = ">= 1.10.2"
required_version = ">= 1.11.4"
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
}
provider_meta "google" {
Expand Down
4 changes: 2 additions & 2 deletions modules/secops-data-rbac/versions.tofu
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
}
provider_meta "google" {
Expand Down
6 changes: 3 additions & 3 deletions modules/secops-rules/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
# Fabric release: v39.1.0

terraform {
required_version = ">= 1.10.2"
required_version = ">= 1.11.4"
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
}
provider_meta "google" {
Expand Down
4 changes: 2 additions & 2 deletions modules/secops-rules/versions.tofu
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 6.33.0, < 7.0.0" # tftest
version = ">= 7.0.1, < 8.0.0" # tftest
}
}
provider_meta "google" {
Expand Down
4 changes: 2 additions & 2 deletions pipelines/parsers-as-code/.github/workflows/secops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# Set PYTHONPATH for this specific step
PYTHONPATH: ${{ github.workspace }}
continue-on-error: true
run: python main.py verify-deploy-parsers
run: python script/main.py verify-deploy-parsers
shell: bash

- id: activate-parsers
Expand All @@ -90,7 +90,7 @@ jobs:
# Set PYTHONPATH for this specific step
PYTHONPATH: ${{ github.workspace }}
continue-on-error: true
run: python main.py activate-parsers
run: python script/main.py activate-parsers
shell: bash

# PR comment with parsers deployment result from previous steps
Expand Down
Loading