Skip to content

Commit

Permalink
Use clamdscan by default.
Browse files Browse the repository at this point in the history
This eliminates some unnecessary config from govuk-helm-charts and makes
asset-manager more robust against the clam binaries moving to a slightly
different directory in PATH (which was the cause of a recent production
outage).

Remove a unhelpful change-detector test for the default value.
  • Loading branch information
sengi committed Jun 21, 2024
1 parent b0e85eb commit e09c469
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion lib/govuk_configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ def draft_assets_host
end

def clamscan_path
@env.fetch("ASSET_MANAGER_CLAMSCAN_PATH", "govuk_clamscan")
@env.fetch("ASSET_MANAGER_CLAMSCAN_PATH", "clamdscan")
end
end
8 changes: 0 additions & 8 deletions spec/lib/govuk_configuration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@
expect(config.clamscan_path).to eq("alternative-path")
end
end

context "when environment does not include an ASSET_MANAGER_CLAMSCAN_PATH value" do
let(:env) { {} }

it "returns govuk_clamscan" do
expect(config.clamscan_path).to eq("govuk_clamscan")
end
end
end

describe "#draft_assets_host" do
Expand Down

0 comments on commit e09c469

Please sign in to comment.