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

Bug fixes #311

Merged
merged 5 commits into from
Jun 7, 2024
Merged

Bug fixes #311

merged 5 commits into from
Jun 7, 2024

Conversation

bradsawadye
Copy link
Contributor

@bradsawadye bradsawadye commented Jun 5, 2024

Summary by CodeRabbit

  • New Features

    • Added SSH keys for new users to improve system access management.
  • Bug Fixes

    • Corrected a typo in a node label constraint for better configuration accuracy.
  • Configuration Changes

    • Updated upstream server configuration in Nginx for improved service routing.
    • Modified environment variable for PostgreSQL service in Docker Compose to ensure proper service linkage.
  • Chores

    • Removed deprecated service and adjusted formatting in the OpenHIM feature file for cleaner configuration.

The jempi ui should communicate with jempi-api-kc service when keycloak integration is enabled
Copy link
Contributor

coderabbitai bot commented Jun 5, 2024

Walkthrough

The recent changes span across multiple configuration files, addressing SSH key additions, Nginx reverse proxy adjustments, and docker-compose corrections. Specifically, new SSH keys were added for two users, upstream server variables in Nginx were updated, a typo in a docker-compose file was fixed, and an environment variable for a service was corrected. Additionally, a service was removed, and formatting adjustments were made in a feature file.

Changes

Files Change Summary
infrastructure/ansible/inventories/development/group_vars/all.yml Added SSH keys for users martin.brocker@symbionix.co and derrick.rono@jembi.org.
reverse-proxy-nginx/package-conf-insecure/http-jempi-insecure.conf Changed upstream server variable from jempi-api to jempi-api-kc.
reverse-proxy-nginx/package-conf-secure/http-jempi-secure.conf Changed upstream server variable from jempi-api to jempi-api-kc.
client-registry-jempi/docker-compose.dgraph-zero-cluster.yml Fixed typo in node label constraint from ${JEPMI_ZERO_02_PLACEMENT} to ${JEMPI_ZERO_02_PLACEMENT}.
client-registry-jempi/docker-compose.combined.yml Changed POSTGRESQL_IP environment variable from ${JEMPI_POSTGRES_DB} to ${POSTGRES_SERVICE}.
test/cucumber/features/cluster-mode/openhim-packages.cluster.feature Removed service interoperability-layer-openhim-config-importer and adjusted service connections formatting.

Poem

In the code, new keys now reside,
For Martin and Derrick, access wide.
Nginx paths, a slight reroute,
From jempi-api to kc, no doubt.
A typo fixed, environment set,
The cluster's better, you can bet.
With tweaks and trims, we celebrate,
Our system's now in top-notch state!


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Collaborator

@drizzentic drizzentic left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between ec6ae59 and f32a132.

Files selected for processing (3)
  • infrastructure/ansible/inventories/development/group_vars/all.yml (2 hunks)
  • reverse-proxy-nginx/package-conf-insecure/http-jempi-insecure.conf (1 hunks)
  • reverse-proxy-nginx/package-conf-secure/http-jempi-secure.conf (1 hunks)
Additional comments not posted (2)
reverse-proxy-nginx/package-conf-insecure/http-jempi-insecure.conf (1)

18-18: Change in upstream server variable approved.

reverse-proxy-nginx/package-conf-secure/http-jempi-secure.conf (1)

62-62: Change in upstream server variable approved.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between f32a132 and dac2806.

Files selected for processing (1)
  • client-registry-jempi/docker-compose.dgraph-zero-cluster.yml (1 hunks)
Files skipped from review due to trivial changes (1)
  • client-registry-jempi/docker-compose.dgraph-zero-cluster.yml

@bradsawadye bradsawadye marked this pull request as draft June 6, 2024 07:25
@bradsawadye bradsawadye marked this pull request as ready for review June 6, 2024 07:26
It seems the bootstrapper does not cater for a replicated postgres url.
@bradsawadye bradsawadye marked this pull request as draft June 6, 2024 11:32
@bradsawadye bradsawadye marked this pull request as ready for review June 6, 2024 11:32
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between dac2806 and 1c9b684.

Files selected for processing (1)
  • client-registry-jempi/docker-compose.combined.yml (1 hunks)
Additional comments not posted (1)
client-registry-jempi/docker-compose.combined.yml (1)

114-114: Verify the usage of the new environment variable ${POSTGRES_SERVICE}.

Verification successful

Re-run the verification script with corrected file type handling.


The verification script confirms that the ${POSTGRES_SERVICE} variable is consistently used across multiple Docker Compose files. This indicates that the change to the POSTGRESQL_IP environment variable in the jempi-bootstrapper service is aligned with the rest of the configuration.

  • : The change to use ${POSTGRES_SERVICE} for the POSTGRESQL_IP environment variable is consistent with the usage across other Docker Compose files.
Scripts executed

The following scripts were executed for the analysis:


Script:

#!/bin/bash
# Description: Verify the definition and usage of `${POSTGRES_SERVICE}` across Docker Compose files.

# Test: Search for the variable usage. Expect: Consistent usage across files.
rg --type yaml --type yml $'POSTGRES_SERVICE' --files-with-matches | xargs cat | grep 'POSTGRES_SERVICE'

Length of output: 129



Script:

#!/bin/bash
# Description: Verify the definition and usage of `${POSTGRES_SERVICE}` across Docker Compose files.

# Test: Search for the variable usage. Expect: Consistent usage across files.
rg --type-add 'yaml:*.yml' --type yaml 'POSTGRES_SERVICE' --files-with-matches | xargs cat | grep 'POSTGRES_SERVICE'

Length of output: 331

@BMartinos
Copy link
Collaborator

Hi Team. Any idea as to when this could be merged in? I see the tests are failing, although Im not sure why due to the changes in the PR.

@bradsawadye bradsawadye marked this pull request as draft June 7, 2024 12:27
@bradsawadye bradsawadye marked this pull request as ready for review June 7, 2024 12:27
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 1c9b684 and 7878a5e.

Files selected for processing (1)
  • test/cucumber/features/cluster-mode/openhim-packages.cluster.feature (1 hunks)
Files skipped from review due to trivial changes (1)
  • test/cucumber/features/cluster-mode/openhim-packages.cluster.feature

@bradsawadye bradsawadye merged commit 6916389 into main Jun 7, 2024
9 checks passed
@bradsawadye bradsawadye deleted the bug-fixes branch June 7, 2024 13:39
drizzentic pushed a commit that referenced this pull request Jun 21, 2024
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