Skip to content

feat(blueprints): restore Terraform settings for Terraform-based Blueprint services #3081

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.

Sign up for GitHub

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

Closed
rmnbrd wants to merge 1 commit into from
Closed

feat(blueprints): restore Terraform settings for Terraform-based Blueprint services #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...service-settings/feature/src/lib/service-settings-layout/service-settings-layout.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jest.mock('@qovery/shared/ui', () => ({
}))

describe('ServiceSettingsLayout', () => {
it('hides Terraform-only settings for blueprint services', () => {
it('shows Terraform settings alongside Blueprint settings for Terraform Blueprint services', () => {
mockService = { ...terraformFactoryMock(1)[0], blueprint_id: 'blueprint-id' }

renderWithProviders(
Expand All @@ -43,8 +43,8 @@ describe('ServiceSettingsLayout', () => {
</ServiceSettingsLayout>
)

expect(screen.queryByText('Terraform configuration')).not.toBeInTheDocument()
expect(screen.queryByText('Terraform arguments')).not.toBeInTheDocument()
expect(screen.getByText('Terraform configuration')).toBeInTheDocument()
expect(screen.getByText('Terraform arguments')).toBeInTheDocument()
expect(screen.getByText('Blueprint configuration')).toBeInTheDocument()
expect(screen.getByText('Resources')).toBeInTheDocument()
expect(screen.queryByText('Deployment restrictions')).not.toBeInTheDocument()
Expand Down Expand Up @@ -80,6 +80,8 @@ describe('ServiceSettingsLayout', () => {
expect(screen.queryByText('Networking')).not.toBeInTheDocument()
expect(screen.queryByText('Domain')).not.toBeInTheDocument()
expect(screen.queryByText('Deployment restrictions')).not.toBeInTheDocument()
expect(screen.queryByText('Terraform configuration')).not.toBeInTheDocument()
expect(screen.queryByText('Terraform arguments')).not.toBeInTheDocument()
})

it('keeps Helm-specific settings for regular Helm services', () => {
Expand Down
2 changes: 2 additions & 0 deletions ...ains/service-settings/feature/src/lib/service-settings-layout/service-settings-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ export function ServiceSettingsLayout({ children }: ServiceSettingsLayoutProps)
const blueprintTerraformSettingsLinks = [
generalLink,
blueprintConfigurationLink,
terraformConfigurationLink,
terraformArgumentsLink,
resourcesLink,
advancedSettingsLink,
dangerZoneLink,
Expand Down
Loading