Skip to content

Commit ae6ac72

Browse files
authored
Add new code hygiene workflow (#1699)
New workflow for running linters / checks to make sure the code base continues to follow best practices. Adding a new-line linter to make sure all files end with a single newline. This is a POSIX standard, read more https://stackoverflow.com/questions/729692/why-should-text-files-end-with-a-newline Signed-off-by: Peter Nied <petern@amazon.com>
1 parent acbf68e commit ae6ac72

File tree

186 files changed

+196
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+196
-185
lines changed

.github/ISSUE_TEMPLATE/bug_template.md

+1-1

.github/ISSUE_TEMPLATE/feature_request.md

+1-1

.github/pull_request_template.md

+1-1

.github/workflows/code-hygiene.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Code Hygiene
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
linelint:
7+
runs-on: ubuntu-latest
8+
name: Check if all files end in newline
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v2
12+
13+
- name: Linelint
14+
uses: fernandrone/linelint@0.0.4

.github/workflows/delete_backport_branch.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
- name: Delete merged branch
1313
uses: SvanBoxel/delete-merged-branch@b77e873cee00b09f55cc553bd24aae5f8dfc9157
1414
env:
15-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ IML
4141
# gradle
4242
build/
4343
gradle-build/
44-
.gradle/
44+
.gradle/

.linelint.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# 'true' will fix files
2+
autofix: true
3+
4+
# list of paths to ignore, uses gitignore syntaxes (executes before any rule)
5+
ignore:
6+
- .git/
7+
- .gradle/
8+
- src/test/resources/restapi/users_key_not_quoted.json
9+
10+
rules:
11+
# checks if file ends in a newline character
12+
end-of-file:
13+
# set to true to enable this rule
14+
enable: true
15+
16+
# if true also checks if file ends in a single newline character
17+
single-new-line: true

.whitesource

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
"issueSettings": {
1313
"minSeverityLevel": "LOW"
1414
}
15-
}
15+
}

ADMINS.md

+1-1

CONTRIBUTING.md

+1-1

DEVELOPER_GUIDE.md

+1-1

MAINTAINERS.md

+1-1

README.md

+1-1

RELEASING.md

+1-1

SECURITY.md

+1-1

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,4 +386,4 @@ buildRpm {
386386
buildDeb {
387387
arch = 'all'
388388
archiveName "${packageName}-${version}.deb"
389-
}
389+
}

config/checkstyle/sun_checks.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,4 @@
183183

184184
</module>
185185

186-
</module>
186+
</module>

legacy/securityconfig_v6/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,4 @@ opendistro_security:
216216
transport_enabled: false
217217
authorization_backend:
218218
type: ldap #
219-
#config goes here ...
219+
#config goes here ...

legacy/securityconfig_v6/internal_users.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ readall:
4242
snapshotrestore:
4343
hash: $2y$12$DpwmetHKwgYnorbgdvORCenv4NAK8cPUg8AI6pxLCuWf/ALc0.v7W
4444
roles:
45-
- snapshotrestore
45+
- snapshotrestore

legacy/securityconfig_v6/roles_mapping.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ opendistro_security_manage_snapshots:
3131

3232
opendistro_security_own_index:
3333
users:
34-
- '*'
34+
- '*'

plugin-security.policy

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ grant {
7979

8080
grant codeBase "${codebase.netty-common}" {
8181
permission java.lang.RuntimePermission "loadLibrary.*";
82-
};
82+
};

release-notes/opendistro-for-elasticsearch-security.release-notes-1.11.0.0.md

+1-1

release-notes/opendistro-for-elasticsearch-security.release-notes-1.7.0.0.md

+1-1

release-notes/opensearch-security.release-notes-1.0.0.0-beta1.md

+1-1

release-notes/opensearch-security.release-notes-1.2.0.0.md

+1-1

release-notes/opensearch-security.release-notes-1.2.1.0.md

+1-1

release-notes/opensearch-security.release-notes-1.2.3.0.md

+1-1

release-notes/opensearch-security.release-notes-1.2.4.0.md

+1-1

securityconfig/action_groups.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
_meta:
22
type: "actiongroups"
3-
config_version: 2
3+
config_version: 2

securityconfig/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,4 @@ config:
244244
# time_window_seconds: 3600
245245
# block_expiry_seconds: 600
246246
# max_blocked_clients: 100000
247-
# max_tracked_clients: 100000
247+
# max_tracked_clients: 100000

securityconfig/internal_users.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ snapshotrestore:
5353
reserved: false
5454
backend_roles:
5555
- "snapshotrestore"
56-
description: "Demo snapshotrestore user"
56+
description: "Demo snapshotrestore user"

src/main/assemblies/plugin.xml

-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,3 @@
4747
</fileSet>
4848
</fileSets>
4949
</assembly>
50-

