Skip to content

Commit 6b11fee

Browse files
pacphipacphi
committed
Set workflow-level environment variables in Github Action workflows consistently
* and remove project and organization id vars from instances of provider "scaleway" {} configuration
1 parent 5e983a1 commit 6b11fee

File tree

8 files changed

+46
-129
lines changed

8 files changed

+46
-129
lines changed

‎.github/workflows/deploy-environment.yml‎

Lines changed: 8 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,14 @@ env:
9191
TF_IN_AUTOMATION: true
9292
TF_VAR_scaleway_region: ${{ github.event.inputs.region }}
9393
TF_VAR_scaleway_zone: ${{ github.event.inputs.availability_zone }}
94+
# Consolidated Scaleway credentials and mappings
95+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
96+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
97+
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
98+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
99+
# AWS variables for S3 backend compatibility
100+
AWS_ACCESS_KEY_ID: ${{ secrets.SCW_ACCESS_KEY }}
101+
AWS_SECRET_ACCESS_KEY: ${{ secrets.SCW_SECRET_KEY }}
94102

95103
jobs:
96104
validate:
@@ -150,23 +158,6 @@ jobs:
150158
with:
151159
version: 'v3.12.0'
152160

153-
- name: Configure Scaleway Credentials for Validation
154-
env:
155-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
156-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
157-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
158-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
159-
run: |
160-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
161-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
162-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
163-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
164-
# AWS environment variables for S3 backend (required by Terraform S3 backend)
165-
echo "AWS_ACCESS_KEY_ID=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
166-
echo "AWS_SECRET_ACCESS_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
167-
# Terraform-specific variables for project and organization IDs
168-
echo "TF_VAR_scaleway_project_id=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
169-
echo "TF_VAR_scaleway_organization_id=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
170161

171162
- name: Check Terraform Formatting
172163
run: |
@@ -493,23 +484,6 @@ jobs:
493484
terraform_version: "~1.12.0"
494485
terraform_wrapper: false
495486

496-
- name: Configure Scaleway Credentials
497-
env:
498-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
499-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
500-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
501-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
502-
run: |
503-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
504-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
505-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
506-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
507-
# AWS environment variables for S3 backend (required by Terraform S3 backend)
508-
echo "AWS_ACCESS_KEY_ID=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
509-
echo "AWS_SECRET_ACCESS_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
510-
# Terraform-specific variables for project and organization IDs
511-
echo "TF_VAR_scaleway_project_id=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
512-
echo "TF_VAR_scaleway_organization_id=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
513487

514488
- name: Download Backend Configuration
515489
uses: actions/download-artifact@v4
@@ -747,23 +721,6 @@ jobs:
747721
with:
748722
version: 'v3.12.0'
749723

750-
- name: Configure Scaleway Credentials
751-
env:
752-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
753-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
754-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
755-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
756-
run: |
757-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
758-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
759-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
760-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
761-
# AWS environment variables for S3 backend (required by Terraform S3 backend)
762-
echo "AWS_ACCESS_KEY_ID=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
763-
echo "AWS_SECRET_ACCESS_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
764-
# Terraform-specific variables for project and organization IDs
765-
echo "TF_VAR_scaleway_project_id=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
766-
echo "TF_VAR_scaleway_organization_id=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
767724

768725
- name: Setup Deployment Flags
769726
id: setup-flags

‎.github/workflows/setup-backend.yml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ on:
5959

6060
env:
6161
TF_IN_AUTOMATION: true
62+
# Consolidated Scaleway credentials and mappings
63+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
64+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
65+
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
66+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
67+
# AWS variables for S3 backend compatibility
68+
AWS_ACCESS_KEY_ID: ${{ secrets.SCW_ACCESS_KEY }}
69+
AWS_SECRET_ACCESS_KEY: ${{ secrets.SCW_SECRET_KEY }}
6270

6371
jobs:
6472
setup-backend:
@@ -81,20 +89,6 @@ jobs:
8189
terraform_version: "~1.12.0"
8290
terraform_wrapper: false
8391

84-
- name: Configure Scaleway Credentials
85-
env:
86-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
87-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
88-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
89-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
90-
run: |
91-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
92-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
93-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
94-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
95-
# AWS environment variables for S3 backend (required by Terraform S3 backend)
96-
echo "AWS_ACCESS_KEY_ID=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
97-
echo "AWS_SECRET_ACCESS_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
9892

9993
- name: Validate Environment
10094
id: validate

‎.github/workflows/teardown-environment.yml‎

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@ env:
6666
TF_IN_AUTOMATION: true
6767
TF_VAR_scaleway_region: ${{ github.event.inputs.region }}
6868
TF_VAR_scaleway_zone: ${{ github.event.inputs.availability_zone }}
69+
# Consolidated Scaleway credentials and mappings
70+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
71+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
72+
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
73+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
74+
# AWS variables for S3 backend compatibility
75+
AWS_ACCESS_KEY_ID: ${{ secrets.SCW_ACCESS_KEY }}
76+
AWS_SECRET_ACCESS_KEY: ${{ secrets.SCW_SECRET_KEY }}
6977

