Add bootstrapper configurations #864

kin0992 · 2025-09-10T15:01:53Z

This pull request enhances the infrastructure scaffolding process in the monorepo generator by improving how Terraform files are organized and generated. The changes introduce a clearer separation of repository-level and environment-specific Terraform files, and add a new default provider configuration template for production environments.

Depends on #863 #884 #911
Closes CES-1260

changeset-bot · 2025-09-10T15:01:56Z

🦋 Changeset detected

Latest commit: 90fe018

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages

Name	Type
@pagopa/monorepo-generator	Minor
@pagopa/dx-cli	Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

codecov-commenter · 2025-09-10T15:02:58Z

Codecov Report

❌ Patch coverage is 0% with 23 lines in your changes missing coverage. Please review.
✅ Project coverage is 47.85%. Comparing base (8abeb56) to head (acab9b9).
⚠️ Report is 65 commits behind head on main.

Files with missing lines	Patch %	Lines
packages/monorepo-generator/src/index.ts	0.00%	23 Missing ⚠️

❌ Your project status has failed because the head coverage (47.85%) is below the target coverage (80.00%). You can increase the head coverage or adjust the target coverage.

Additional details and impacted files

@@             Coverage Diff             @@
##             main     #864       +/-   ##
===========================================
- Coverage   67.85%   47.85%   -20.01%     
===========================================
  Files          31       39        +8     
  Lines         840     1469      +629     
  Branches      146      184       +38     
===========================================
+ Hits          570      703      +133     
- Misses        258      752      +494     
- Partials       12       14        +2

Files with missing lines	Coverage Δ
packages/monorepo-generator/src/index.ts	`0.67% <0.00%> (ø)`

... and 6 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot

Pull Request Overview

This pull request enhances the infrastructure scaffolding process by introducing clearer separation between repository-level and environment-specific Terraform files. It adds support for scaffolding a default production environment with its own provider configuration template.

Key changes:

Adds a new Terraform provider template for the production environment
Refactors the Terraform file generation to separate repository and environment concerns
Introduces new functions to handle environment-specific file scaffolding

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File	Description
packages/monorepo-generator/templates/monorepo/infra/resources/prod/providers.tf.hbs	Adds new Terraform provider template for production environment
packages/monorepo-generator/src/index.ts	Refactors Terraform file generation functions and adds environment-specific scaffolding
.changeset/weak-bears-crash.md	Documents the addition of default prod environment to the template

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

packages/monorepo-generator/templates/monorepo/infra/resources/prod/providers.tf.hbs

dpulls · 2025-09-19T09:46:23Z

🎉 All dependencies have been resolved !

� Conflicts: � packages/monorepo-generator/package.json � pnpm-lock.yaml

# Conflicts: # packages/monorepo-generator/src/adapters/octokit/index.ts

� Conflicts: � apps/cli/package.json � packages/monorepo-generator/package.json � pnpm-lock.yaml � pnpm-workspace.yaml

# Conflicts: # packages/monorepo-generator/src/adapters/octokit/index.ts

…nt-directory

kin0992 · 2025-10-02T10:26:31Z

packages/monorepo-generator/templates/monorepo/infra/bootstrapper/aws/main.tf.hbs

