diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56651c81..8b4dc5c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -230,7 +230,9 @@ jobs: - name: "Run Tests" run: "poetry run invoke unittest" changelog: - if: contains(fromJson('["develop","ltm-1.6"]'), github.base_ref) + if: | + contains(fromJson('["develop","ltm-1.6"]'), github.base_ref) && + (github.head_ref != 'main') runs-on: "ubuntu-22.04" steps: - name: "Check out repository code" diff --git a/changes/203.fixed b/changes/203.fixed new file mode 100644 index 00000000..7e8d10b7 --- /dev/null +++ b/changes/203.fixed @@ -0,0 +1 @@ +Fixed old reference to class path in URL pattern for job. \ No newline at end of file diff --git a/nautobot_firewall_models/jobs.py b/nautobot_firewall_models/jobs.py index a441d93c..354d3cc3 100644 --- a/nautobot_firewall_models/jobs.py +++ b/nautobot_firewall_models/jobs.py @@ -23,6 +23,7 @@ class Meta: name = "Generate FW Config via Capirca." description = "Generate FW Config via Capirca and update the models." commit_default = True + has_sensitive_variables = False def run(self, device): # pylint: disable=arguments-differ """Run a job to remove legacy reservations.""" @@ -48,7 +49,7 @@ def run(self, device): # pylint: disable=arguments-differ device_obj = Device.objects.get(pk=dev) logger.debug("Running against Device: `%s`", str(device_obj)) CapircaPolicy.objects.update_or_create(device=device_obj) - logger.info(obj=device_obj, message=f"{device_obj} Updated") + logger.info(f"{device_obj} Updated", extra={"object": device_obj}) jobs = [RunCapircaJob] diff --git a/nautobot_firewall_models/templates/nautobot_firewall_models/inc/capirca_policy.html b/nautobot_firewall_models/templates/nautobot_firewall_models/inc/capirca_policy.html index ee8cba5d..ba13b666 100644 --- a/nautobot_firewall_models/templates/nautobot_firewall_models/inc/capirca_policy.html +++ b/nautobot_firewall_models/templates/nautobot_firewall_models/inc/capirca_policy.html @@ -2,6 +2,6 @@
\ No newline at end of file