Skip to content

Make notifications aware of the FIPS build param (-Pcrypto.standard=FIPS-140-3) #1140

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
cwperks wants to merge 1 commit into from
Closed

Make notifications aware of the FIPS build param (-Pcrypto.standard=FIPS-140-3) #1140

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
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ jobs:
- name: publish snapshots to maven
run: |
cd notifications/
./gradlew publishPluginZipPublicationToSnapshotsRepository
./gradlew publishPluginZipPublicationToSnapshotsRepository "-Pcrypto.standard=FIPS-140-3"

4 changes: 2 additions & 2 deletions .github/workflows/notifications-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: |
chown -R 1000:1000 `pwd`
cd notifications
su `id -un 1000` -c "./gradlew build"
su `id -un 1000` -c "./gradlew build \"-Pcrypto.standard=FIPS-140-3\""

- name: Upload coverage
uses: codecov/codecov-action@v1
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
working-directory: ${{ env.WORKING_DIR }}
run: |
cd notifications
./gradlew build ${{ env.BUILD_ARGS }}
./gradlew build ${{ env.BUILD_ARGS }} "-Pcrypto.standard=FIPS-140-3"
env:
_JAVA_OPTIONS: ${{ matrix.os_java_options }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-notifications-test-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: |
cd notifications
chown -R 1000:1000 `pwd`
su `id -un 1000` -c "./gradlew integTest -Dsecurity=true -Dhttps=true --tests '*IT'"
su `id -un 1000` -c "./gradlew integTest \"-Pcrypto.standard=FIPS-140-3\" -Dsecurity=true -Dhttps=true --tests '*IT'"

- name: Upload failed logs
uses: actions/upload-artifact@v4
Expand Down
8 changes: 6 additions & 2 deletions notifications/notifications/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import javax.net.ssl.SSLContext
import javax.net.ssl.SSLSession
import javax.net.ssl.TrustManager
import javax.net.ssl.X509TrustManager
import org.opensearch.gradle.info.FipsBuildParams
import org.opensearch.gradle.test.RestIntegTestTask
import org.opensearch.gradle.testclusters.OpenSearchCluster
import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask
Expand Down Expand Up @@ -117,8 +118,11 @@ configurations.testImplementation {
exclude module: "securemock"
}

configurations.testRuntimeClasspath {
exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
// When building with -Pcrypto.standard=FIPS-140-3, bcprov is provided by OpenSearch
if (FipsBuildParams.isInFipsMode()) {
configurations.all {
exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
}
}

configurations.all {
Expand Down
Loading