Skip to content

Merge stash master to GitHub master#50

Merged
vishaalcharpe merged 198 commits into
masterfrom
merge-stash-master-to-github-master
Jun 9, 2026
Merged

Merge stash master to GitHub master#50
vishaalcharpe merged 198 commits into
masterfrom
merge-stash-master-to-github-master

Conversation

@vishaalcharpe

Copy link
Copy Markdown
Contributor

This PR brings the latest Stash master branch into GitHub. Some files differ from the existing GitHub master

gagansingh355 and others added 30 commits March 30, 2022 10:05
Merge in DEV/lm-logs-aws from DEV-98889-Cloudformation-Stack-creation-failed-for-AWS to develop

* commit '4aaee1b37ae3c46405a254aa2f0893c2767a305c':
  capitalising version variable
  Updating version.properties
  DEV-98889 fix
Merge in DEV/lm-logs-aws from DEV-98889-Cloudformation-Stack-creation-failed-for-AWS to develop

* commit '5cd5585f04453d0ba19437de763c4fafad4d64dd':
  Version file update
Merge in DEV/lm-logs-aws from develop to master

* commit 'd1db543f2ed4c218ca86d066a2d617e10e9cd2a5':
  Version file update
  capitalising version variable
  Updating version.properties
  DEV-98889 fix
Merge in DEV/lm-logs-aws from DEV-99879 to develop

* commit '047977c2c7c212972442527ab3c47473b673f73c':
  DEV-99879 changes
Merge in DEV/lm-logs-aws from DEV-103158 to develop

* commit '06e87dfa2c93b0964fb8378d9df15ec814848e42':
  Update cloudformation.yaml
  Update region in url
  Update cloudformation.yaml
Merge in DEV/lm-logs-aws from develop to master

* commit 'def0d67f55ff4a183fd18fc5d24e1c016bdbcf98':
  Update cloudformation.yaml
  Update region in url
  Update cloudformation.yaml
  DEV-99879 changes
Merge in DEV/lm-logs-aws from bugfix/DEV-102562-lm-logs-aws-integration-readme-file-need-correction to master

* commit 'c9cd4a7707595d024fbe163162271e35df3fc333':
  DEV-102562:Changed elb flow logs to rds logs
Merge in DEV/lm-logs-aws from DEV-116564 to develop

* commit 'a341a58c8143f992f7905fa1e47b8184bf3c9b87':
  Removing log line
  DEV-116564 fix
Merge in DEV/lm-logs-aws from develop to master

* commit '6c09885d258c1b807ce8750b8e219a3e1dfdbfa2':
  Removing log line
  DEV-116564 fix
…tive s3 resource and not to the aws account

Merge in DEV/lm-logs-aws from DEV-126037-map-the-cloudtrail-logs-for-s3-to-respective-s3-resource-and-not-to-the-aws-account to develop

* commit 'bc90303bfb55644e37724c634c33f10b5f73f007':
  DEV-126037:Syncing stash with git for ticket DEV-126037
  DEV-102562:Changed elb flow logs to rds logs
…6037

Merge in DEV/lm-logs-aws from develop to master

* commit 'db8b2e7386cb7c5963715615f2a5612435fc8a6c':
  DEV-126037:Syncing stash with git for ticket DEV-126037
…mbda resource

Merge in DEV/lm-logs-aws from DEV-126039-map-the-cloudtrail-logs-for-lambda-to-respective-lambda-resource-in-lm-and-not-to-the-aws to develop

* commit '6b15d746b4f07c24167d7bea6529e40cc23e66fa':
  DEV-126039:Addressing PR comments
  DEV-126039:Mapping lambd cloudrail logs to resp. lambda resource
Merge in DEV/lm-logs-aws from DEV-126037-Mapping-cloudtrail-to-s3-bucket to develop

* commit '330904b9f6ad45e352a41d2818fd4c63be1059ca':
  DEV-126037:We can get bucketName instead of ARn
Merge in DEV/lm-logs-aws from develop to master

* commit 'ff887c59248ad7b4b7778d6aa52e9e10f8a07f30':
  DEV-126037:We can get bucketName instead of ARn
  DEV-126039:Addressing PR comments
  DEV-126039:Mapping lambd cloudrail logs to resp. lambda resource
prakalp05 and others added 21 commits May 19, 2025 15:58
add details in readme for sagemaker

resolved comments : fixed version update

resolved comments : fixed version update
Merge in DEV/lm-logs-aws from sagemaker_logs_support to develop

* commit '2e0603b520e6f782920247fc4e9c6f11935120af':
  add details in readme, fix version
  support for endpoint,trainingJob,processingJob logs
