Skip to content
This repository has been archived by the owner on Dec 20, 2024. It is now read-only.

Commit

Permalink
fix: pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas de Lachaux committed Sep 22, 2023
1 parent 28102aa commit a3029c8
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 19 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/terratest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

env:
GCP_PROJECT_ID: padok-library-gcp-host
GCP_PROJECT_NUMBER: "552840532740"
GCP_SERVICE_ACCOUNT: "identity-terraform-gcp-network"

jobs:
Expand All @@ -26,7 +27,7 @@ jobs:
uses: google-github-actions/auth@v1
with:
token_format: "access_token"
workload_identity_provider: "projects/${{ env.GCP_PROJECT_ID }}/locations/global/workloadIdentityPools/identity-pool-padok-lab/providers/identity-provider-padok-lab"
workload_identity_provider: "projects/${{ env.GCP_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/identity-terraform-gpc-network/providers/identity-terraform-gcp-network"
service_account: "${{ env.GCP_SERVICE_ACCOUNT }}@${{ env.GCP_PROJECT_ID }}.iam.gserviceaccount.com"
- name: Set up Go
uses: actions/setup-go@v3
Expand Down
2 changes: 2 additions & 0 deletions tests/bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ provider "google" {
data "google_client_config" "this" {}

module "github_action_enabler_padok_lab_sa" {
#checkov:skip=CKV_TF_1 Ensure Terraform module sources use a commit hash
source = "github.com/padok-team/terraform-google-serviceaccount?ref=v2.0.0"
name = "identity-terraform-gcp-network"
project_id = data.google_client_config.this.project
display_name = "Service Account for padok-team/terraform-google-network Github Action"
}

module "gh_oidc" {
#checkov:skip=CKV_TF_1 Ensure Terraform module sources use a commit hash
source = "terraform-google-modules/github-actions-runners/google//modules/gh-oidc"
version = "v3.1.1"
project_id = data.google_client_config.this.project
Expand Down
36 changes: 18 additions & 18 deletions tests/tests.tfvars
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name = "testing"
project_id = "padok-library-gcp-host"
name = "testing"
project_id = "padok-library-gcp-host"

subnets = {
subnets = {

"eu-1" = {
name = "eu-1"
region = "europe-west1"
primary_cidr = "172.16.0.0/20"
serverless_cidr = ""
secondary_ranges = {}
},
"eu-2" = {
name = "eu-2"
region = "europe-west2"
primary_cidr = "172.16.48.0/20"
serverless_cidr = "172.16.80.0/28"
secondary_ranges = {}
}
"eu-1" = {
name = "eu-1"
region = "europe-west1"
primary_cidr = "172.16.0.0/20"
serverless_cidr = ""
secondary_ranges = {}
},
"eu-2" = {
name = "eu-2"
region = "europe-west2"
primary_cidr = "172.16.48.0/20"
serverless_cidr = "172.16.80.0/28"
secondary_ranges = {}
}
gcp_peering_cidr = "172.16.64.0/20"
}
gcp_peering_cidr = "172.16.64.0/20"

0 comments on commit a3029c8

Please sign in to comment.