Skip to content

Commit a2cf589

Browse files
carole-lavillonnierecarole-lavillonniere
committed
chore: recreate merge conflicts for illustration (DO NOT MERGE)
1 parent 30727cf commit a2cf589

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2535
-17
lines changed

‎.github/workflows/check-binaries.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
schedule:
66
- cron: "0 16 * * 1-5" # min h d Mo DoW / 9am PST M-F
77

8+
permissions:
9+
issues: write
10+
811
jobs:
912
check-for-vulnerabilities:
1013
runs-on: ubuntu-latest

‎.github/workflows/integ-tests.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
name: Run Integration Tests
22

3+
<<<<<<< HEAD
34
# on:
45
# pull_request:
56
# branches:
67
# - develop
78
#
9+
=======
10+
on:
11+
pull_request:
12+
branches:
13+
- develop
14+
- main
15+
merge_group:
16+
17+
permissions:
18+
contents: read
19+
20+
>>>>>>> 391c3f1d
821
jobs:
922
go-tests:
1023
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
description: "Information about the release"
1212
required: true
1313
default: "New release"
14+
permissions:
15+
contents: write
16+
1417
jobs:
1518
Release:
1619
environment: Release

‎.github/workflows/validate-branch-into-main.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Validate PR Branch into Main
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
validate-pr-branch:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check source branch
13+
run: |
14+
SOURCE_BRANCH="${{ github.head_ref }}"
15+
if [[ "$SOURCE_BRANCH" != "develop" ]]; then
16+
echo "Error: Only pull requests from develop branch are allowed into main"
17+
echo "Current source branch ($SOURCE_BRANCH)."
18+
exit 1
19+
fi
20+
echo "Source branch is develop - merge allowed"

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ GO_ARCH_arm64 := arm64
1212
DESTINATION_x86_64 := bin/${BINARY_NAME}-x86_64
1313
DESTINATION_arm64 := bin/${BINARY_NAME}-arm64
1414

15+
<<<<<<< HEAD
1516
run_in_docker = docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.26.1 $(1)
17+
=======
18+
run_in_docker = docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.25 $(1)
19+
>>>>>>> 391c3f1d
1620

1721
compile-with-docker-all:
1822
$(call run_in_docker, make compile-lambda-linux-all)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,4 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform
193193
194194
## License
195195
196-
This project is licensed under the Apache-2.0 License.
196+
This project is licensed under the Apache-2.0 License.

‎cmd/localstack/simple_bootstrap.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package main
4+
package rie
55

66
import (
77
"fmt"

‎go.mod‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
module github.com/aws/aws-lambda-runtime-interface-emulator
22

3+
<<<<<<< HEAD
34
go 1.26.1
5+
=======
6+
go 1.25.7
7+
>>>>>>> 391c3f1d
48

59
require (
610
github.com/aws/aws-lambda-go v1.52.0
@@ -9,6 +13,7 @@ require (
913
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
1014
github.com/fsnotify/fsnotify v1.9.0
1115
github.com/go-chi/chi v1.5.5
16+
<<<<<<< HEAD
1217
github.com/go-chi/chi/v5 v5.2.5
1318
github.com/google/uuid v1.6.0
1419
github.com/jessevdk/go-flags v1.6.1
@@ -19,6 +24,16 @@ require (
1924
github.com/stretchr/testify v1.10.0
2025
golang.org/x/sync v0.19.0
2126
golang.org/x/sys v0.41.0
27+
=======
28+
github.com/go-chi/chi/v5 v5.2.2
29+
github.com/google/uuid v1.6.0
30+
github.com/jessevdk/go-flags v1.5.0
31+
github.com/orcaman/concurrent-map v1.0.0
32+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
33+
github.com/sirupsen/logrus v1.9.3
34+
github.com/stretchr/testify v1.9.0
35+
golang.org/x/sync v0.6.0
36+
>>>>>>> 391c3f1d
2237
)
2338

2439
require (

‎go.sum‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S
1313
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
1414
github.com/go-chi/chi v1.5.5 h1:vOB/HbEMt9QqBqErz07QehcOKHaWFtuj87tTDVz2qXE=
1515
github.com/go-chi/chi v1.5.5/go.mod h1:C9JqLr3tIYjDOZpzn+BCuxY8z8vmca43EeMgyZt7irw=
16+
<<<<<<< HEAD
1617
github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
1718
github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
1819
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
@@ -25,16 +26,29 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
2526
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
2627
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
2728
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
29+
=======
30+
github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
31+
github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
32+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
33+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
34+
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
35+
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
36+
>>>>>>> 391c3f1d
2837
github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY=
2938
github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
3039
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3140
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3241
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
3342
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
43+
<<<<<<< HEAD
3444
github.com/shirou/gopsutil v2.21.11+incompatible h1:lOGOyCG67a5dv2hq5Z1BLDUqqKp3HkbjPcz5j6XMS0U=
3545
github.com/shirou/gopsutil v2.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
3646
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
3747
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
48+
=======
49+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
50+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
51+
>>>>>>> 391c3f1d
3852
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3953
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
4054
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=

‎internal/lambda-managed-instances/aws-lambda-rie/internal/app.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,15 @@ func (h *HTTPHandler) invoke(w http.ResponseWriter, r *http.Request) {
6060
return
6161
}
6262

63+
<<<<<<< HEAD
6364
invokeReq := rieinvoke.NewRieInvokeRequest(r, w)
65+
=======
66+
invokeReq, err := rieinvoke.NewRieInvokeRequest(r, w)
67+
if err != nil {
68+
h.respondWithError(w, err)
69+
return
70+
}
71+
>>>>>>> 391c3f1d
6472
ctx := logging.WithInvokeID(r.Context(), invokeReq.InvokeID())
6573

6674
metrics := invoke.NewInvokeMetrics(nil, &noOpCounter{})

0 commit comments

Comments
 (0)