Skip to content

Commit

Permalink
Rename profiles to agentProfiles (gocd#6170)(gocd#5538)
Browse files Browse the repository at this point in the history
  • Loading branch information
GaneshSPatil committed Apr 22, 2019
1 parent 9b7a1b4 commit 75a7f35
Show file tree
Hide file tree
Showing 8 changed files with 1,243 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import static java.lang.String.format;

@ConfigTag("profile")
@ConfigTag("agentProfile")
@ConfigCollection(value = ConfigurationProperty.class)
public class ElasticProfile extends PluginProfile {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions config/config-server/src/main/resources/cruise-config.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand Down
Loading

0 comments on commit 75a7f35

Please sign in to comment.