Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: pin google provider and terraform versions due to breaking changes #151

Merged
merged 7 commits into from
Oct 12, 2023
Merged

fix: pin google provider and terraform versions due to breaking changes #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e3481b
Pin google provider and terraform versions due to breaking changes
nkraemer-sysdig Oct 11, 2023
5277819
chore: propagate verion to examples
Oct 12, 2023
49a3e51
ci: only use examples to determine min/max
Oct 12, 2023
0532857
chore: move trigg-events utils to test
Oct 12, 2023
8c24277
ci: skip minmax for terraform version
Oct 12, 2023
0d805bd
ci: skip minmax for terraform version
Oct 12, 2023
ce25851
ci: skip minmax for terraform version
Oct 12, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Build matrix
id: matrix
run: |
DIRS=$(python -c "import json; import glob; print(json.dumps([x.replace('/versions.tf', '') for x in glob.glob('./**/versions.tf', recursive=True)]))")
DIRS=$(python -c "import json; import glob; print(json.dumps([x.replace('/versions.tf', '') for x in glob.glob('./examples/**/versions.tf', recursive=True)]))")
echo "::set-output name=directories::$DIRS"
outputs:
directories: ${{ steps.matrix.outputs.directories }}
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install Terraform v${{ steps.minMax.outputs.minVersion }}
uses: hashicorp/setup-terraform@v1
with:
terraform_version: ${{ steps.minMax.outputs.minVersion }}
terraform_version: 1.5 # ${{ steps.minMax.outputs.minVersion }}
- name: Install pre-commit dependencies
run: |
pip install pre-commit
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
- name: Install Terraform v${{ matrix.version }}
uses: hashicorp/setup-terraform@v1
with:
terraform_version: ${{ matrix.version }}
terraform_version: 1.5 #${{ matrix.version }}
- name: Install pre-commit dependencies
run: |
pip install pre-commit
Expand Down
8 changes: 4 additions & 4 deletions examples/organization-org_compliance/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,16 @@ module "secure-for-cloud_example_organization" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.46 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.46 |

## Modules
Expand Down
6 changes: 3 additions & 3 deletions examples/organization-org_compliance/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
terraform {
required_version = ">= 0.15.0"
required_version = ">= 0.15.0, < 1.6.0"

required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
configuration_aliases = [google.multiproject]
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
configuration_aliases = [google-beta.multiproject]
}
sysdig = {
Expand Down
8 changes: 4 additions & 4 deletions examples/organization/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,16 @@ module "secure-for-cloud_example_organization" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.21 |

## Modules
Expand Down
6 changes: 3 additions & 3 deletions examples/organization/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
terraform {
required_version = ">= 0.15.0"
required_version = ">= 0.15.0, < 1.6.0"

required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
configuration_aliases = [google.multiproject]
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
configuration_aliases = [google-beta.multiproject]
}
sysdig = {
Expand Down
8 changes: 4 additions & 4 deletions examples/single-project-k8s/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ See [inputs summary](#inputs) or module module [`variables.tf`](./variables.tf)

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >=2.3.0 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | >=2.3.0 |
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.21 |

Expand Down
6 changes: 3 additions & 3 deletions examples/single-project-k8s/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
terraform {
required_version = ">= 0.15.0"
required_version = ">= 0.15.0, < 1.6.0"
required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
sysdig = {
source = "sysdiglabs/sysdig"
Expand Down
8 changes: 4 additions & 4 deletions examples/single-project/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ module "secure-for-cloud_example_single-project" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |
| <a name="provider_sysdig"></a> [sysdig](#provider\_sysdig) | >= 0.5.21 |

## Modules
Expand Down
6 changes: 3 additions & 3 deletions examples/single-project/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
terraform {
required_version = ">= 0.15.0"
required_version = ">= 0.15.0, < 1.6.0"

required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
sysdig = {
source = "sysdiglabs/sysdig"
Expand Down
8 changes: 4 additions & 4 deletions modules/services/cloud-bench-workload-identity/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
terraform {
required_version = ">= 0.15.0"
required_version = ">= 0.15.0, < 1.6.0"

required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
sysdig = {
source = "sysdiglabs/sysdig"
version = ">= 0.5.46"
version = ">= 0.5.21"
}
}
}
6 changes: 3 additions & 3 deletions modules/services/cloud-bench/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Deployed on **Sysdig Backend**

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_sysdig"></a> [sysdig](#requirement\_sysdig) | >= 0.5.21 |

## Providers
Expand Down
6 changes: 3 additions & 3 deletions modules/services/cloud-bench/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
terraform {
required_version = ">= 0.15.0"
required_version = ">= 0.15.0, < 1.6.0"

required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
sysdig = {
source = "sysdiglabs/sysdig"
Expand Down
6 changes: 3 additions & 3 deletions modules/services/cloud-connector/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ module "cloud_connector_gcp" {

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.0, < 1.6.0 |
| <a name="requirement_google"></a> [google](#requirement\_google) | >= 4.21.0, < 5.0.0 |
| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.1.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0 |
| <a name="provider_google"></a> [google](#provider\_google) | >= 4.21.0, < 5.0.0 |

## Modules

Expand Down
4 changes: 2 additions & 2 deletions modules/services/cloud-connector/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ resource "google_cloud_run_service" "cloud_connector" {
}

dynamic "env" {
for_each = var.sysdig_secure_api_token == "" ? [] : [1]
for_each = var.sysdig_secure_api_token == "" ? toset([]) : toset([1])

content {
name = "SECURE_API_TOKEN"
Expand All @@ -88,7 +88,7 @@ resource "google_cloud_run_service" "cloud_connector" {
}

dynamic "env" {
for_each = var.sysdig_secure_api_token_secret_id == "" ? [] : [1]
for_each = var.sysdig_secure_api_token_secret_id == "" ? toset([]) : toset([1])

content {
name = "SECURE_API_TOKEN"
Expand Down
4 changes: 2 additions & 2 deletions modules/services/cloud-connector/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
terraform {
required_version = ">= 0.15.0"
required_version = ">= 0.15.0, < 1.6.0"

required_providers {
google = {
source = "hashicorp/google"
version = ">= 4.21.0"
version = ">= 4.21.0, < 5.0.0"
}
random = {
version = ">= 3.1.0"
Expand Down
0 examples/trigger-events/README.md → test/trigger-events/README.md
View file
Open in desktop
File renamed without changes.
0 examples/trigger-events/main.tf → test/trigger-events/main.tf
View file
Open in desktop
File renamed without changes.
0 examples/trigger-events/outputs.tf → test/trigger-events/outputs.tf
View file
Open in desktop
File renamed without changes.
0 examples/trigger-events/variables.tf → test/trigger-events/variables.tf
View file
Open in desktop
File renamed without changes.
0 examples/trigger-events/versions.tf → test/trigger-events/versions.tf
View file
Open in desktop
File renamed without changes.