#27: Beautification: change order of entity verification rule fields

README.md

@@ -156,9 +156,9 @@ resource "instana_custom_event_spec_entity_verification_rule" "example" {
   description = "description"
   expiration_time = 60000
   rule_severity = "warning"
-  rule_matching_entity_label = "entity-label"
   rule_matching_entity_type = "process"
   rule_matching_operator = "is"
+  rule_matching_entity_label = "entity-label"
   rule_offline_duration = 60000
   downstream_integration_ids = [ "integration-id-1", "integration-id-2" ]
   downstream_broadcast_to_all_alerting_configs = true

instana/resource-custom-event-specficiation-entity-verification-rule.go

@@ -8,12 +8,12 @@ import (
 )
 
 const (
-	//EntityVerificationRuleFieldMatchingEntityLabel constant value for the schema field matching_entity_label
-	EntityVerificationRuleFieldMatchingEntityLabel = ruleFieldPrefix + "matching_entity_label"
 	//EntityVerificationRuleFieldMatchingEntityType constant value for the schema field matching_entity_type
 	EntityVerificationRuleFieldMatchingEntityType = ruleFieldPrefix + "matching_entity_type"
 	//EntityVerificationRuleFieldMatchingOperator constant value for the schema field matching_operator
 	EntityVerificationRuleFieldMatchingOperator = ruleFieldPrefix + "matching_operator"
+	//EntityVerificationRuleFieldMatchingEntityLabel constant value for the schema field matching_entity_label
+	EntityVerificationRuleFieldMatchingEntityLabel = ruleFieldPrefix + "matching_entity_label"
 	//EntityVerificationRuleFieldOfflineDuration constant value for the schema field offline_duration
 	EntityVerificationRuleFieldOfflineDuration = ruleFieldPrefix + "offline_duration"
 )
@@ -27,11 +27,6 @@ var entityVerificationRuleSchemaFields = map[string]*schema.Schema{
 		Computed:    true,
 		Description: "The computed entity type of a entity verification rule 'host'",
 	},
-	EntityVerificationRuleFieldMatchingEntityLabel: &schema.Schema{
-		Type:        schema.TypeString,
-		Required:    true,
-		Description: "The label of the matching entity",
-	},
 	EntityVerificationRuleFieldMatchingEntityType: &schema.Schema{
 		Type:        schema.TypeString,
 		Required:    true,
@@ -43,6 +38,11 @@ var entityVerificationRuleSchemaFields = map[string]*schema.Schema{
 		ValidateFunc: validation.StringInSlice(restapi.SupportedMatchingOperatorTypes.ToStringSlice(), false),
 		Description:  "The operator which should be applied for matching the label for the given entity (e.g. IS, CONTAINS, STARTS_WITH, ENDS_WITH, NONE)",
 	},
+	EntityVerificationRuleFieldMatchingEntityLabel: &schema.Schema{
+		Type:        schema.TypeString,
+		Required:    true,
+		Description: "The label of the matching entity",
+	},
 	EntityVerificationRuleFieldOfflineDuration: &schema.Schema{
 		Type:        schema.TypeInt,
 		Required:    true,

instana/resource-custom-event-specficiation-entity-verification-rule_test.go

@@ -37,9 +37,9 @@ resource "instana_custom_event_spec_entity_verification_rule" "example" {
   description = "description"
   expiration_time = 60000
   rule_severity = "warning"
-  rule_matching_entity_label = "matching-entity-label"
   rule_matching_entity_type = "matching-entity-type"
   rule_matching_operator = "is"
+  rule_matching_entity_label = "matching-entity-label"
   rule_offline_duration = 60000
   downstream_integration_ids = [ "integration-id-1", "integration-id-2" ]
   downstream_broadcast_to_all_alerting_configs = true

instana/restapi/custom-event-specficiations-api.go

@@ -184,9 +184,9 @@ type RuleSpecification struct {
 	ConditionValue    *float64               `json:"conditionValue"`
 
 	//Entity Verification Rule
-	MatchingEntityLabel *string               `json:"matchingEntityLabel"`
 	MatchingEntityType  *string               `json:"matchingEntityType"`
 	MatchingOperator    *MatchingOperatorType `json:"matchingOperator"`
+	MatchingEntityLabel *string               `json:"matchingEntityLabel"`
 	OfflineDuration     *int                  `json:"offlineDuration"`
 }
 

test-sample.tf

@@ -43,9 +43,9 @@ resource "instana_custom_event_spec_entity_verification_rule" "example" {
   description = "description"
   expiration_time = 60000
   rule_severity = "warning"
-  rule_matching_entity_label = "entity-label"
   rule_matching_entity_type = "process"
   rule_matching_operator = "is"
+  rule_matching_entity_label = "entity-label"
   rule_offline_duration = 60000
   downstream_integration_ids = [ "integration-id-1", "integration-id-2" ]
   downstream_broadcast_to_all_alerting_configs = true