fix-810: Updated custom remediation for non-str object types (#819)

* fix-810: Updated custom remediation for non-str object types
nautobot · Oct 31, 2024 · a62ab68 · a62ab68
1 parent 8bf6a21
commit a62ab68
Show file tree

Hide file tree

Showing 4 changed files with 711 additions and 642 deletions.
diff --git a/changes/810.fixed b/changes/810.fixed
@@ -0,0 +1 @@
+Fixed custom compliance to work with non-string objects.
diff --git a/nautobot_golden_config/jobs.py b/nautobot_golden_config/jobs.py
@@ -440,10 +440,15 @@ def _generate_config_plan_from_feature(self):
                 _features = ", ".join([str(feat) for feat in self._feature])
                 self.logger.debug(f"Device `{device}` does not have `{self._plan_type}` configs for `{_features}`.")
                 continue
+
+            if not all(isinstance(config_set, str) for config_set in config_sets):
+                config_set = config_sets
+            else:
+                config_set = "\n".join(config_sets)
             config_plan = ConfigPlan.objects.create(
                 device=device,
                 plan_type=self._plan_type,
-                config_set="\n".join(config_sets),
+                config_set=config_set,
                 change_control_id=self._change_control_id,
                 change_control_url=self._change_control_url,
                 status=self.plan_status,

diff --git a/nautobot_golden_config/tables.py b/nautobot_golden_config/tables.py
@@ -485,12 +485,12 @@ class ConfigPlanTable(StatusTableMixin, BaseTable):
     pk = ToggleColumn()
     device = LinkColumn("plugins:nautobot_golden_config:configplan", args=[A("pk")])
     plan_result = TemplateColumn(
-        template_code="""<a href="{% url 'extras:jobresult' pk=record.plan_result.pk  %}" <i class="mdi mdi-clipboard-text-play-outline"></i></a> """
+        template_code="""<a href="{% url 'extras:jobresult' pk=record.plan_result.pk %}"><i class="mdi mdi-clipboard-text-play-outline"></i></a>"""
     )
     deploy_result = TemplateColumn(
         template_code="""
         {% if record.deploy_result %}
-            <a href="{% url 'extras:jobresult' pk=record.deploy_result.pk  %}" <i class="mdi mdi-clipboard-text-play-outline"></i></a>
+            <a href="{% url 'extras:jobresult' pk=record.deploy_result.pk %}"><i class="mdi mdi-clipboard-text-play-outline"></i></a>
         {% else %}
             &mdash;
         {% endif %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed custom compliance to work with non-string objects.