Skip to content

Update non java files#2812

Merged
stephen-crawford merged 3 commits intoopensearch-project:mainfrom
stephen-crawford:updateFormatDlicAuth
May 31, 2023
Merged

Update non java files#2812
stephen-crawford merged 3 commits intoopensearch-project:mainfrom
stephen-crawford:updateFormatDlicAuth

Conversation

@stephen-crawford
Copy link
Contributor

@stephen-crawford stephen-crawford commented May 30, 2023

Description

Updates the code style for everything that is not a java file.

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

cwperks and others added 2 commits May 30, 2023 16:24
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
@stephen-crawford stephen-crawford changed the title Update format dlic auth Update ymls May 30, 2023
@stephen-crawford stephen-crawford changed the title Update ymls Update non java files May 30, 2023
@codecov
Copy link

codecov bot commented May 30, 2023

Codecov Report

Merging #2812 (c469b69) into main (9be79bd) will increase coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #2812   +/-   ##
=========================================
  Coverage     61.48%   61.48%           
- Complexity     3401     3402    +1     
=========================================
  Files           266      266           
  Lines         18865    18865           
  Branches       3302     3302           
=========================================
+ Hits          11599    11600    +1     
  Misses         5669     5669           
+ Partials       1597     1596    -1     

see 1 file with indirect coverage changes

@reta
Copy link
Collaborator

reta commented May 31, 2023

@scrawfor99 👏 looks pretty good, this is the same rules as for OpenSearch core, right?

Copy link
Member

@cwperks cwperks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stephen-crawford
Copy link
Contributor Author

@reta, I checked with core and job scheduler and they are identical. So I just took the one from job scheduler since Craig had already added the changes into a branch of his own.

@stephen-crawford stephen-crawford merged commit 5f9c90b into opensearch-project:main May 31, 2023
@stephen-crawford stephen-crawford deleted the updateFormatDlicAuth branch May 31, 2023 13:14
@cwperks
Copy link
Member

cwperks commented May 31, 2023

@scrawfor99 Please open up a manual backport of this change to 2.x.

@stephen-crawford
Copy link
Contributor Author

@scrawfor99 Please open up a manual backport of this change to 2.x.

I was just gonna backport the style changes manually once everything is approved if that is okay. Basically, I am intentionally splitting the changes so they can be reviewed but for the backport we can just run the new workflow to backport.

@cwperks
Copy link
Member

cwperks commented May 31, 2023

@scrawfor99 There may be some challenges in backporting other PRs if its in a state where there are formatting changes on main that are not in the 2.x branch. I think it may make sense to backport these individually or do one big PR with all formatting changes.

@stephen-crawford
Copy link
Contributor Author

Hi @cwperks, the reason the formatting changes are split like this is to try and make reviewing the changes feasible. Basically, there are too many changes to be reviewed altogether so it is easier to tell how things are changing by moving piece by piece.

The issue with backporting each individual PR is that we are not actually backporting a code change but just an updated format guideline. What we would want to backport is just the build.gradle change not the actual code changes resulting from the the updated formatting themselves.

I am not sure how to do that so I am hoping we can instead just update the format of the entirety of 2.x once we have all accepted the changes as appropriate.

Does that make sense?

MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
* Isolate spotless config changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update dlic/auth package style

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update formatterConfig.xml

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
* Isolate spotless config changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update dlic/auth package style

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update formatterConfig.xml

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
RyanL1997 pushed a commit to RyanL1997/security that referenced this pull request Jun 13, 2023
* Isolate spotless config changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update dlic/auth package style

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update formatterConfig.xml

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
* Isolate spotless config changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update dlic/auth package style

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update formatterConfig.xml

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
* Isolate spotless config changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update dlic/auth package style

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update formatterConfig.xml

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Sam <samuel.costa@eliatra.com>
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
* Isolate spotless config changes

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update dlic/auth package style

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update formatterConfig.xml

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Co-authored-by: Craig Perkins <cwperx@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments