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.

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

Oracle GoldenGate #2780

Merged
merged 10 commits into from
May 2, 2024
Merged

Oracle GoldenGate #2780

merged 10 commits into from
May 2, 2024

Conversation

sbalousek
Copy link
Member

  • Initial files to support containerized execution of Oracle GoldenGate 23

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Apr 10, 2024
Copy link
Member

@Djelibeybi Djelibeybi left a comment

Choose a reason for hiding this comment

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

It occurred to me when I finished the review that all the strings that have spaces between the letters could actually be removed without any loss of context. I figured I'd mention that here instead of going back and editing all those review comments.

Also, the reason why the copyright lines need to be 2024 is because the files themselves are new. The age of the content in those files is irrelevant in this regard.

OracleGoldenGate/23/Dockerfile Outdated Show resolved Hide resolved
OracleGoldenGate/23/bin/create-certificate.sh Outdated Show resolved Hide resolved
OracleGoldenGate/23/bin/create-certificate.sh Outdated Show resolved Hide resolved
OracleGoldenGate/23/bin/deployment-init.py Outdated Show resolved Hide resolved
OracleGoldenGate/23/bin/deployment-init.py Outdated Show resolved Hide resolved
OracleGoldenGate/23/nginx/nginx.conf Outdated Show resolved Hide resolved
OracleGoldenGate/23/nginx/nginx.conf Outdated Show resolved Hide resolved
OracleGoldenGate/23/nginx/ogg-headers.conf Outdated Show resolved Hide resolved
OracleGoldenGate/23/nginx/ogg.conf Outdated Show resolved Hide resolved
OracleGoldenGate/23/nginx/ogg.conf Outdated Show resolved Hide resolved
@sbalousek
Copy link
Member Author

Thanks for your time, @Djelibeybi !

@Djelibeybi
Copy link
Member

Thanks for your time, @Djelibeybi !

You're welcome. :)

@sbalousek
Copy link
Member Author

@Djelibeybi - One last thing: we cannot merge until OGG 23 is released. I will let you know.

@sbalousek sbalousek marked this pull request as draft April 11, 2024 15:50
Djelibeybi
Djelibeybi previously approved these changes Apr 11, 2024
Copy link
Member

@Djelibeybi Djelibeybi left a comment

Choose a reason for hiding this comment

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

There are two very minor things I spotted but they're far from release blockers. You can decide whether or not you want to address them while the PR is still in draft mode.

OracleGoldenGate/23/Dockerfile Show resolved Hide resolved
OracleGoldenGate/23/README.md Outdated Show resolved Hide resolved
@sbalousek sbalousek marked this pull request as ready for review May 2, 2024 15:11
 - Initial files to support containerized execution of Oracle GoldenGate 23

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
 - Clean up script execution logic

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
 - Address review comments

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
 - Additional branding changes from Product Management

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
 - Fix links to the Oracle Technology Network

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
 - Added support for PostgreSQL

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
 - Fix syntax error in `healthcheck`

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
@sbalousek
Copy link
Member Author

Hi @Djelibeybi - I am having trouble finding the error in the super linter check. Any pointers would be appreciated.

@Djelibeybi
Copy link
Member

Hi @Djelibeybi - I am having trouble finding the error in the super linter check. Any pointers would be appreciated.

The linting issues are being found by SHELL_SHFMT and can be seen by expanding that section or by clicking here: https://github.com/oracle/docker-images/actions/runs/8926398614/job/24517335048?pr=2780#step:5:233

@Djelibeybi
Copy link
Member

Though, now that I'm looking at it closely, I'm not sure I agree with the linter on a few things (like its suggested indentation or lack thereof). I'll take a closer look tomorrow or over the weekend and tweak the linter as necessary. If you feel the linter is being overly pedantic, let me know and I'll merge after I do a final manual check.

 - Reformat shell scripts through `shfmt -w -i 4`

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
@sbalousek
Copy link
Member Author

I simply do not see the error. The shfmt tool is too aggressive with regard to whitespace, marking style differences as errors. I made the suggested corrections, which are still failing for no apparent reason. When I run shfmt locally, the return code is 0 for all files using shfmt -w -i 4.

As far as I can tell, this PR failed because shfmt expects TAB indentation, which I don't agree with. Other than that, I see no errors.

shfmt did, however, find an issue that ShellCheck did not.

@sbalousek
Copy link
Member Author

These changes - which are critical to the GoldenGate 23ai release - passed lint checks a few weeks ago. If there is anything you can do before next week, I would really appreciate it.

 - Fix port number for NGINX health check

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
 - Run all shell scripts through `shfmt -w`, replacing leading spaces with TAB characters

Signed-off-by: Stephen Balousek <stephen.balousek@oracle.com>
@sbalousek
Copy link
Member Author

I thought about this more and realized TAB characters are the current requirement (per shfmt), so I reformatted and tested the scripts.

Copy link
Member

@Djelibeybi Djelibeybi left a comment

Choose a reason for hiding this comment

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

I dislike Tab for whitespace too, so I'll adjust the SHFMT configuration accordingly so it doesn't flag that as an error in future. I'll approve and merge this in the meantime though.

@Djelibeybi Djelibeybi merged commit 5c8d914 into oracle:main May 2, 2024
3 checks passed
@sbalousek
Copy link
Member Author

Thanks a bunch, Avi. Have a fantastic weekend!

@Djelibeybi
Copy link
Member

Thanks a bunch, Avi. Have a fantastic weekend!

You're welcome and likewise.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants