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

uses tembo-stacks crate for merge logic between stacks, instance, app_services #534

Merged
merged 7 commits into from
Feb 13, 2024

Conversation

shahadarsh
Copy link
Collaborator

@shahadarsh shahadarsh commented Feb 8, 2024

No description provided.

@shahadarsh shahadarsh changed the title uses tembo-stacks crate for merge logic between stacks, instance, app… uses tembo-stacks crate for merge logic between stacks, instance, app_services Feb 8, 2024
stack.app_services.clone(),
extensions,
trunk_installs,
Option::None,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Skipping the pg_config merge here and using the existing logic that's there

{% if instance.app_services.restapi %}
{{instance.instance_name}}-postgrest:
image: postgrest/postgrest:v10.0.0
{% set_global pathPrefixes = "" -%}
Copy link
Collaborator Author

@shahadarsh shahadarsh Feb 13, 2024

Choose a reason for hiding this comment

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

The template is getting complex. I will look at simplifying this either by moving it to Rust or figuring out another way in the coming PRs.

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree, at this point it seems like we should just have a Value type constructed in rust then formatted into the yaml file

@@ -528,6 +574,32 @@ fn get_extensions(
vec_extensions
}

fn get_extensions_controller(
Copy link
Collaborator Author

@shahadarsh shahadarsh Feb 13, 2024

Choose a reason for hiding this comment

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

Now that we have tembo-stacks more types can be reused but will require significant work in CLI so need to convert it (at least for now) to use it with merge_app_reqs.

@shahadarsh shahadarsh marked this pull request as ready for review February 13, 2024 03:10
{% if instance.app_services.restapi %}
{{instance.instance_name}}-postgrest:
image: postgrest/postgrest:v10.0.0
{% set_global pathPrefixes = "" -%}
Copy link
Contributor

Choose a reason for hiding this comment

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

I agree, at this point it seems like we should just have a Value type constructed in rust then formatted into the yaml file

@shahadarsh shahadarsh merged commit 4dc672c into main Feb 13, 2024
10 checks passed
@shahadarsh shahadarsh deleted the tembo-stacks-cli branch February 13, 2024 19:40
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.

2 participants