Skip to content

Commit

Permalink
Fix a few lint format issues
Browse files Browse the repository at this point in the history
Fix lint issues found by 'rake lint:format'
  • Loading branch information
roaksoax authored Oct 10, 2023
1 parent be063e2 commit 64ddec5
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion qa/integration/specs/dlq_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# template with an ip field
let(:template) { serverless? ? { "index_patterns": ["te*"], "template": {"mappings": { "properties": { "ip": { "type": "ip" }}}} } :
{ "index_patterns": ["te*"], "mappings": { "properties": { "ip": { "type": "ip" }}}} }
let(:template_api) { serverless? ? "_index_template": "_template" }
let(:template_api) { serverless? ? "_index_template" : "_template" }
# a message that is incompatible with the template
let(:message) { {"message": "hello", "ip": 1}.to_json }

Expand Down
1 change: 1 addition & 0 deletions x-pack/lib/license_checker/license_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def fetch_cluster_info
def build_flavor
@cluster_info&.dig('version', 'build_flavor')
end

def serverless?
build_flavor == 'serverless'
end
Expand Down
1 change: 0 additions & 1 deletion x-pack/spec/config_management/elasticsearch_source_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -780,5 +780,4 @@
expect { subject.get_es_version }.to raise_error(LogStash::ConfigManagement::ElasticsearchSource::RemoteConfigError)
end
end

end
1 change: 0 additions & 1 deletion x-pack/spec/license_checker/license_reader_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@
expect(subject.fetch_cluster_info).to eq({})
end
end

end

it "builds ES client" do
Expand Down
2 changes: 1 addition & 1 deletion x-pack/spec/support/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@ def cluster_info(version = LOGSTASH_VERSION, build_flavour = "default")
"minimum_wire_compatibility_version" => "7.17.0",
"minimum_index_compatibility_version" => "7.0.0"},
"tagline" => "You Know, for Search"}
end
end

0 comments on commit 64ddec5

Please sign in to comment.