Skip to content

Commit

Permalink
Removed linelint and check EOL using spotless (#6657)
Browse files Browse the repository at this point in the history
* Removed linelint and check EOL using spotless

Signed-off-by: owaiskazi19 <[email protected]>

* Removed json from misc

Signed-off-by: owaiskazi19 <[email protected]>

---------

Signed-off-by: owaiskazi19 <[email protected]>
  • Loading branch information
owaiskazi19 authored Mar 14, 2023
1 parent 73a2279 commit dd6daab
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 83 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/code-hygiene.yml

This file was deleted.

49 changes: 0 additions & 49 deletions .linelint.yml

This file was deleted.

7 changes: 7 additions & 0 deletions gradle/formatting.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ allprojects {
removeUnusedImports()
eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml')
trimTrailingWhitespace()
endWithNewline()

custom 'Refuse wildcard imports', {
// Wildcard imports can't be resolved; fail the build
Expand All @@ -81,6 +82,12 @@ allprojects {
paddedCell()
}
}
format 'misc', {
target '*.md', '*.gradle', '**/*.yaml', '**/*.yml', '**/*.svg'

trimTrailingWhitespace()
endWithNewline()
}
}

precommit.dependsOn 'spotlessJavaCheck'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,3 @@
type: url
settings:
url: "http://snapshot.unknown"



Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
- match: { snapshot.shards.failed : 0 }

# Remove our snapshot
- do:
- do:
snapshot.delete:
repository: test_snapshot_repository
snapshot: test_snapshot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
- match: { snapshots.0.snapshot : test_snapshot_get }

# Remove our snapshot
- do:
- do:
snapshot.delete:
repository: test_snapshot_get_repository
snapshot: test_snapshot_get
Expand Down
2 changes: 1 addition & 1 deletion plugins/transport-nio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ thirdPartyAudit {
'com.aayushatharva.brotli4j.encoder.Encoder',
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',

// from io.netty.handler.codec.protobuf.ProtobufDecoder (netty)
'com.google.protobuf.ExtensionRegistry',
'com.google.protobuf.MessageLite$Builder',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ setup:
host .+ \n
ip .+ \n
node .+ \n
$/
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
help: true
node_selector:
# Only send request to nodes in <2.0 versions, especially during ':qa:mixed-cluster:v1.x.x#mixedClusterTest'.
# Because YAML REST test takes the minimum OpenSearch version in the cluster to apply the filter in 'skip' section,
# Because YAML REST test takes the minimum OpenSearch version in the cluster to apply the filter in 'skip' section,
# see OpenSearchClientYamlSuiteTestCase#initAndResetContext() for detail.
# During 'mixedClusterTest', the cluster can be mixed with nodes in 1.x and 2.x versions,
# During 'mixedClusterTest', the cluster can be mixed with nodes in 1.x and 2.x versions,
# so node_selector is required, and only filtering version in 'skip' is not enough.
version: "1.0.0 - 1.4.99"

Expand Down Expand Up @@ -61,7 +61,7 @@
pending_tasks .+ \n
max_task_wait_time .+ \n
active_shards_percent .+ \n
$/
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@

- is_true: cluster_uuid
- is_true: master_node

---
"Get cluster state returns cluster_manager_node":
- skip:
version: " - 1.4.99"
reason: "The metric cluster_manager_node is added to cluster state in version 2.0.0"

- do:
cluster.state: {}

- set:
cluster_manager_node: node_id

- match: {master_node: $node_id}
- match: {cluster_manager_node: $node_id}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
indices.get_alias:
index: testind
name: testali

- match: { 'status': 404 }
- match: { 'error': 'alias [testali] missing' }
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Split index ignores target template mapping":
- skip:
features: allowed_warnings

# create index
- do:
indices.create:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"output_unigrams" : false,
"filler_token" : "FILLER"
}
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"output_unigrams" : false,
"filler_token" : "FILLER"
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion test/framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ test {
systemProperty 'tests.gradle_index_compat_versions', BuildParams.bwcVersions.indexCompatible.join(',')
systemProperty 'tests.gradle_wire_compat_versions', BuildParams.bwcVersions.wireCompatible.join(',')
systemProperty 'tests.gradle_unreleased_versions', BuildParams.bwcVersions.unreleased.join(',')

if (BuildParams.runtimeJavaVersion >= JavaVersion.VERSION_18) {
jvmArgs += ["-Djava.security.manager=allow"]
}
Expand Down

0 comments on commit dd6daab

Please sign in to comment.