BEE-49248: Process reservations under project (#113)

Author: cbameyer

CHANGELOG

@@ -1,3 +1,6 @@
+2024-05.14 Antoine Meyer <[email protected]>
+  * 4.3.2: BEE-49248 - Process reservations under project. (Note that previously exported DSLs will need to be re-exported for import to succeed)
+
 2024-03.01 Valera Fessler <[email protected]>
   * 4.3.1: BEE-43082 - Add child process entities support for the microservice container entity
 

META-INF/plugin.xml

@@ -10,7 +10,7 @@
   <key>EC-DslDeploy</key>
   <label>EC-DslDeploy</label>
   <ecSupportLevel>10</ecSupportLevel>
-  <version>4.3.1</version>
+  <version>4.3.2</version>
   <hasAdoc>true</hasAdoc>
 
 <detailedDescription>CloudBees CD allows you to take a fully code-native approach to continuous delivery and release orchestration using the CloudBees CD Groovy-based DSL. The CloudBees CD model based approach means that every object in CloudBees CD, including release pipelines, deployment automation &amp; strategies, environments, configurations, application models, and more, are all backed by code.

build.pl

@@ -15,7 +15,7 @@
 
 my $epb="../ecpluginbuilder";
 
-my $pluginVersion = "4.3.1";
+my $pluginVersion = "4.3.2";
 my $pluginKey = "EC-DslDeploy";
 
 # Fix version in plugin.xml

dsl/com/electriccloud/commander/dsl/util/BaseObject.groovy

@@ -359,7 +359,7 @@ abstract class BaseObject extends DslDelegatingScript {
               catalogItem    : ['trigger'],
               component      : ['process'],
               dashboard      : ['reportingFilter', 'widget'],
-              environment    : ['cluster', 'environmentTier', 'reservation'],
+              environment    : ['cluster', 'environmentTier'],
               gate           : ['task'],
               microservice   : ['process'],
               pipeline       : ['stage', 'trigger'],

dsl/procedures/installProject/steps/deployProjectEntities.pl

@@ -7,7 +7,7 @@
 my @subProjectEntities = ("project", "credentialProvider", "credential",
     "pluginConfiguration","procedure", "resourceTemplate", "workflowDefinition",
     "environmentTemplate", "environment", "component",
-    "application", "pipeline", "release", "schedule", "catalog", "report", "dashboard");
+    "application", "pipeline", "release", "reservation", "schedule", "catalog", "report", "dashboard");
 
 my ($userTimeout) = ("$[additionalDslArguments]" =~ m/--timeout\s+([0-9]+)/);
 print("User timeout is: '$userTimeout'\n");

help/help.adoc

@@ -368,6 +368,12 @@ NOTE: If the Git commit ID cannot be found or if the procedure or steps cannot f
 [[releaseNotes]]
 == DslDeploy plugin release notes
 
+=== 4.3.2
+
+* Process reservations under project. 
++
+NOTE: Previously exported DSLs must be re-exported for import to succeed.
+
 === 4.3.1
 
 * Added child process entities support for the microservice container entity.

specs/src/test/groovy/com/electriccloud/plugin/spec/EnvironmentSpec.groovy

@@ -23,20 +23,21 @@ class EnvironmentSpec
     conditionallyDeleteProject(projName)
   }
 
-  def "BEE-35400: deploy environment with reservation"()
+  def "BEE-35400: deploy project with reservation"()
   {
     def dslDir = '/tmp/' + randomize('dsl')
 
     given: "environment dsl code"
     dsl """
 project '$projName', {
   environment 'testEnvironment',{
-      reservation 'testReservation', {
-      beginDate = '2019-09-09T10:00'
-      blackout = '1'
-      endDate = '2019-09-09T11:00'
-      timeZone = 'Europe/Kiev'
-    }
+  }
+  reservation 'testReservation', {
+    environmentName = 'testEnvironment'
+    beginDate = '2019-09-09T10:00'
+    blackout = '1'
+    endDate = '2019-09-09T11:00'
+    timeZone = 'Europe/Kiev'
   }
 }
 """