add infrastructure as code tool support

jhipster · Nov 29, 2024 · 7dfc567 · 7dfc567
1 parent 47dcc17
commit 7dfc567
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) {