Skip to content

Commit 42f803f

Browse files
committed
Check code changes before creating new version resource
1 parent c492789 commit 42f803f

File tree

7 files changed

+62
-6
lines changed

7 files changed

+62
-6
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2023-10-10T22:42:32Z"
3-
build_hash: d09dce1bd00f7247f8dac7c0a2129cf94e7ecdbc
2+
build_date: "2023-10-16T17:14:06Z"
3+
build_hash: 7a92e8913d7ee7f65b761552e764e994882a49af
44
go_version: go1.19
5-
version: v0.27.1-1-gd09dce1
5+
version: v0.27.1-5-g7a92e89
66
api_directory_checksum: 6d988b03425fad3e88d887c1cd4510a07e4be281
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.181
99
generator_config_info:
10-
file_checksum: fd84287296bf07630b7c3190bb2c5d78a3f73bd2
10+
file_checksum: 8d041799a39b7a4f169b8a95d23b0ecc810ad8be
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/generator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@ resources:
228228
hooks:
229229
sdk_read_one_pre_build_request:
230230
template_path: hooks/version/sdk_read_one_pre_build_request.go.tpl
231+
sdk_create_pre_build_request:
232+
template_path: hooks/version/sdk_create_pre_build_request.go.tpl
233+
sdk_create_pre_set_output:
234+
template_path: hooks/version/sdk_create_pre_set_output.go.tpl
231235
renames:
232236
operations:
233237
DeleteFunction:

generator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@ resources:
228228
hooks:
229229
sdk_read_one_pre_build_request:
230230
template_path: hooks/version/sdk_read_one_pre_build_request.go.tpl
231+
sdk_create_pre_build_request:
232+
template_path: hooks/version/sdk_create_pre_build_request.go.tpl
233+
sdk_create_pre_set_output:
234+
template_path: hooks/version/sdk_create_pre_set_output.go.tpl
231235
renames:
232236
operations:
233237
DeleteFunction:

pkg/resource/version/sdk.go

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
res := &svcsdk.ListVersionsByFunctionInput{}
2+
res.FunctionName = desired.ko.Spec.FunctionName
3+
var list *svcsdk.ListVersionsByFunctionOutput
4+
list, err = rm.sdkapi.ListVersionsByFunctionWithContext(ctx, res)
5+
if err != nil {
6+
return nil, err
7+
}
8+
bigList := list.Versions
9+
10+
for ok := list.NextMarker != nil; ok; ok = (list.NextMarker != nil) {
11+
res.Marker = list.NextMarker
12+
list, err = rm.sdkapi.ListVersionsByFunctionWithContext(ctx, res)
13+
if err != nil {
14+
return nil, err
15+
}
16+
bigList = append(bigList, list.Versions...)
17+
}
18+
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
for _, version := range bigList{
2+
if *version.Version == *resp.Version{
3+
ErrCannotCreateResource := errors.New("No changes were made to $LATEST since publishing last version, so no version was published.")
4+
return nil, ackerr.NewTerminalError(ErrCannotCreateResource)
5+
}
6+
}

test/e2e/resources/version.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
services.k8s.aws/region: $AWS_REGION
77
spec:
88
functionName: $FUNCTION_NAME
9-
# codeSha256: $HASH
10-
# revisionId: $ID
9+
codeSha256: $HASH
10+
revisionId: $ID
1111
description: version created by ACK lambda-controller e2e tests

0 commit comments

Comments
 (0)