src/main/assemblies/securityadmin-standalone.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@
4040
</excludes>
4141
</dependencySet>
4242
</dependencySets>
43-
</assembly>
43+
</assembly>

src/main/java/com/amazon/dlic/auth/http/jwt/oidc/json/OpenIdProviderConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ public void setJwksUri(String jwksUri) {
3232
this.jwksUri = jwksUri;
3333
}
3434

35-
}
35+
}

src/main/java/org/opensearch/security/auditlog/sink/WebhookSink.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,4 +421,4 @@ private static enum HttpMethod {
421421
}
422422

423423

424-
}
424+
}

src/main/java/org/opensearch/security/auth/AuthDomain.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ public String toString() {
7373
public int compareTo(final AuthDomain o) {
7474
return Integer.compare(this.order, o.order);
7575
}
76-
}
76+
}

src/main/java/org/opensearch/security/auth/AuthFailureListener.java

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@
2424
public interface AuthFailureListener {
2525
void onAuthFailure(InetAddress remoteAddress, AuthCredentials authCredentials, Object request);
2626
}
27-

src/main/java/org/opensearch/security/auth/internal/InternalAuthenticationBackend.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,4 @@ public void onInternalUsersModelChanged(InternalUsersModel ium) {
168168
}
169169

170170

171-
}
171+
}

src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java

-1
Original file line numberDiff line numberDiff line change
@@ -595,4 +595,3 @@ static Mode get(Settings settings) {
595595
}
596596
}
597597
}
598-

src/main/java/org/opensearch/security/configuration/DlsQueryParser.java

-1
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,3 @@ boolean containsTermLookupQuery(String query) {
162162

163163

164164
}
165-

src/main/java/org/opensearch/security/dlic/rest/api/ValidateApiAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ protected void consumeParameters(final RestRequest request) {
152152
request.paramAsBoolean("accept_invalid", false);
153153
}
154154

155-
}
155+
}

src/main/java/org/opensearch/security/dlic/rest/validation/TenantValidator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ public TenantValidator(final RestRequest request, boolean isSuperAdmin, BytesRef
4444
if (isSuperAdmin) allowedKeys.put("reserved", DataType.BOOLEAN);
4545
}
4646

47-
}
47+
}

src/main/java/org/opensearch/security/privileges/PrivilegesEvaluatorResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ public static enum PrivilegesEvaluatorResponseState {
9999
COMPLETE;
100100
}
101101

102-
}
102+
}

src/main/java/org/opensearch/security/securityconf/ConfigModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ public abstract class ConfigModel {
4545
public abstract SecurityRoles getSecurityRoles();
4646

4747
public abstract Set<String> getAllConfiguredTenantNames();
48-
}
48+
}

src/main/java/org/opensearch/security/securityconf/impl/HttpRequestMethods.java

-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@ public String getRequestMethod() {
3636
return requestMethod;
3737
}
3838
}
39-

src/main/java/org/opensearch/security/securityconf/impl/v6/ActionGroupsV6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ public String toString() {
7575
}
7676

7777

78-
}
78+
}

src/main/java/org/opensearch/security/securityconf/impl/v6/ConfigV6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,4 +319,4 @@ public String toString() {
319319

320320
}
321321

322-
}
322+
}

src/main/java/org/opensearch/security/securityconf/impl/v6/RoleMappingsV6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ public boolean isReserved() {
9191
return readonly;
9292
}
9393

94-
}
94+
}

src/main/java/org/opensearch/security/securityconf/impl/v6/RoleV6.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ public boolean isReserved() {
141141
return readonly;
142142
}
143143

144-
}
144+
}

src/main/java/org/opensearch/security/securityconf/impl/v7/ActionGroupsV7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ public String toString() {
116116

117117

118118

119-
}
119+
}

src/main/java/org/opensearch/security/securityconf/impl/v7/ConfigV7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,4 +460,4 @@ public String toString() {
460460

461461
}
462462

463-
}
463+
}

src/main/java/org/opensearch/security/securityconf/impl/v7/InternalUserV7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,4 @@ public void setStatic(boolean _static) {
155155
}
156156

157157

158-
}
158+
}

src/main/java/org/opensearch/security/securityconf/impl/v7/RoleMappingsV7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,4 @@ public String toString() {
130130

131131

132132

133-
}
133+
}

src/main/java/org/opensearch/security/securityconf/impl/v7/RoleV7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,4 @@ public String toString() {
275275

276276

277277

278-
}
278+
}

src/main/java/org/opensearch/security/securityconf/impl/v7/TenantV7.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@ public String toString() {
7777
}
7878

7979

80-
}
80+
}

src/main/java/org/opensearch/security/support/PemKeyReader.java

-1
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,3 @@ public static char[] randomChars(int len) {
385385

386386
private PemKeyReader() { }
387387
}
388-

0 commit comments

Comments
 (0)