refa: field name

steadybit · Aug 25, 2023 · e832fff · e832fff
1 parent 7a5132c
commit e832fff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/extscalesetinstance/scale_set_instance_attack_state.go b/extscalesetinstance/scale_set_instance_attack_state.go
@@ -65,7 +65,7 @@ func (e *scaleSetInstanceAction) Describe() action_kit_api.ActionDescription {
         {
           Label:       "by scale-set-instance-id",
           Description: extutil.Ptr("Find azure scale set instance by id"),
-          Query:       "azure-scale-set-instance.vm.id=\"\"",
+          Query:       "azure-scale-set-instance.id=\"\"",
         },
         {
           Label:       "by scale-set-name",

diff --git a/extscalesetinstance/scale_set_instance_discovery.go b/extscalesetinstance/scale_set_instance_discovery.go
@@ -122,13 +122,6 @@ func getAttributeDescriptions() discovery_kit_api.AttributeDescriptions {
 					Other: "Host names",
 				},
 			},
-			{
-				Attribute: "azure-scale-set-instance.network.id",
-				Label: discovery_kit_api.PluralLabel{
-					One:   "Network ID",
-					Other: "Network IDs",
-				},
-			},
 			{
 				Attribute: "azure-scale-set-instance.os.name",
 				Label: discovery_kit_api.PluralLabel{
@@ -151,7 +144,7 @@ func getAttributeDescriptions() discovery_kit_api.AttributeDescriptions {
 				},
 			},
 			{
-				Attribute: "azure-scale-set-instance.vm.id",
+				Attribute: "azure-scale-set-instance.id",
 				Label: discovery_kit_api.PluralLabel{
 					One:   "VM ID",
 					Other: "VM IDs",
@@ -374,7 +367,7 @@ func getToHostEnrichmentRule() discovery_kit_api.TargetEnrichmentRule {
 				Name:    "azure.subscription.id",
 			}, {
 				Matcher: discovery_kit_api.Equals,
-				Name:    "azure-scale-set-instance.vm.id",
+				Name:    "azure-scale-set-instance.id",
 			},
 			{
 				Matcher: discovery_kit_api.Equals,
@@ -393,9 +386,6 @@ func getToHostEnrichmentRule() discovery_kit_api.TargetEnrichmentRule {
 				Name:    "azure-scale-set-instance.os.type",
 			},
 			{
-				Matcher: discovery_kit_api.Equals,
-				Name:    "azure-scale-set-instance.network.id",
-			}, {
 				Matcher: discovery_kit_api.Equals,
 				Name:    "azure.location",
 			},
@@ -405,14 +395,19 @@ func getToHostEnrichmentRule() discovery_kit_api.TargetEnrichmentRule {
 			}, {
 				Matcher: discovery_kit_api.Equals,
 				Name:    "azure-scale-set.name",
-			}, {
+			},
+      {
 				Matcher: discovery_kit_api.Equals,
 				Name:    "azure-scale-set-instance.provisioning.state",
 			},
 			{
 				Matcher: discovery_kit_api.StartsWith,
 				Name:    "azure-scale-set-instance.label.",
 			},
+      {
+        Matcher: discovery_kit_api.StartsWith,
+        Name:    "azure-scale-set.label.",
+      },
 		},
 	}
 }
@@ -440,7 +435,7 @@ func getToContainerEnrichmentRule() discovery_kit_api.TargetEnrichmentRule {
 				Name:    "azure.subscription.id",
 			}, {
 				Matcher: discovery_kit_api.Equals,
-				Name:    "azure-scale-set-instance.vm.id",
+				Name:    "azure-scale-set-instance.id",
 			},
 			{
 				Matcher: discovery_kit_api.Equals,
@@ -459,9 +454,6 @@ func getToContainerEnrichmentRule() discovery_kit_api.TargetEnrichmentRule {
 				Name:    "azure-scale-set-instance.os.type",
 			},
 			{
-				Matcher: discovery_kit_api.Equals,
-				Name:    "azure-scale-set-instance.network.id",
-			}, {
 				Matcher: discovery_kit_api.Equals,
 				Name:    "azure.location",
 			},
@@ -472,11 +464,19 @@ func getToContainerEnrichmentRule() discovery_kit_api.TargetEnrichmentRule {
       {
         Matcher: discovery_kit_api.Equals,
         Name:    "azure-scale-set-instance.provisioning.state",
+      },
+      {
+        Matcher: discovery_kit_api.Equals,
+        Name:    "azure-scale-set.name",
       },
 			{
 				Matcher: discovery_kit_api.StartsWith,
 				Name:    "azure-scale-set-instance.label.",
 			},
+      {
+				Matcher: discovery_kit_api.StartsWith,
+				Name:    "azure-scale-set.label.",
+			},
 		},
 	}
 }