Skip to content
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

2.31.8 CVE patch release #627

Merged
merged 2 commits into from
Apr 6, 2023
Merged

2.31.8 CVE patch release #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42fa117
2.31.8 CVE patch release
Claych Apr 5, 2023
760bfed
Revert "init: fix S3 ARN parsing #617"
Claych Apr 6, 2023
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 AWS_FOR_FLUENT_BIT_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.31.7
2.31.8
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@
* Enhancement - Add clear info message when chunks are removed because `storage.total_limit_size` is reached [fluent-bit:6719](https://github.com/fluent/fluent-bit/pull/6719)


### 2.31.8
This release includes:
* Fluent Bit [1.9.10](https://fluentbit.io/announcements/v1.9.10/)
* Amazon CloudWatch Logs for Fluent Bit 1.9.3
* Amazon Kinesis Streams for Fluent Bit 1.10.2
* Amazon Kinesis Firehose for Fluent Bit 1.7.2

Compared to `2.31.7` this release adds:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Claych since I merged the init gov cloud fix it also is going out in this release too I think. Needs to be called out or reverted.

We're not supposed to add features in CVE releases, so technically we should revert it. Just in case my change introduced a bug which would block folks from consuming the CVE fixes.

https://github.com/aws/aws-for-fluent-bit/commits/mainline

* New images - Added debug images to [Amazon ECR Public Gallery](https://gallery.ecr.aws/aws-observability/aws-for-fluent-bit), [Docker Hub](https://hub.docker.com/r/amazon/aws-for-fluent-bit) and Amazon ECR. For debug images, we update the `debug-latest` tag and add a tag as `debug-<Version>`.

*This release is a **CVE patch release for [2.31.7](https://github.com/aws/aws-for-fluent-bit/releases/tag/v2.31.7)**. It contains the same contents but re-built to uptake the most recent Amazon Linux packages with patches.*


### 2.28.5
This release includes:
* Fluent Bit [1.9.9](https://fluentbit.io/announcements/v1.9.9/)
Expand Down
11 changes: 4 additions & 7 deletions init/fluent_bit_init_process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,20 +195,17 @@ func processConfigFile(path string) {
}
}

func getS3ConfigFile(userInput string) string {
func getS3ConfigFile(arn string) string {
// Preparation for downloading S3 config files
if !s3ClientCreated {
createS3Client()
}

// e.g. "arn:aws:s3:::user-bucket/s3_parser.conf"
s3ARN, err := arn.Parse(userInput)
if err != nil {
logrus.Fatalf("[FluentBit Init Process] Could not parse arn: %s\n", userInput)
}
bucketAndFile := strings.SplitN(s3ARN.Resource, "/", 2)
arnBucketFile := arn[13:]
bucketAndFile := strings.SplitN(arnBucketFile, "/", 2)
if len(bucketAndFile) != 2 {
logrus.Fatalf("[FluentBit Init Process] Could not parse arn: %s\n", userInput)
logrus.Fatalf("[FluentBit Init Process] Unrecognizable arn: %s\n", arn)
}

bucketName := bucketAndFile[0]
Expand Down
2 changes: 1 addition & 1 deletion linux.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"linux": {
"version": "2.31.7",
"version": "2.31.8",
"latest": "true",
"build": "1",
"fluent-bit": "1.9.10",
Expand Down
14 changes: 13 additions & 1 deletion windows.versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
{
"windows": [
{
"version": "2.31.8",
"build": "1",
"fluent-bit": "1.9.10",
"kinesis-plugin": "v1.10.2",
"firehose-plugin": "v1.7.2",
"cloudwatch-plugin": "v1.9.3",
"openssl": "3.0.7",
"flexBison": "2.5.22",
"latest": true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please ensure latest is set to false in 2.31.7.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!!!!!

"stable": false
},
{
"version": "2.31.7",
"build": "1",
Expand All @@ -9,7 +21,7 @@
"cloudwatch-plugin": "v1.9.2",
"openssl": "3.0.7",
"flexBison": "2.5.22",
"latest": true,
"latest": false,
"stable": false
},
{
Expand Down