Skip to content

Commit 0ee498f

Browse files
yaauieyaauie
authored
Merge branch 'feature/fedramp-high-8.x' into fips-validation-extension
2 parents de41bc4 + 17fb059 commit 0ee498f

8 files changed

+61
-9
lines changed

Diff for: ‎.buildkite/pull_request_pipeline.yml

+21-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,27 @@ steps:
1818
export JRUBY_OPTS="-J-Xmx1g"
1919
export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
2020
ci/license_check.sh -m 4G
21-
# SKIP LICENCE CHECK FOR NOW WHILE WE FIGURE OUT DEPENDENCY VENDORING/PACKAGING
22-
skip: "Skipping license check: TODO unskip once packaging is sorted out"
21+
22+
steps:
23+
- label: ":passport_control: License check - Fedramp High Mode"
24+
key: "license-check-fedramp-high"
25+
agents:
26+
provider: gcp
27+
imageProject: elastic-images-prod
28+
image: family/platform-ingest-logstash-ubuntu-2204
29+
machineType: "n2-standard-4"
30+
diskSizeGb: 64
31+
retry:
32+
automatic:
33+
- limit: 3
34+
command: |
35+
set -euo pipefail
36+
37+
source .buildkite/scripts/common/container-agent.sh
38+
export JRUBY_OPTS="-J-Xmx1g"
39+
export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
40+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
41+
docker run -e ORG_GRADLE_PROJECT_fedrampHighMode=true test-runner-image ci/license_check.sh -m 4G
2342
2443
- label: ":rspec: Ruby unit tests"
2544
key: "ruby-unit-tests"

Diff for: ‎Gemfile.template

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ gem "stud", "~> 0.0.22", :group => :build
2525
gem "fileutils", "~> 1.7"
2626

2727
gem "rubocop", :group => :development
28+
# rubocop-ast 1.43.0 carries a dep on `prism` which requires native c extensions
29+
gem 'rubocop-ast', '= 1.42.0', :group => :development
2830
gem "belzebuth", :group => :development
2931
gem "benchmark-ips", :group => :development
3032
gem "ci_reporter_rspec", "~> 1", :group => :development

Diff for: ‎rakelib/artifacts.rake

+6-7
Original file line numberDiff line numberDiff line change
@@ -562,13 +562,12 @@ namespace "artifact" do
562562

563563
task "prepare-observabilitySRE" do
564564
if ENV['SKIP_PREPARE'] != "1"
565-
%w(
566-
bootstrap
567-
plugin:install-default
568-
plugin:trim-for-observabilitySRE
569-
plugin:install-fips-validation-plugin
570-
artifact:clean-bundle-config
571-
).each {|task| Rake::Task[task].invoke }
565+
Rake::Task['bootstrap'].invoke
566+
Rake::Task['plugin:install-default'].invoke
567+
Rake::Task['plugin:install'].invoke('logstash-filter-age')
568+
Rake::Task['plugin:install-fips-validation-plugin'].invoke
569+
Rake::Task['plugin:trim-for-observabilitySRE'].invoke
570+
Rake::Task['artifact:clean-bundle-config'].invoke
572571
end
573572
end
574573

Diff for: ‎tools/dependencies-report/src/main/resources/licenseMapping.csv

+4
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
133133
"org.apache.logging.log4j:log4j-core:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
134134
"org.apache.logging.log4j:log4j-jcl:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
135135
"org.apache.logging.log4j:log4j-slf4j-impl:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
136+
"org.bouncycastle:bc-fips:",https://www.bouncycastle.org,MIT
137+
"org.bouncycastle:bcpkix-fips:",https://www.bouncycastle.org,MIT
138+
"org.bouncycastle:bctls-fips:",https://www.bouncycastle.org,MIT
139+
"org.bouncycastle:bcutil-fips:",https://www.bouncycastle.org,MIT
136140
"org.codehaus.janino:commons-compiler:",https://github.com/janino-compiler/janino,BSD-3-Clause
137141
"org.codehaus.janino:janino:",https://github.com/janino-compiler/janino,BSD-3-Clause
138142
"org.codehaus.mojo:animal-sniffer-annotations:",https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/,MIT

Diff for: ‎tools/dependencies-report/src/main/resources/notices/org.bouncycastle!bc-fips-NOTICE.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright (c) 2014-2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4+
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Diff for: ‎tools/dependencies-report/src/main/resources/notices/org.bouncycastle!bcpkix-fips-NOTICE.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright (c) 2014-2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4+
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Diff for: ‎tools/dependencies-report/src/main/resources/notices/org.bouncycastle!bctls-fips-NOTICE.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright (c) 2014-2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4+
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Diff for: ‎tools/dependencies-report/src/main/resources/notices/org.bouncycastle!bcutil-fips-NOTICE.txt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright (c) 2014-2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4+
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)