Skip to content

Commit 044b0ab

Browse files
authored
Merge pull request #1289 from tnevrlka/remove-jvm-build-service
Remove Java dependency checks
2 parents d813c93 + 8133747 commit 044b0ab

File tree

6 files changed

+0
-222
lines changed

6 files changed

+0
-222
lines changed

antora/docs/modules/ROOT/pages/release_policy.adoc

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ Rules included:
6969
* xref:release_policy.adoc#cve__rule_data_provided[CVE checks: Rule data provided]
7070
* xref:release_policy.adoc#external_parameters__pipeline_run_params_provided[External parameters: PipelineRun params provided]
7171
* xref:release_policy.adoc#github_certificate__rule_data_provided[GitHub Certificate Checks: Rule data provided]
72-
* xref:release_policy.adoc#java__trusted_dependencies_source_list_provided[Java dependency checks: Trusted Java dependency source list was provided]
7372
* xref:release_policy.adoc#labels__rule_data_provided[Labels: Rule data provided]
7473
* xref:release_policy.adoc#olm__required_olm_features_annotations_provided[OLM: Required OLM feature annotations list provided]
7574
* xref:release_policy.adoc#rpm_repos__rule_data_provided[RPM Repos: Known repo id list provided]
@@ -116,8 +115,6 @@ Rules included:
116115
* xref:release_policy.adoc#cve__unpatched_cve_warnings[CVE checks: Non-blocking unpatched CVE check]
117116
* xref:release_policy.adoc#cve__rule_data_provided[CVE checks: Rule data provided]
118117
* xref:release_policy.adoc#hermetic_build_task__build_task_hermetic[Hermetic build task: Build task called with hermetic param set]
119-
* xref:release_policy.adoc#java__no_foreign_dependencies[Java dependency checks: Java builds have no foreign dependencies]
120-
* xref:release_policy.adoc#java__trusted_dependencies_source_list_provided[Java dependency checks: Trusted Java dependency source list was provided]
121118
* xref:release_policy.adoc#labels__deprecated_labels[Labels: Deprecated labels]
122119
* xref:release_policy.adoc#labels__disallowed_inherited_labels[Labels: Disallowed inherited labels]
123120
* xref:release_policy.adoc#labels__inaccessible_config[Labels: Inaccessible image config]
@@ -656,37 +653,6 @@ Verify the build task in the PipelineRun attestation was invoked with the proper
656653
* Code: `hermetic_build_task.build_task_hermetic`
657654
* https://github.com/enterprise-contract/ec-policies/blob/{page-origin-refhash}/policy/release/hermetic_build_task/hermetic_build_task.rego#L15[Source, window="_blank"]
658655

659-
[#java_package]
660-
== link:#java_package[Java dependency checks]
661-
662-
This package contains a rule to confirm that all Java dependencies were rebuilt in house rather than imported directly from potentially untrusted respositories. If the result is missing no violation is reported. The rules depend on the configuration under the key 'allowed_java_component_sources', the key lists all component sources that are allowed by the policy. The values of the list can be 'rebuilt' for dependencies that have been explicitly built from sources, or the name of the Maven repository names where the dependency artifact was retrieved from. The Maven repositories are configured using the 'JBSConfig' custom resources. Default configuration in Konflux currently includes Maven repositories with names : 'jboss', 'confluent', 'redhat', 'jitpack' and 'gradle'.
663-
664-
* Package name: `java`
665-
666-
[#java__no_foreign_dependencies]
667-
=== link:#java__no_foreign_dependencies[Java builds have no foreign dependencies]
668-
669-
The SBOM_JAVA_COMPONENTS_COUNT task result finds dependencies that have originated from foreign repositories, i.e. ones that are not rebuilt or provided by Red Hat. Verify there are no dependencies from sources not listed in the `allowed_java_component_sources` rule data.
670-
671-
*Solution*: Make sure there are no build dependencies that originate from foreign repositories. The allowed sources are in the rule_data under the key 'allowed_java_component_sources'.
672-
673-
* Rule type: [rule-type-indicator failure]#FAILURE#
674-
* FAILURE message: `Found Java dependencies from '%s', expecting to find only from '%s'`
675-
* Code: `java.no_foreign_dependencies`
676-
* https://github.com/enterprise-contract/ec-policies/blob/{page-origin-refhash}/policy/release/java/java.rego#L25[Source, window="_blank"]
677-
678-
[#java__trusted_dependencies_source_list_provided]
679-
=== link:#java__trusted_dependencies_source_list_provided[Trusted Java dependency source list was provided]
680-
681-
Confirm the `allowed_java_component_sources` rule data was provided, since it's required by the policy rules in this package.
682-
683-
*Solution*: Add a data source that contains allowable source repositories for build dependencies. The source must be located under a key named 'allowed_java_component_sources'. More information on adding xref:ec-cli:ROOT:configuration.adoc#_data_sources[data sources].
684-
685-
* Rule type: [rule-type-indicator failure]#FAILURE#
686-
* FAILURE message: `%s`
687-
* Code: `java.trusted_dependencies_source_list_provided`
688-
* https://github.com/enterprise-contract/ec-policies/blob/{page-origin-refhash}/policy/release/java/java.rego#L50[Source, window="_blank"]
689-
690656
[#labels_package]
691657
== link:#labels_package[Labels]
692658

antora/docs/modules/ROOT/partials/release_policy_nav.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
**** xref:release_policy.adoc#github_certificate__rule_data_provided[Rule data provided]
4545
*** xref:release_policy.adoc#hermetic_build_task_package[Hermetic build task]
4646
**** xref:release_policy.adoc#hermetic_build_task__build_task_hermetic[Build task called with hermetic param set]
47-
*** xref:release_policy.adoc#java_package[Java dependency checks]
48-
**** xref:release_policy.adoc#java__no_foreign_dependencies[Java builds have no foreign dependencies]
49-
**** xref:release_policy.adoc#java__trusted_dependencies_source_list_provided[Trusted Java dependency source list was provided]
5047
*** xref:release_policy.adoc#labels_package[Labels]
5148
**** xref:release_policy.adoc#labels__deprecated_labels[Deprecated labels]
5249
**** xref:release_policy.adoc#labels__disallowed_inherited_labels[Disallowed inherited labels]

policy/release/buildah_build_task/buildah_build_task_test.rego

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ test_dockerfile_param_http_source if {
8787
lib.assert_equal_results(expected, buildah_build_task.deny) with input.attestations as [slsav1_attestation]
8888
}
8989

90-
test_task_not_named_buildah if {
91-
lib.assert_empty(buildah_build_task.deny) with input.attestations as [_attestation("java", [{}], _results)]
92-
}
93-
9490
test_missing_pipeline_run_attestations if {
9591
attestation := {"statement": {"predicate": {"buildType": "something/else"}}}
9692
lib.assert_empty(buildah_build_task.deny) with input.attestations as [attestation]

policy/release/java/java.rego

Lines changed: 0 additions & 96 deletions
This file was deleted.

policy/release/java/java_test.rego

Lines changed: 0 additions & 83 deletions
This file was deleted.

policy/release/lib/attestations.rego

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ task_test_result_name := "TEST_OUTPUT"
3737

3838
task_test_image_result_name := "IMAGES_PROCESSED"
3939

40-
java_sbom_component_count_result_name := "SBOM_JAVA_COMPONENTS_COUNT"
41-
4240
slsa_provenance_attestations := [att |
4341
some att in input.attestations
4442
att.statement.predicateType in {slsa_provenance_predicate_type_v1, slsa_provenance_predicate_type_v02}

0 commit comments

Comments
 (0)