Merge branch 'main' into dependabot/npm_and_yarn/typescript/vrotest/isaacs/brace-expansion-5.0.1

Author: VenelinBakalov

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/operations/models/AlertDefinitionDTO.java

@@ -207,7 +207,91 @@ public void setAdditionalProperties(String name, Object value) {
 		}
 
 		@JsonInclude(JsonInclude.Include.NON_NULL)
-		@JsonPropertyOrder({ "type", "relation", "aggregation", "symptomSetOperator", "symptomDefinitionIds", "symptomSets" })
+		@JsonPropertyOrder({ "waitCycles", "cancelCycles", "severity", "condition" })
+		public static class AlertCondition implements Serializable {
+			private static final long serialVersionUID = 2188722915313653545L;
+			
+			@JsonProperty("id")
+			private String id;
+
+			@JsonProperty("waitCycles")
+			private Integer waitCycles;
+
+			@JsonProperty("cancelCycles")
+			private Integer cancelCycles;
+
+			@JsonProperty("severity")
+			private String severity;
+
+			@JsonProperty("condition")
+			private SymptomDefinitionDTO.SymptomDefinition.Condition condition;
+
+			@JsonIgnore
+			private transient Map<String, Object> additionalProperties = new HashMap<>();
+
+			@JsonProperty("id")
+			public String getId() {
+				return id;
+			}
+
+			@JsonProperty("id")
+			public void setId(String id) {
+				this.id = id;
+			}
+			
+			@JsonProperty("waitCycles")
+			public Integer getWaitCycles() {
+				return waitCycles;
+			}
+
+			@JsonProperty("waitCycles")
+			public void setWaitCycles(Integer waitCycles) {
+				this.waitCycles = waitCycles;
+			}
+
+			@JsonProperty("cancelCycles")
+			public Integer getCancelCycles() {
+				return cancelCycles;
+			}
+
+			@JsonProperty("cancelCycles")
+			public void setCancelCycles(Integer cancelCycles) {
+				this.cancelCycles = cancelCycles;
+			}
+
+			@JsonProperty("severity")
+			public String getSeverity() {
+				return severity;
+			}
+
+			@JsonProperty("severity")
+			public void setSeverity(String severity) {
+				this.severity = severity;
+			}
+
+			@JsonProperty("condition")
+			public SymptomDefinitionDTO.SymptomDefinition.Condition getCondition() {
+				return condition;
+			}
+
+			@JsonProperty("condition")
+			public void setCondition(SymptomDefinitionDTO.SymptomDefinition.Condition condition) {
+				this.condition = condition;
+			}
+
+			@JsonAnyGetter
+			public Map<String, Object> getAdditionalProperties() {
+				return this.additionalProperties;
+			}
+
+			@JsonAnySetter
+			public void setAdditionalProperties(String name, Object value) {
+				this.additionalProperties.put(name, value);
+			}
+		}
+
+		@JsonInclude(JsonInclude.Include.NON_NULL)
+		@JsonPropertyOrder({ "type", "relation", "aggregation", "symptomSetOperator", "symptomDefinitionIds", "symptomSets", "alertConditions" })
 		public static class BaseSymptomSet implements Serializable {
 			private static final long serialVersionUID = 7061962708255866132L;
 
@@ -229,6 +313,9 @@ public static class BaseSymptomSet implements Serializable {
 			@JsonProperty("symptomSets")
 			private List<SymptomSet> symptomSets = new ArrayList<>();
 
+			@JsonProperty("alertConditions")
+			private List<AlertCondition> alertConditions = new ArrayList<>();
+
 			@JsonIgnore
 			private transient Map<String, Object> additionalProperties = new HashMap<>();
 
@@ -292,6 +379,16 @@ public void setSymptomSets(List<SymptomSet> symptomSets) {
 				this.symptomSets = symptomSets;
 			}
 
+			@JsonProperty("alertConditions")
+			public List<AlertCondition> getAlertConditions() {
+				return alertConditions;
+			}
+
+			@JsonProperty("alertConditions")
+			public void setAlertConditions(List<AlertCondition> alertConditions) {
+				this.alertConditions = alertConditions;
+			}
+
 			@JsonAnySetter
 			public void setAdditionalProperties(Map<String, Object> additionalProperties) {
 				this.additionalProperties = additionalProperties;
@@ -309,7 +406,7 @@ public void setAdditionalProperties(String name, Object value) {
 		}
 
 		@JsonInclude(JsonInclude.Include.NON_NULL)
-		@JsonPropertyOrder({ "type", "relation", "aggregation", "symptomSetOperator", "symptomDefinitionIds" })
+		@JsonPropertyOrder({ "type", "relation", "aggregation", "symptomSetOperator", "symptomDefinitionIds", "alertConditions" })
 		public static class SymptomSet implements Serializable {
 			private static final long serialVersionUID = 7061962708255866132L;
 
@@ -328,6 +425,9 @@ public static class SymptomSet implements Serializable {
 			@JsonProperty("symptomDefinitionIds")
 			private List<String> symptomDefinitionIds = new ArrayList<>();
 
+			@JsonProperty("alertConditions")
+			private List<AlertCondition> alertConditions = new ArrayList<>();
+
 			@JsonIgnore
 			private transient Map<String, Object> additionalProperties = new HashMap<>();
 
@@ -381,6 +481,16 @@ public void setSymptomDefinitionIds(List<String> symptomDefinitionIds) {
 				this.symptomDefinitionIds = symptomDefinitionIds;
 			}
 
+			@JsonProperty("alertConditions")
+			public List<AlertCondition> getAlertConditions() {
+				return alertConditions;
+			}
+
+			@JsonProperty("alertConditions")
+			public void setAlertConditions(List<AlertCondition> alertConditions) {
+				this.alertConditions = alertConditions;
+			}
+
 			@JsonAnyGetter
 			public Map<String, Object> getAdditionalProperties() {
 				return this.additionalProperties;

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/aria/operations/rest/RestClientVrops.java

@@ -2251,10 +2251,41 @@ private void updateDependentDefinitions(Object definition, VropsPackageMemberTyp
 		}
 	}
 
+	private void removeAlertConditionIds(Object definition, VropsPackageMemberType definitionType) {
+		if (!VropsPackageMemberType.ALERT_DEFINITION.equals(definitionType)) {
+			return;
+		}
+		if (definition == null) {
+			return;
+		}
+		if (!(definition instanceof AlertDefinitionDTO.AlertDefinition)) {
+			return;
+		}
+		//remove alert id
+		((AlertDefinitionDTO.AlertDefinition) definition).setId(null);
+		//remove alert condition ids 
+		for (State state : ((AlertDefinitionDTO.AlertDefinition) definition).getStates()) {
+			if (state.getBaseSymptomSet() == null) {
+				continue;
+			}
+			if (state.getBaseSymptomSet().getAlertConditions() != null) {
+				state.getBaseSymptomSet().getAlertConditions().forEach(condition -> condition.setId(null));
+			}
+			if (state.getBaseSymptomSet().getSymptomSets() != null) {
+				for (SymptomSet symptomSet : state.getBaseSymptomSet().getSymptomSets()) {
+					if (symptomSet.getAlertConditions() != null) {
+						symptomSet.getAlertConditions().forEach(condition -> condition.setId(null));
+					}
+				}
+			}
+		}
+	}
+
 	private void removeIdFromDefinitionPayload(Object definition, VropsPackageMemberType definitionType) {
 		switch (definitionType) {
 			case ALERT_DEFINITION: {
-				((AlertDefinitionDTO.AlertDefinition) definition).setId(null);
+				// remove alert id and alert condition IDs
+				removeAlertConditionIds(definition, definitionType);
 				break;
 			}
 			case SYMPTOM_DEFINITION: {

docs/versions/latest/Release.md

@@ -61,6 +61,11 @@ Project generation from `vrops` archetype fails because Maven tries to replace a
 #### New Behavior
 Project generation from `vrops` archetype executes successfully. Maven configuration is updated to not use variable replacement on `src/main/resources` since content there needs to be directly copied.
 
+### *Fix `vrops` issue 1009 failing to push alert Definitions with alertConditions set*
+#### Previous Behavior
+Pushing AlertDefinitions with alertConditions not null  was failing as the id was not being clean up before pushing .
+#### New Behavior
+Before pushing alertDefinitions the alertConditions ID will be set to null.
 ## Upgrade procedure
 
 [//]: # (Explain in details if something needs to be done)