Skip to content

Commit a978258

Browse files
committed
chore: vary function name suffixes per java version so that there's no overlap
1 parent 8181896 commit a978258

1 file changed

Lines changed: 52 additions & 24 deletions

File tree

examples/template.yaml

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Parameters:
1414
Type: String
1515
Default: examples/Dockerfile
1616
Description: path to Dockerfile
17+
FunctionNameSuffix:
18+
Type: String
19+
Default: ""
20+
Description: Suffix to append to all function names
1721

1822
Globals:
1923
Function:
@@ -49,7 +53,9 @@ Resources:
4953
Type: AWS::Serverless::Function
5054
Properties:
5155
PackageType: Image
52-
FunctionName: simple-invoke-example
56+
FunctionName: !Join
57+
- simple-invoke-example
58+
- !Ref FunctionNameSuffix
5359
ImageConfig:
5460
Command: ["com.amazonaws.lambda.durable.examples.SimpleInvokeExample::handleRequest"]
5561
DurableConfig:
@@ -62,7 +68,7 @@ Resources:
6268
- lambda:CheckpointDurableExecutions
6369
- lambda:GetDurableExecutionState
6470
- lambda:InvokeFunction
65-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:simple-invoke-example"
71+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:simple-invoke-example${FunctionNameSuffix}"
6672
- Effect: Allow
6773
Action:
6874
- lambda:InvokeFunction
@@ -76,7 +82,9 @@ Resources:
7682
Type: AWS::Serverless::Function
7783
Properties:
7884
PackageType: Image
79-
FunctionName: wait-example
85+
FunctionName: !Join
86+
- wait-example
87+
- !Ref FunctionNameSuffix
8088
ImageConfig:
8189
Command: ["com.amazonaws.lambda.durable.examples.WaitExample::handleRequest"]
8290
DurableConfig:
@@ -88,7 +96,7 @@ Resources:
8896
Action:
8997
- lambda:CheckpointDurableExecutions
9098
- lambda:GetDurableExecutionState
91-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:wait-example"
99+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:wait-example${FunctionNameSuffix}"
92100
Metadata:
93101
Dockerfile: !Ref DockerFile
94102
DockerContext: ../
@@ -98,7 +106,9 @@ Resources:
98106
Type: AWS::Serverless::Function
99107
Properties:
100108
PackageType: Image
101-
FunctionName: retry-example
109+
FunctionName: !Join
110+
- retry-example
111+
- !Ref FunctionNameSuffix
102112
ImageConfig:
103113
Command: ["com.amazonaws.lambda.durable.examples.RetryExample::handleRequest"]
104114
DurableConfig:
@@ -110,7 +120,7 @@ Resources:
110120
Action:
111121
- lambda:CheckpointDurableExecutions
112122
- lambda:GetDurableExecutionState
113-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:retry-example"
123+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:retry-example${FunctionNameSuffix}"
114124
Metadata:
115125
Dockerfile: !Ref DockerFile
116126
DockerContext: ../
@@ -120,7 +130,9 @@ Resources:
120130
Type: AWS::Serverless::Function
121131
Properties:
122132
PackageType: Image
123-
FunctionName: wait-at-least-example
133+
FunctionName: !Join
134+
- wait-at-least-example
135+
- !Ref FunctionNameSuffix
124136
ImageConfig:
125137
Command: ["com.amazonaws.lambda.durable.examples.WaitAtLeastExample::handleRequest"]
126138
DurableConfig:
@@ -132,7 +144,7 @@ Resources:
132144
Action:
133145
- lambda:CheckpointDurableExecutions
134146
- lambda:GetDurableExecutionState
135-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:wait-at-least-example"
147+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:wait-at-least-example${FunctionNameSuffix}"
136148
Metadata:
137149
Dockerfile: !Ref DockerFile
138150
DockerContext: ../
@@ -142,7 +154,9 @@ Resources:
142154
Type: AWS::Serverless::Function
143155
Properties:
144156
PackageType: Image
145-
FunctionName: wait-at-least-in-process-example
157+
FunctionName: !Join
158+
- wait-at-least-in-process-example
159+
- !Ref FunctionNameSuffix
146160
ImageConfig:
147161
Command: ["com.amazonaws.lambda.durable.examples.WaitAtLeastInProcessExample::handleRequest"]
148162
DurableConfig:
@@ -154,7 +168,7 @@ Resources:
154168
Action:
155169
- lambda:CheckpointDurableExecutions
156170
- lambda:GetDurableExecutionState
157-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:wait-at-least-in-process-example"
171+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:wait-at-least-in-process-example${FunctionNameSuffix}"
158172
Metadata:
159173
Dockerfile: !Ref DockerFile
160174
DockerContext: ../
@@ -164,7 +178,9 @@ Resources:
164178
Type: AWS::Serverless::Function
165179
Properties:
166180
PackageType: Image
167-
FunctionName: retry-in-process-example
181+
FunctionName: !Join
182+
- retry-in-process-example
183+
- !Ref FunctionNameSuffix
168184
ImageConfig:
169185
Command: ["com.amazonaws.lambda.durable.examples.RetryInProcessExample::handleRequest"]
170186
DurableConfig:
@@ -176,7 +192,7 @@ Resources:
176192
Action:
177193
- lambda:CheckpointDurableExecutions
178194
- lambda:GetDurableExecutionState
179-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:retry-in-process-example"
195+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:retry-in-process-example${FunctionNameSuffix}"
180196
Metadata:
181197
Dockerfile: !Ref DockerFile
182198
DockerContext: ../
@@ -186,7 +202,9 @@ Resources:
186202
Type: AWS::Serverless::Function
187203
Properties:
188204
PackageType: Image
189-
FunctionName: generic-types-example
205+
FunctionName: !Join
206+
- generic-types-example
207+
- !Ref FunctionNameSuffix
190208
ImageConfig:
191209
Command: ["com.amazonaws.lambda.durable.examples.GenericTypesExample::handleRequest"]
192210
DurableConfig:
@@ -198,7 +216,7 @@ Resources:
198216
Action:
199217
- lambda:CheckpointDurableExecutions
200218
- lambda:GetDurableExecutionState
201-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:generic-types-example"
219+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:generic-types-example${FunctionNameSuffix}"
202220
Metadata:
203221
Dockerfile: !Ref DockerFile
204222
DockerContext: ../
@@ -208,7 +226,9 @@ Resources:
208226
Type: AWS::Serverless::Function
209227
Properties:
210228
PackageType: Image
211-
FunctionName: custom-config-example
229+
FunctionName: !Join
230+
- custom-config-example
231+
- !Ref FunctionNameSuffix
212232
ImageConfig:
213233
Command: ["com.amazonaws.lambda.durable.examples.CustomConfigExample::handleRequest"]
214234
DurableConfig:
@@ -220,7 +240,7 @@ Resources:
220240
Action:
221241
- lambda:CheckpointDurableExecutions
222242
- lambda:GetDurableExecutionState
223-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:custom-config-example"
243+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:custom-config-example${FunctionNameSuffix}"
224244
Metadata:
225245
Dockerfile: !Ref DockerFile
226246
DockerContext: ../
@@ -230,7 +250,9 @@ Resources:
230250
Type: AWS::Serverless::Function
231251
Properties:
232252
PackageType: Image
233-
FunctionName: logging-example
253+
FunctionName: !Join
254+
- logging-example
255+
- !Ref FunctionNameSuffix
234256
ImageConfig:
235257
Command: ["com.amazonaws.lambda.durable.examples.LoggingExample::handleRequest"]
236258
DurableConfig:
@@ -242,7 +264,7 @@ Resources:
242264
Action:
243265
- lambda:CheckpointDurableExecutions
244266
- lambda:GetDurableExecutionState
245-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:logging-example"
267+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:logging-example${FunctionNameSuffix}"
246268
Metadata:
247269
Dockerfile: !Ref DockerFile
248270
DockerContext: ../
@@ -252,7 +274,9 @@ Resources:
252274
Type: AWS::Serverless::Function
253275
Properties:
254276
PackageType: Image
255-
FunctionName: error-handling-example
277+
FunctionName: !Join
278+
- error-handling-example
279+
- !Ref FunctionNameSuffix
256280
ImageConfig:
257281
Command: ["com.amazonaws.lambda.durable.examples.ErrorHandlingExample::handleRequest"]
258282
DurableConfig:
@@ -264,7 +288,7 @@ Resources:
264288
Action:
265289
- lambda:CheckpointDurableExecutions
266290
- lambda:GetDurableExecutionState
267-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:error-handling-example"
291+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:error-handling-example${FunctionNameSuffix}"
268292
Metadata:
269293
Dockerfile: !Ref DockerFile
270294
DockerContext: ../
@@ -274,7 +298,9 @@ Resources:
274298
Type: AWS::Serverless::Function
275299
Properties:
276300
PackageType: Image
277-
FunctionName: callback-example
301+
FunctionName: !Join
302+
- callback-example
303+
- !Ref FunctionNameSuffix
278304
ImageConfig:
279305
Command: ["com.amazonaws.lambda.durable.examples.CallbackExample::handleRequest"]
280306
DurableConfig:
@@ -286,7 +312,7 @@ Resources:
286312
Action:
287313
- lambda:CheckpointDurableExecutions
288314
- lambda:GetDurableExecutionState
289-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:callback-example"
315+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:callback-example${FunctionNameSuffix}"
290316
Metadata:
291317
Dockerfile: !Ref DockerFile
292318
DockerContext: ../
@@ -296,7 +322,9 @@ Resources:
296322
Type: AWS::Serverless::Function
297323
Properties:
298324
PackageType: Image
299-
FunctionName: many-async-steps-example
325+
FunctionName: !Join
326+
- many-async-steps-example
327+
- !Ref FunctionNameSuffix
300328
ImageConfig:
301329
Command: ["com.amazonaws.lambda.durable.examples.ManyAsyncStepsExample::handleRequest"]
302330
DurableConfig:
@@ -308,7 +336,7 @@ Resources:
308336
Action:
309337
- lambda:CheckpointDurableExecutions
310338
- lambda:GetDurableExecutionState
311-
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:many-async-steps-example"
339+
Resource: !Sub "arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:many-async-steps-example${FunctionNameSuffix}"
312340
Metadata:
313341
Dockerfile: !Ref DockerFile
314342
DockerContext: ../

0 commit comments

Comments
 (0)