From 1357773aba2d6270b5669f0ab0c89f0e57361e65 Mon Sep 17 00:00:00 2001
From: Jimmy Fang <fangjimmy@microsoft.com>
Date: Fri, 15 Nov 2024 17:05:54 +0800
Subject: [PATCH 1/3] init

---
 .../azure-generator.component.ts              |  1 +
 .../home/generator/generator.component.html   | 23 +++++++++++++++++++
 .../generator.configuration.model.ts          |  1 +
 .../generator/jhipster.configuration.model.ts |  2 ++
 4 files changed, 27 insertions(+)

diff --git a/src/main/webapp/app/home/azure-generator/azure-generator.component.ts b/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
index d60f7c2c..5a8a3a99 100644
--- a/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
+++ b/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
@@ -33,6 +33,7 @@ export class AzureGeneratorComponent implements OnInit {
     hideAuthenticationType: true,
     hideHibernateCache: true,
     hideDevDatabaseType: true,
+    displayInfraType: true,
     hideDatabaseTypeOptions: ['cassandra', 'couchbase', 'neo4j', 'no'],
     hideProdDatabaseTypeOptions: ['mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
     hideDevDatabaseTypeOptions: ['h2Disk', 'h2Memory', 'mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
diff --git a/src/main/webapp/app/home/generator/generator.component.html b/src/main/webapp/app/home/generator/generator.component.html
index 0e5c09cf..97a7c09d 100644
--- a/src/main/webapp/app/home/generator/generator.component.html
+++ b/src/main/webapp/app/home/generator/generator.component.html
@@ -117,6 +117,29 @@ <h4>Server side options</h4>
                         <option value="no" [hidden]="config.disableNoDatabaseOptions == true" *ngIf="!isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
                     </select>
                 </div>
+                <div class="form-group" *ngIf="config.displayInfraType">
+                    <label>Do you want to enable Bicep or Terraform for deployment?</label>
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-1">
+                                <input type="checkbox" class="form-control" id="enableTerraform"
+                                       [(ngModel)]="model.enableTerraform" name="enableTerraform"
+                                       #enableTerraform="ngModel" checked>
+                            </div>
+                            <div class="col-md-5">
+                                <label for="enableTerraform">Terraform</label>
+                            </div>
+                            <div class="col-md-1">
+                                <input type="checkbox" class="form-control" id="enableBicep"
+                                       [(ngModel)]="model.enableBicep" name="enableBicep"
+                                       #enableBicep="ngModel" checked>
+                            </div>
+                            <div class="col-md-5">
+                                <label for="enableBicep">Bicep</label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="form-group" *ngIf="!config.hideDevDatabaseType">
                     <label for="devDatabaseType">Which <i>development</i> database would you like to use?</label>
                     <select id="devDatabaseType" [(ngModel)]="model.devDatabaseType" name="devDatabaseType"
diff --git a/src/main/webapp/app/home/generator/generator.configuration.model.ts b/src/main/webapp/app/home/generator/generator.configuration.model.ts
index 9a603260..f021e717 100644
--- a/src/main/webapp/app/home/generator/generator.configuration.model.ts
+++ b/src/main/webapp/app/home/generator/generator.configuration.model.ts
@@ -65,4 +65,5 @@ export interface GeneratorConfigurationModel {
   hideTestingOptions?: boolean;
   hideHibernateCache?: boolean;
   disableNoDatabaseOptions?: boolean;
+  displayInfraType?: boolean;
 }
diff --git a/src/main/webapp/app/home/generator/jhipster.configuration.model.ts b/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
index a7efede6..da4d4344 100644
--- a/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
+++ b/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
@@ -50,6 +50,8 @@ export class JHipsterConfigurationModel {
   public jhiPrefix = 'jhi';
   public withAdminUi = true;
   public blueprints: BlueprintModel[] = [];
+  public enableBicep = false;
+  public enableTerraform = false;
 
   constructor(data?: Partial<JHipsterConfigurationModel>) {
     if (data) {

From 7dfc567f1d4e33ea0d7803cb8367cf7099fe54c5 Mon Sep 17 00:00:00 2001
From: Jimmy Fang <fangjimmy@microsoft.com>
Date: Fri, 29 Nov 2024 11:28:39 +0800
Subject: [PATCH 2/3] add infrastructure as code tool support

---
 .../azure-generator.component.ts              |  2 +-
 .../home/generator/generator.component.html   | 30 +++++--------------
 .../app/home/generator/generator.component.ts |  5 ++++
 .../generator.configuration.model.ts          |  2 +-
 .../generator/jhipster.configuration.model.ts |  3 +-
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/app/home/azure-generator/azure-generator.component.ts b/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
index 5a8a3a99..f374eb63 100644
--- a/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
+++ b/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
@@ -33,7 +33,7 @@ export class AzureGeneratorComponent implements OnInit {
     hideAuthenticationType: true,
     hideHibernateCache: true,
     hideDevDatabaseType: true,
-    displayInfraType: true,
+    hideIaCTool: true,
     hideDatabaseTypeOptions: ['cassandra', 'couchbase', 'neo4j', 'no'],
     hideProdDatabaseTypeOptions: ['mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
     hideDevDatabaseTypeOptions: ['h2Disk', 'h2Memory', 'mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
diff --git a/src/main/webapp/app/home/generator/generator.component.html b/src/main/webapp/app/home/generator/generator.component.html
index 97a7c09d..9cf80ac2 100644
--- a/src/main/webapp/app/home/generator/generator.component.html
+++ b/src/main/webapp/app/home/generator/generator.component.html
@@ -117,29 +117,13 @@ <h4>Server side options</h4>
                         <option value="no" [hidden]="config.disableNoDatabaseOptions == true" *ngIf="!isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
                     </select>
                 </div>
-                <div class="form-group" *ngIf="config.displayInfraType">
-                    <label>Do you want to enable Bicep or Terraform for deployment?</label>
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-1">
-                                <input type="checkbox" class="form-control" id="enableTerraform"
-                                       [(ngModel)]="model.enableTerraform" name="enableTerraform"
-                                       #enableTerraform="ngModel" checked>
-                            </div>
-                            <div class="col-md-5">
-                                <label for="enableTerraform">Terraform</label>
-                            </div>
-                            <div class="col-md-1">
-                                <input type="checkbox" class="form-control" id="enableBicep"
-                                       [(ngModel)]="model.enableBicep" name="enableBicep"
-                                       #enableBicep="ngModel" checked>
-                            </div>
-                            <div class="col-md-5">
-                                <label for="enableBicep">Bicep</label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+              <div class="form-group" *ngIf="config.hideIaCTool">
+                <label for="iaCTools">Do you want to use Infrastructure as Code tool(multiple choice)?</label>
+                <select id="iaCTools" [(ngModel)]="model.iaCTools" name="iaCTools" class="form-control"
+                        #iaCTools="ngModel" multiple>
+                  <option *ngFor="let option of iaCToolOptions" [value]="option.value">{{option.name}}</option>
+                </select>
+              </div>
                 <div class="form-group" *ngIf="!config.hideDevDatabaseType">
                     <label for="devDatabaseType">Which <i>development</i> database would you like to use?</label>
                     <select id="devDatabaseType" [(ngModel)]="model.devDatabaseType" name="devDatabaseType"
diff --git a/src/main/webapp/app/home/generator/generator.component.ts b/src/main/webapp/app/home/generator/generator.component.ts
index 614eb068..ded11a75 100644
--- a/src/main/webapp/app/home/generator/generator.component.ts
+++ b/src/main/webapp/app/home/generator/generator.component.ts
@@ -48,6 +48,7 @@ export class GeneratorComponent implements OnInit {
   submitted = false;
 
   languageOptions: any;
+  iaCToolOptions: any;
 
   selectedGitProvider: string | undefined;
   selectedGitCompany: string | undefined;
@@ -123,6 +124,10 @@ export class GeneratorComponent implements OnInit {
   ngOnInit(): void {
     this.newGenerator();
     this.languageOptions = GeneratorComponent.getAllSupportedLanguageOptions();
+    this.iaCToolOptions = [
+      { name: 'Terraform', value: 'terraform'},
+      { name: 'Bicep', value: 'bicep'}
+    ];
     this.gitConfig = this.gitConfigurationService.gitConfig;
     if (this.gitConfig) {
       this.gitlabConfigured = this.gitConfig.gitlabConfigured ?? false;
diff --git a/src/main/webapp/app/home/generator/generator.configuration.model.ts b/src/main/webapp/app/home/generator/generator.configuration.model.ts
index f021e717..bc8e8e5a 100644
--- a/src/main/webapp/app/home/generator/generator.configuration.model.ts
+++ b/src/main/webapp/app/home/generator/generator.configuration.model.ts
@@ -65,5 +65,5 @@ export interface GeneratorConfigurationModel {
   hideTestingOptions?: boolean;
   hideHibernateCache?: boolean;
   disableNoDatabaseOptions?: boolean;
-  displayInfraType?: boolean;
+  hideIaCTool?: boolean;
 }
diff --git a/src/main/webapp/app/home/generator/jhipster.configuration.model.ts b/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
index da4d4344..4992a14e 100644
--- a/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
+++ b/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
@@ -50,8 +50,7 @@ export class JHipsterConfigurationModel {
   public jhiPrefix = 'jhi';
   public withAdminUi = true;
   public blueprints: BlueprintModel[] = [];
-  public enableBicep = false;
-  public enableTerraform = false;
+  public iaCTools = ['bicep', 'terraform'];
 
   constructor(data?: Partial<JHipsterConfigurationModel>) {
     if (data) {

From 0719954bc7e153f278b952b21759d04cf03700f3 Mon Sep 17 00:00:00 2001
From: Jimmy Fang <fangjimmy@microsoft.com>
Date: Fri, 29 Nov 2024 14:11:36 +0800
Subject: [PATCH 3/3] style fix

---
 src/main/webapp/app/home/generator/generator.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/app/home/generator/generator.component.ts b/src/main/webapp/app/home/generator/generator.component.ts
index ded11a75..cb178884 100644
--- a/src/main/webapp/app/home/generator/generator.component.ts
+++ b/src/main/webapp/app/home/generator/generator.component.ts
@@ -125,8 +125,8 @@ export class GeneratorComponent implements OnInit {
     this.newGenerator();
     this.languageOptions = GeneratorComponent.getAllSupportedLanguageOptions();
     this.iaCToolOptions = [
-      { name: 'Terraform', value: 'terraform'},
-      { name: 'Bicep', value: 'bicep'}
+      { name: 'Terraform', value: 'terraform' },
+      { name: 'Bicep', value: 'bicep' }
     ];
     this.gitConfig = this.gitConfigurationService.gitConfig;
     if (this.gitConfig) {