Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a few lint format issues #15371

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Fix a few lint format issues #15371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qa/integration/specs/dlq_spec.rb
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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