7078
jobs:
7179
validate-request:
@@ -114,17 +122,6 @@ jobs:
114122
with:
115123
version: 'v1.32.0'
116124

117-
- name: Configure Scaleway Credentials
118-
env:
119-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
120-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
121-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
122-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
123-
run: |
124-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
125-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
126-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
127-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
128125

129126
- name: Download Kubeconfig
130127
continue-on-error: true
@@ -191,17 +188,6 @@ jobs:
191188
with:
192189
version: 'v1.32.0'
193190

194-
- name: Configure Scaleway Credentials
195-
env:
196-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
197-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
198-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
199-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
200-
run: |
201-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
202-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
203-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
204-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
205191

206192
- name: Analyze Impact
207193
id: impact
@@ -274,17 +260,6 @@ jobs:
274260
with:
275261
version: 'v1.32.0'
276262

277-
- name: Configure Scaleway Credentials
278-
env:
279-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
280-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
281-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
282-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
283-
run: |
284-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
285-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
286-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
287-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
288263

289264
- name: Download Kubeconfig
290265
continue-on-error: true

‎.github/workflows/validate-templates.yml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ on:
4747

4848
env:
4949
TF_IN_AUTOMATION: true
50+
# Consolidated Scaleway credentials and mappings
51+
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
52+
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
53+
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
54+
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
55+
# AWS variables for S3 backend compatibility
56+
AWS_ACCESS_KEY_ID: ${{ secrets.SCW_ACCESS_KEY }}
57+
AWS_SECRET_ACCESS_KEY: ${{ secrets.SCW_SECRET_KEY }}
5058

5159
jobs:
5260
discover-templates:
@@ -369,17 +377,6 @@ jobs:
369377
with:
370378
version: 'v1.32.0'
371379

372-
- name: Configure Scaleway Credentials
373-
env:
374-
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
375-
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
376-
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
377-
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
378-
run: |
379-
echo "SCW_ACCESS_KEY=${SCW_ACCESS_KEY}" >> $GITHUB_ENV
380-
echo "SCW_SECRET_KEY=${SCW_SECRET_KEY}" >> $GITHUB_ENV
381-
echo "SCW_DEFAULT_PROJECT_ID=${SCW_DEFAULT_PROJECT_ID}" >> $GITHUB_ENV
382-
echo "SCW_DEFAULT_ORGANIZATION_ID=${SCW_DEFAULT_ORGANIZATION_ID}" >> $GITHUB_ENV
383380

384381
- name: Download Backend Configuration
385382
uses: actions/download-artifact@v4

‎environments/dev/providers.tf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ terraform {
3030
provider "scaleway" {
3131
zone = var.scaleway_zone
3232
region = var.scaleway_region
33-
organization_id = var.scaleway_organization_id
34-
project_id = var.scaleway_project_id
3533
}
3634

3735
provider "kubernetes" {

‎environments/staging/providers.tf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ terraform {
3030
provider "scaleway" {
3131
zone = var.scaleway_zone
3232
region = var.scaleway_region
33-
organization_id = var.scaleway_organization_id
34-
project_id = var.scaleway_project_id
3533
}
3634

3735
provider "kubernetes" {

‎modules/postgresql/variables.tf‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ variable "settings" {
7676
description = "Database settings"
7777
type = map(string)
7878
default = {
79-
"max_connections" = "200"
80-
"shared_preload_libraries" = "pg_stat_statements"
81-
"log_min_duration_statement" = "1000"
82-
"log_connections" = "on"
83-
"log_disconnections" = "on"
84-
"log_lock_waits" = "on"
85-
"log_statement" = "ddl"
86-
"log_temp_files" = "0"
87-
"work_mem" = "4MB"
88-
"maintenance_work_mem" = "128MB"
89-
"wal_buffers" = "16MB"
90-
"default_statistics_target" = "100"
91-
"random_page_cost" = "1.1"
92-
"effective_cache_size" = "128MB"
79+
"max_connections" = "200"
80+
"shared_preload_libraries" = "pg_stat_statements"
81+
"log_min_duration_statement" = "1000"
82+
"log_connections" = "on"
83+
"log_disconnections" = "on"
84+
"log_lock_waits" = "on"
85+
"log_statement" = "ddl"
86+
"log_temp_files" = "0"
87+
"work_mem" = "4MB"
88+
"maintenance_work_mem" = "128MB"
89+
"wal_buffers" = "16MB"
90+
"default_statistics_target" = "100"
91+
"random_page_cost" = "1.1"
92+
"effective_cache_size" = "128MB"
9393
}
9494
}
9595

‎shared/providers.tf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
provider "scaleway" {
55
zone = var.scaleway_zone
66
region = var.scaleway_region
7-
organization_id = var.scaleway_organization_id
8-
project_id = var.scaleway_project_id
97
}
108

119
provider "kubernetes" {

0 commit comments

Comments
 (0)