+
+  core_state = {
+    bucket         = "{{ awsAccountId }}-terraform-state"
+    key            = "{{ repoName }}.repository.tfstate"


issue: key contains repository. it should not here since we are in the bootstrapper

kin0992 · 2025-10-02T10:27:39Z

packages/monorepo-generator/templates/monorepo/infra/bootstrapper/azure/locals.tf.hbs

+    location        = "{{ azureLocation }}"
+    location_short  = "{{ locationShort }}"
+    domain          = "{{ domain }}"
+    app_name        = "{{ awsAppName }}"


question: do we really need the app_name? why the parameter is called awsAppName then? here we are in the azure template

according to the underlying module variables, the app_name can be removed

the location_short as well

Copilot

Pull Request Overview

Copilot reviewed 12 out of 13 changed files in this pull request and generated 3 comments.

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

packages/monorepo-generator/templates/monorepo/infra/bootstrapper/azure/main.tf.hbs

packages/monorepo-generator/templates/monorepo/infra/bootstrapper/aws/providers.tf.hbs

Copilot

Pull Request Overview

Copilot reviewed 12 out of 13 changed files in this pull request and generated no new comments.

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

kin0992 · 2025-10-02T11:13:40Z

packages/monorepo-generator/templates/monorepo/infra/bootstrapper/azure/main.tf.hbs

+    resource_group_name  = "{{ tfStateResourceGroupName }}"
+    storage_account_name = "{{ tfStateStorageAccountName }}"


note: those parameters are not coded into this PR, but we are going to inherit them from #911 🚓

Copilot

Pull Request Overview

Copilot reviewed 12 out of 13 changed files in this pull request and generated no new comments.

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

kin0992 · 2025-10-02T13:41:49Z

To verify the generated code:

run pnpm build
run ENABLE_INIT_COMMAND=true node apps/cli/bin/index.js init project from the repo root
answer the questions

Please note that the resource_group_name and storage_account_name might be empty in this branch, because the questions are in a different PR

cc @pagopa/engineering-team-devex

kin0992 marked this pull request as ready for review September 11, 2025 08:03

kin0992 requested a review from a team as a code owner September 11, 2025 08:03

Copilot AI review requested due to automatic review settings September 11, 2025 08:03

Copilot AI reviewed Sep 11, 2025

View reviewed changes

packages/monorepo-generator/templates/monorepo/infra/resources/prod/providers.tf.hbs Outdated Show resolved Hide resolved

kin0992 force-pushed the features/scaffold-terraform-repository-configuration branch 5 times, most recently from b6c732c to b1d5765 Compare September 16, 2025 10:37

kin0992 marked this pull request as draft September 16, 2025 12:54

kin0992 force-pushed the features/scaffold-terraform-repository-configuration branch from 871c3a3 to 576a6b8 Compare September 17, 2025 07:53

kin0992 force-pushed the features/scaffold-empty-infra-prod-environment-directory branch from f111c61 to 7b03d33 Compare September 17, 2025 07:57

kin0992 force-pushed the features/scaffold-terraform-repository-configuration branch 2 times, most recently from f60f4dc to 74d2054 Compare September 18, 2025 13:37

Base automatically changed from features/scaffold-terraform-repository-configuration to main September 19, 2025 09:46

kin0992 force-pushed the features/scaffold-empty-infra-prod-environment-directory branch from 7b03d33 to d0386d0 Compare September 22, 2025 06:57

kin0992 added 11 commits September 22, 2025 14:58

Install few dependencies

d3c4e0d

� Conflicts: � packages/monorepo-generator/package.json � pnpm-lock.yaml

Create custom action to get relevant versions for terraform files

418fa82

Create octokit adapter

d643c65

# Conflicts: # packages/monorepo-generator/src/adapters/octokit/index.ts

Scaffold Terraform files to handle the repository

03e8717

Add changelog

04e15ba

Move semver dependency to catalog

cda2639

� Conflicts: � apps/cli/package.json � packages/monorepo-generator/package.json � pnpm-lock.yaml � pnpm-workspace.yaml

Move neverthrow dependency to catalog

14855f9

Remove hardcoded provider version and replace it with a variable

159dc49

Create a single octokit instance

903abfd

# Conflicts: # packages/monorepo-generator/src/adapters/octokit/index.ts

Rename file

9bf3291

Create config type and default values

cf30ead

kin0992 and others added 14 commits October 2, 2025 11:10

Merge branch 'main' into features/scaffold-empty-infra-prod-environme…

c30bee9

…nt-directory

Fix source link

f0379d2

WIP

7219751

Update core state values

7f823f6

Update storage account values

cadd62f

Get subscriptionId and tenantId from core-values-exporter module

42d3f53

Rename module

976cfae

Add entraId groups

6d36d75

Change bootstrapper files destination

620dace

Add DX provider to providers list

fa116d4

Update README

31639e8

Add function to get locationShort and envShort

7ff54a0

Update questions order

8874a73

Update changelog

c9bbaa9

kin0992 commented Oct 2, 2025

View reviewed changes

kin0992 added 3 commits October 2, 2025 12:42

Remove app_name and location_short variables

5004d42

Remove code related to conversion from location to locationShort values

865945a

Fix Terraform state keys

fb8df60

kin0992 requested a review from Copilot October 2, 2025 10:59

Copilot AI reviewed Oct 2, 2025

View reviewed changes

kin0992 added 3 commits October 2, 2025 13:10

Add missing quote

d013bff

Remove duplicate parameter

b8743a8

Fix provider name

90fe018

kin0992 requested a review from Copilot October 2, 2025 11:12

Copilot AI reviewed Oct 2, 2025

View reviewed changes

kin0992 commented Oct 2, 2025

View reviewed changes

kin0992 requested a review from Copilot October 2, 2025 11:13

Copilot AI reviewed Oct 2, 2025

View reviewed changes

kin0992 marked this pull request as ready for review October 2, 2025 12:53

		resource_group_name = "{{ tfStateResourceGroupName }}"
		storage_account_name = "{{ tfStateStorageAccountName }}"

Add bootstrapper configurations #864

Are you sure you want to change the base?

Add bootstrapper configurations #864

Uh oh!

Conversation

kin0992 commented Sep 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Sep 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

codecov-commenter commented Sep 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

dpulls bot commented Sep 19, 2025

Uh oh!

kin0992 Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

kin0992 Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

kin0992 Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

kin0992 Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

kin0992 Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

kin0992 commented Oct 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kin0992 commented Sep 10, 2025 •

edited

Loading

changeset-bot bot commented Sep 10, 2025 •

edited

Loading

codecov-commenter commented Sep 10, 2025 •

edited

Loading