Skip to content

Commit 09fdd2a

Browse files
RedbackThomsonRedbackThomson
authored
Fix typos in generated hook code (#60)
Fixes aws-controllers-k8s/community#1068 Description of changes: Fix typos found in generated code: - Replace `"UPDATE"` with `"DELETE"` for logging delete operations - Fix faulty diff logic in `get{{$memberRefName}}Action` - Use `$specFieldName` for `GoCodeSetResourceForStruct` `targetFieldName` parameter By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent f7eb9f8 commit 09fdd2a

File tree

5 files changed

+37
-35
lines changed

5 files changed

+37
-35
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2021-10-27T21:10:57Z"
3-
build_hash: d2b063806d25cfcae4f2d4eb44f8e3f713b23e8e
4-
go_version: go1.15
2+
build_date: "2021-11-23T23:59:02Z"
3+
build_hash: 966e9a9ac6dfb4bbc2d3ded1972ce2b706391d44
4+
go_version: go1.17.1
55
version: v0.15.2
6-
api_directory_checksum: e1236617364bb9947bcbfbeb21ce75841b5407f3
6+
api_directory_checksum: 3cc5d56eb9770025b494d6a41eb40f45e27cc9b1
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.37.10
99
generator_config_info:
10-
file_checksum: 6a5e4faafc21f5c309ef5219f784fa8228d01744
10+
file_checksum: 22e3ba251f2c6dedc35cb65c70e8b5f80b523b0f
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

‎apis/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/resource/bucket/hook.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ func (rm *resourceManager) deleteCORS(
799799
input := rm.newDeleteBucketCORSPayload(r)
800800

801801
_, err = rm.sdkapi.DeleteBucketCorsWithContext(ctx, input)
802-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketCors", err)
802+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketCors", err)
803803
if err != nil {
804804
return err
805805
}
@@ -876,7 +876,7 @@ func (rm *resourceManager) deleteEncryption(
876876
input := rm.newDeleteBucketEncryptionPayload(r)
877877

878878
_, err = rm.sdkapi.DeleteBucketEncryptionWithContext(ctx, input)
879-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketEncryption", err)
879+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketEncryption", err)
880880
if err != nil {
881881
return err
882882
}
@@ -951,7 +951,7 @@ func (rm *resourceManager) deleteLifecycle(
951951
input := rm.newDeleteBucketLifecyclePayload(r)
952952

953953
_, err = rm.sdkapi.DeleteBucketLifecycleWithContext(ctx, input)
954-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketLifecycle", err)
954+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketLifecycle", err)
955955
if err != nil {
956956
return err
957957
}
@@ -1114,7 +1114,7 @@ func (rm *resourceManager) deleteOwnershipControls(
11141114
input := rm.newDeleteBucketOwnershipControlsPayload(r)
11151115

11161116
_, err = rm.sdkapi.DeleteBucketOwnershipControlsWithContext(ctx, input)
1117-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketOwnershipControls", err)
1117+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketOwnershipControls", err)
11181118
if err != nil {
11191119
return err
11201120
}
@@ -1191,7 +1191,7 @@ func (rm *resourceManager) deletePolicy(
11911191
input := rm.newDeleteBucketPolicyPayload(r)
11921192

11931193
_, err = rm.sdkapi.DeleteBucketPolicyWithContext(ctx, input)
1194-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketPolicy", err)
1194+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketPolicy", err)
11951195
if err != nil {
11961196
return err
11971197
}
@@ -1267,7 +1267,7 @@ func (rm *resourceManager) deletePublicAccessBlock(
12671267
input := rm.newDeletePublicAccessBlockPayload(r)
12681268

12691269
_, err = rm.sdkapi.DeletePublicAccessBlockWithContext(ctx, input)
1270-
rm.metrics.RecordAPICall("UPDATE", "DeletePublicAccessBlock", err)
1270+
rm.metrics.RecordAPICall("DELETE", "DeletePublicAccessBlock", err)
12711271
if err != nil {
12721272
return err
12731273
}
@@ -1342,7 +1342,7 @@ func (rm *resourceManager) deleteReplication(
13421342
input := rm.newDeleteBucketReplicationPayload(r)
13431343

13441344
_, err = rm.sdkapi.DeleteBucketReplicationWithContext(ctx, input)
1345-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketReplication", err)
1345+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketReplication", err)
13461346
if err != nil {
13471347
return err
13481348
}
@@ -1467,7 +1467,7 @@ func (rm *resourceManager) deleteTagging(
14671467
input := rm.newDeleteBucketTaggingPayload(r)
14681468

14691469
_, err = rm.sdkapi.DeleteBucketTaggingWithContext(ctx, input)
1470-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketTagging", err)
1470+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketTagging", err)
14711471
if err != nil {
14721472
return err
14731473
}
@@ -1592,7 +1592,7 @@ func (rm *resourceManager) deleteWebsite(
15921592
input := rm.newDeleteBucketWebsitePayload(r)
15931593

15941594
_, err = rm.sdkapi.DeleteBucketWebsiteWithContext(ctx, input)
1595-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucketWebsite", err)
1595+
rm.metrics.RecordAPICall("DELETE", "DeleteBucketWebsite", err)
15961596
if err != nil {
15971597
return err
15981598
}

‎pkg/resource/bucket/sdk.go‎

Lines changed: 13 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/hooks/bucket/sdk_file_end.go.tpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ func (rm *resourceManager) setResource{{ $specFieldName }}(
4343

4444
{{/* Some operations have wrapping structures in their response */}}
4545
{{- if (eq $operationName "PutBucketEncryption") }}
46-
{{ GoCodeSetResourceForStruct $CRD "" "res" $memberRef "resp.ServerSideEncryptionConfiguration" $memberRef 1 }}
46+
{{ GoCodeSetResourceForStruct $CRD $specFieldName "res" $memberRef "resp.ServerSideEncryptionConfiguration" $memberRef 1 }}
4747
{{- else if (eq $operationName "PutBucketOwnershipControls") }}
48-
{{ GoCodeSetResourceForStruct $CRD "" "res" $memberRef "resp.OwnershipControls" $memberRef 1 }}
48+
{{ GoCodeSetResourceForStruct $CRD $specFieldName "res" $memberRef "resp.OwnershipControls" $memberRef 1 }}
4949
{{- else if (eq $operationName "PutBucketReplication") }}
50-
{{ GoCodeSetResourceForStruct $CRD "" "res" $memberRef "resp.ReplicationConfiguration" $memberRef 1 }}
50+
{{ GoCodeSetResourceForStruct $CRD $specFieldName "res" $memberRef "resp.ReplicationConfiguration" $memberRef 1 }}
5151
{{- else if (eq $operationName "PutPublicAccessBlock") }}
52-
{{ GoCodeSetResourceForStruct $CRD "" "res" $memberRef "resp.PublicAccessBlockConfiguration" $memberRef 1 }}
52+
{{ GoCodeSetResourceForStruct $CRD $specFieldName "res" $memberRef "resp.PublicAccessBlockConfiguration" $memberRef 1 }}
5353
{{- else }}
54-
{{ GoCodeSetResourceForStruct $CRD "" "res" $memberRef "resp" $memberRef 1 }}
54+
{{ GoCodeSetResourceForStruct $CRD $specFieldName "res" $memberRef "resp" $memberRef 1 }}
5555
{{ end }}
5656

5757
return res
@@ -90,7 +90,7 @@ func (rm *resourceManager) setResource{{ $memberRefName }}(
9090
) *svcapitypes.{{ $memberRefName }} {
9191
res := &svcapitypes.{{ $memberRefName }}{}
9292

93-
{{ GoCodeSetResourceForStruct $CRD "" "res" $memberRef "resp" $memberRef 1 }}
93+
{{ GoCodeSetResourceForStruct $CRD $specFieldName "res" $memberRef "resp" $memberRef 1 }}
9494

9595
return res
9696
}
@@ -120,9 +120,9 @@ func get{{$memberRefName}}Action(
120120
// Don't perform any action if they are identical
121121
delta := compare{{$memberRefName}}(l, c)
122122
if len(delta.Differences) > 0 {
123-
action = ConfigurationActionNone
124-
} else {
125123
action = ConfigurationActionUpdate
124+
} else {
125+
action = ConfigurationActionNone
126126
}
127127
break
128128
}
@@ -172,7 +172,7 @@ func (rm *resourceManager) delete{{ $memberRefName }}(
172172
173173
input := rm.newDeleteBucket{{ $specFieldName }}Payload(r, c)
174174
_, err = rm.sdkapi.DeleteBucket{{ $memberRefName }}WithContext(ctx, input)
175-
rm.metrics.RecordAPICall("UPDATE", "DeleteBucket{{ $memberRefName }}", err)
175+
rm.metrics.RecordAPICall("DELETE", "DeleteBucket{{ $memberRefName }}", err)
176176
return err
177177
}
178178

0 commit comments

Comments
 (0)