Skip to content

fix: disable fips test on 1.2 and 1.3 streams#367

Merged
osmman merged 1 commit intomainfrom
disable_fips_where_not_supported
Jan 23, 2026
Merged

fix: disable fips test on 1.2 and 1.3 streams#367
osmman merged 1 commit intomainfrom
disable_fips_where_not_supported

Conversation

@bouskaJ
Copy link
Member

@bouskaJ bouskaJ commented Jan 23, 2026

PR Type

Bug fix


Description

  • Disable FIPS test on Kubernetes 1.2 and 1.3 streams

  • Add conditional logic to skip test on unsupported versions

  • Update test scenario description for clarity


Diagram Walkthrough

flowchart LR
  A["FIPS E2E Test"] -->|Check Version| B{"Version 1.2 or 1.3?"}
  B -->|Yes| C["Disabled"]
  B -->|No| D["Run Test"]
Loading

File Walkthrough

Relevant files
Bug fix
e2e.yaml
Conditional FIPS test disabling for version compatibility

konflux-configs/base/project/overlay/rhtas-operator/patch/e2e.yaml

  • Added conditional logic to disable FIPS test for Kubernetes versions
    1.2 and 1.3
  • Updated test scenario name field with template logic using version
    checks
  • Enhanced test description to indicate conditional behavior based on
    version support
  • Maintains test execution for supported versions while skipping on
    unsupported ones
+7/-2     

@qodo-code-review
Copy link

PR Compliance Guide 🔍

Below is a summary of compliance checks for this PR:

Security Compliance
🟢
No security concerns identified No security vulnerabilities detected by AI analysis. Human verification advised for critical code.
Ticket Compliance
🎫 No ticket provided
  • Create ticket/issue
Codebase Duplication Compliance
Codebase context is not defined

Follow the guide to enable codebase context checks.

Custom Compliance
🟢
Generic: Comprehensive Audit Trails

Objective: To create a detailed and reliable record of critical system actions for security analysis
and compliance.

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Generic: Meaningful Naming and Self-Documenting Code

Objective: Ensure all identifiers clearly express their purpose and intent, making code
self-documenting

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Generic: Robust Error Handling and Edge Case Management

Objective: Ensure comprehensive error handling that provides meaningful context and graceful
degradation

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Generic: Secure Error Handling

Objective: To prevent the leakage of sensitive system information through error messages while
providing sufficient detail for internal debugging.

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Generic: Secure Logging Practices

Objective: To ensure logs are useful for debugging and auditing without exposing sensitive
information like PII, PHI, or cardholder data.

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Generic: Security-First Input Validation and Data Handling

Objective: Ensure all data inputs are validated, sanitized, and handled securely to prevent
vulnerabilities

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Compliance status legend 🟢 - Fully Compliant
🟡 - Partial Compliant
🔴 - Not Compliant
⚪ - Requires Further Human Verification
🏷️ - Compliance label

@qodo-code-review
Copy link

PR Code Suggestions ✨

Explore these optional code suggestions:

CategorySuggestion                                                                                                                                    Impact
Possible issue
Improve version matching for streams

Improve the version matching logic to correctly handle patch releases for
versions v1.2 and v1.3, not just exact matches.

konflux-configs/base/project/overlay/rhtas-operator/patch/e2e.yaml [42-47]

 name: >-
-  {{- if or (eq .version "v1.3") (eq .version "v1.2")  -}}
+  {{- if or (eq .version "v1.3") (hasPrefix .version "v1.3.") (eq .version "v1.2") (hasPrefix .version "v1.2.") -}}
   disabled
   {{- else -}}
   group
   {{- end -}}
  • Apply / Chat
Suggestion importance[1-10]: 8

__

Why: The suggestion correctly identifies a logic flaw in the new code where patch versions (e.g., v1.2.1) would not be matched, and proposes a robust fix that handles version streams correctly.

Medium
Simplify YAML template expression

Refactor the multi-line Go template for the name field into a single-line
expression to improve conciseness.

konflux-configs/base/project/overlay/rhtas-operator/patch/e2e.yaml [42-47]

-name: >-
-  {{- if or (eq .version "v1.3") (eq .version "v1.2")  -}}
-  disabled
-  {{- else -}}
-  group
-  {{- end -}}
+name: {{- if or (eq .version "v1.3") (eq .version "v1.2") -}}disabled{{- else -}}group{{- end }}

[To ensure code accuracy, apply this suggestion manually]

Suggestion importance[1-10]: 3

__

Why: This is a valid stylistic suggestion that makes the template more compact, but the original multi-line block with >- is also correct and readable, making this a low-impact improvement.

Low
  • More

@github-actions
Copy link

Configuration Diff

1 document(s) impacted:

+ 0 added
- 0 removed
! 1 modified
Diff
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/rhtas-operator-e2e-test{{.nameSuffix}}-fips.spec.contexts @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/operator-template
! - one list entry removed:
- - name: group
-   description: "runs the integration test for a group Snapshot"
! + one list entry added:
+   - name: "{{- if or (eq .version \"v1.3\") (eq .version \"v1.2\")  -}} disabled {{- else -}} group {{- end -}}"
+     description: "runs the integration test for a group Snapshot or disable where not supported"

📦 Artifacts: base-output.yaml, head-output.yaml, dyff-output.txt

@osmman osmman merged commit 196ddb2 into main Jan 23, 2026
4 checks passed
@osmman osmman deleted the disable_fips_where_not_supported branch January 23, 2026 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants