Rename profiles to agentProfiles (gocd#6170)(gocd#5538)

GaneshSPatil · Apr 22, 2019 · c5b6b22 · c5b6b22
1 parent 6414059
commit c5b6b22
Show file tree

Hide file tree

Showing 8 changed files with 1,243 additions and 9 deletions.
diff --git a/base/src/main/java/com/thoughtworks/go/util/GoConstants.java b/base/src/main/java/com/thoughtworks/go/util/GoConstants.java
@@ -54,7 +54,7 @@ public class GoConstants {
 
     public static final String PRODUCT_NAME = "go";
 
-    public static final int CONFIG_SCHEMA_VERSION = 119;
+    public static final int CONFIG_SCHEMA_VERSION = 120;
 
     public static final String APPROVAL_SUCCESS = "success";
     public static final String APPROVAL_MANUAL = "manual";

diff --git a/config/config-api/src/main/java/com/thoughtworks/go/config/elastic/ElasticProfile.java b/config/config-api/src/main/java/com/thoughtworks/go/config/elastic/ElasticProfile.java
@@ -26,7 +26,7 @@
 
 import static java.lang.String.format;
 
-@ConfigTag("profile")
+@ConfigTag("agentProfile")
 @ConfigCollection(value = ConfigurationProperty.class)
 public class ElasticProfile extends PluginProfile {
 

diff --git a/config/config-api/src/main/java/com/thoughtworks/go/config/elastic/ElasticProfiles.java b/config/config-api/src/main/java/com/thoughtworks/go/config/elastic/ElasticProfiles.java
@@ -21,7 +21,7 @@
 
 import java.util.Arrays;
 
-@ConfigTag("profiles")
+@ConfigTag("agentProfiles")
 @ConfigCollection(ElasticProfile.class)
 public class ElasticProfiles extends PluginProfiles<ElasticProfile> implements Validatable {
     private final ConfigErrors errors = new ConfigErrors();

diff --git a/config/config-server/src/main/resources/cruise-config.xsd b/config/config-server/src/main/resources/cruise-config.xsd
@@ -89,7 +89,7 @@
           </xsd:unique>
         </xsd:element>
       </xsd:sequence>
-      <xsd:attribute name="schemaVersion" type="xsd:int" use="required" fixed="119"/>
+      <xsd:attribute name="schemaVersion" type="xsd:int" use="required" fixed="120"/>
     </xsd:complexType>
     <xsd:unique name="uniquePipelines">
       <xsd:selector xpath="pipelines"/>
@@ -318,9 +318,9 @@
           <!-- Unique clusterProfile id -->
         </xsd:unique>
       </xsd:element>
-      <xsd:element name="profiles" type="elasticAgentProfilesType" minOccurs="0" maxOccurs="1">
+      <xsd:element name="agentProfiles" type="elasticAgentProfilesType" minOccurs="0" maxOccurs="1">
         <xsd:unique name="uniqueProfileId">
-          <xsd:selector xpath="profile"/>
+          <xsd:selector xpath="agentProfile"/>
           <xsd:field xpath="@id"/>
           <!-- Unique profile id -->
         </xsd:unique>
@@ -330,7 +330,7 @@
   </xsd:complexType>
   <xsd:complexType name="elasticAgentProfilesType">
     <xsd:sequence>
-      <xsd:element minOccurs="0" maxOccurs="unbounded" name="profile" type="elasticAgentProfile"/>
+      <xsd:element minOccurs="0" maxOccurs="unbounded" name="agentProfile" type="elasticAgentProfile"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="elasticAgentClusterProfilesType">