… Sagemaker Logs

Merge in DEV/lm-logs-aws from develop to master

* commit '529a1a264c366a65fa635fc8c3b51a5c9663cabb':
  add details in readme, fix version
  support for endpoint,trainingJob,processingJob logs
…logs

Merge in DEV/lm-logs-aws from DEV-197633-support-for-amazon-q-business-api-call-logs1 to develop

* commit '3b321c0b5c68c50bb6125c04fbdc378bccff53a8':
  DEV-197633:  support-for-amazon-q-business-api-call-logs
  DEV-197633:  support-for-amazon-q-business-api-call-logs
Merge in DEV/lm-logs-aws from develop to master

* commit '74ed78bed0e17f645efb56448dbd4e0216f4ae60':
  DEV-197633:  support-for-amazon-q-business-api-call-logs
  DEV-197633:  support-for-amazon-q-business-api-call-logs
Merge in DEV/lm-logs-aws from dummy to develop

* commit 'f044ee0f9a547db184caf58757c39c7320bff0e1':
  dummy:  dummy
Merge in DEV/lm-logs-aws from develop to master

* commit 'aadafcf81a4f9ae4f0ac280ad3c3a69e0fc34566':
  dummy:  dummy
Merge in DEV/lm-logs-aws from DEVTS-23602-vulnerability-in-logforwarder-lambda to develop

* commit 'c73ce7dccca20f22fac7c41275121c2fdd76a338':
  DEVTS-23602 fixes for vulnerability
… golang version

Merge in DEV/lm-logs-aws from DEVTS-23602-vulnerability-in-logforwarder-lambda to develop

* commit 'a5d26ca7cc52f618c1acb35da242359c64800eb1':
  version update from 1.8.0 to 1.9.0 - updated golang version
Merge in DEV/lm-logs-aws from develop to master

* commit '84caae13bdaaa4f176f27fc6a3cb1e040c904ac4':
  version update from 1.8.0 to 1.9.0 - updated golang version
  DEVTS-23602 fixes for vulnerability
…gs-forwarder-lambda

Merge in DEV/lm-logs-aws from DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda to develop

* commit '338d9f19f05143b2e2be944aeb18691a88402d84':
  DEVTS-23962:  DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda
…gs-forwarder-lambda

Merge in DEV/lm-logs-aws from DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda to develop

* commit 'f2339b3de584e729bbbb69c98195df6672e7710b':
  DEVTS-23962:  DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda
  DEVTS-23962:  DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda
Merge in DEV/lm-logs-aws from develop to master

* commit '26bee1549da34630e929b8c3a53326993a9604e3':
  DEVTS-23962:  DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda
  DEVTS-23962:  DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda
  DEVTS-23962:  DEVTS-23962-need-to-add-ap-southeast-6-region-in-logs-forwarder-lambda
@github-advanced-security

Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

Comment thread code/aws.go

req, err := http.NewRequest("GET", secrets_extension_endpoint, nil)
if err != nil {
log.Println("Error creating HTTP request to secrets extension: ", err)
Comment thread code/aws.go

resp, err := http.DefaultClient.Do(req)
if err != nil {
log.Println("Error sending HTTP request to secrets extension: ", err)
Comment thread code/aws.go
// Read the response body
body, err := io.ReadAll(resp.Body)
if err != nil {
log.Println("Error reading HTTP response body:", err)
Comment thread code/aws.go

handleFatalError("error in extracting secret value", err)
if err := json.Unmarshal(body, &objmap); err != nil {
log.Println(err)
Merges the internal master (with lm-data-sdk-go, model.LogInput, newer
service integrations) into GitHub master (DEV-126037 S3 mapping branch).

Key resolutions:
- parse.go: keep updated s3 handling using regexCompile(s3Regex), remove
  old s3Regex.FindStringSubmatch(event.Message) block incorrectly nested
  inside ec2 handling; keep newer log group types (bedrock, qbusiness, sagemaker)
- parse_test.go: keep model.LogInput-based tests and newer test functions
- README.md: keep updated docs with Bedrock, Q Business, Sagemaker sections
- Dockerfile: keep Go 1.24 and golangci-lint v1.62.2
- cloudformation.yaml: keep updated S3 source path with 'code/' segment

Co-authored-by: Cursor <cursoragent@cursor.com>
@vishaalcharpe
vishaalcharpe force-pushed the merge-stash-master-to-github-master branch from 01a7a67 to 36f7080 Compare May 28, 2026 07:36
@vishaalcharpe
vishaalcharpe merged commit 52a3a00 into master Jun 9, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants