Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ aliases:
- michaelhtm
- TiberiuGC
- rushmash91
- knottnt
# emeritus-core-ack-team:
# - jaypipes
# - jljaco
Expand Down
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ack_generate_info:
build_date: "2025-04-29T03:41:47Z"
build_hash: ab8fa0bbefe77c9682f53251412fd8d1002ba30f
go_version: go1.24.1
version: v0.44.0-3-gab8fa0b
build_date: "2025-05-02T16:57:34Z"
build_hash: f8dc5330705b3752ce07dce0ac831161fd4cb14f
go_version: go1.24.2
version: v0.45.0
api_directory_checksum: 2627dc306e3a83c86c04050c6c4336451459e728
api_version: v1alpha1
aws_sdk_go_version: v1.32.6
Expand Down
2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ kind: Kustomization
images:
- name: controller
newName: public.ecr.aws/aws-controllers-k8s/sqs-controller
newTag: 1.1.9
newTag: 1.1.10
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ toolchain go1.24.1
require (
github.com/aws-controllers-k8s/iam-controller v1.1.1
github.com/aws-controllers-k8s/kms-controller v1.0.2
github.com/aws-controllers-k8s/runtime v0.44.0
github.com/aws-controllers-k8s/runtime v0.45.0
github.com/aws/aws-sdk-go v1.55.5
github.com/aws/aws-sdk-go-v2 v1.34.0
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.10
github.com/aws/smithy-go v1.22.2
github.com/go-logr/logr v1.4.2
github.com/micahhausler/aws-iam-policy v0.4.2
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
k8s.io/api v0.32.1
k8s.io/apimachinery v0.32.1
k8s.io/client-go v0.32.1
Expand Down Expand Up @@ -63,7 +62,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ github.com/aws-controllers-k8s/iam-controller v1.1.1 h1:O6arh7DNlQF26MEKzgA2/kBE
github.com/aws-controllers-k8s/iam-controller v1.1.1/go.mod h1:2+ARwRpazTq5MErjMz0MpXHhtAzRfNtY56Uj0gvu9vE=
github.com/aws-controllers-k8s/kms-controller v1.0.2 h1:v8nh/oaX/U6spCwBDaWyem7XXpzoP/MnkJyEjNOZN9s=
github.com/aws-controllers-k8s/kms-controller v1.0.2/go.mod h1:BeoijsyGjJ9G5VcDjpFdxBW0IxaeKXYX497XmUJiPSQ=
github.com/aws-controllers-k8s/runtime v0.44.0 h1:Et0Gikkxx4tJ6+dyK6w88DZqYRbpUTpBHCEny0X7gLQ=
github.com/aws-controllers-k8s/runtime v0.44.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U=
github.com/aws-controllers-k8s/runtime v0.45.0 h1:b0xCqIE1SNve/jcJPW/QkCGkDmjxWtWTDFHKZpHJcFQ=
github.com/aws-controllers-k8s/runtime v0.45.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U=
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU=
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: sqs-chart
description: A Helm chart for the ACK service controller for Amazon Simple Queue Service (SQS)
version: 1.1.9
appVersion: 1.1.9
version: 1.1.10
appVersion: 1.1.10
home: https://github.com/aws-controllers-k8s/sqs-controller
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ .Chart.Name }} has been installed.
This chart deploys "public.ecr.aws/aws-controllers-k8s/sqs-controller:1.1.9".
This chart deploys "public.ecr.aws/aws-controllers-k8s/sqs-controller:1.1.10".

Check its status by running:
kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: public.ecr.aws/aws-controllers-k8s/sqs-controller
tag: 1.1.9
tag: 1.1.10
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down
100 changes: 50 additions & 50 deletions pkg/resource/queue/hooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,51 +42,51 @@ func TestComparePolicy(t *testing.T) {
invalidJSON := `{"Version": "2012-10-17", "Statement": [`

tests := []struct {
name string
policyA *string
policyB *string
name string
policyA *string
policyB *string
expectDiff bool
}{
{
name: "both nil",
policyA: nil,
policyB: nil,
name: "both nil",
policyA: nil,
policyB: nil,
expectDiff: false,
},
{
name: "a nil, b not nil",
policyA: nil,
policyB: strPtr(basePolicyJSON),
name: "a nil, b not nil",
policyA: nil,
policyB: strPtr(basePolicyJSON),
expectDiff: true,
},
{
name: "both equal pointers",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(basePolicyJSON),
name: "both equal pointers",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(basePolicyJSON),
expectDiff: false,
},
{
name: "semantically equivalent",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(equivalentPolicyJSON),
name: "semantically equivalent",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(equivalentPolicyJSON),
expectDiff: false,
},
{
name: "different policies",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(differentPolicyJSON),
name: "different policies",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(differentPolicyJSON),
expectDiff: true,
},
{
name: "a invalid, b valid",
policyA: strPtr(invalidJSON),
policyB: strPtr(basePolicyJSON),
name: "a invalid, b valid",
policyA: strPtr(invalidJSON),
policyB: strPtr(basePolicyJSON),
expectDiff: true,
},
{
name: "both invalid",
policyA: strPtr(invalidJSON),
policyB: strPtr(`{"another": "invalid`),
name: "both invalid",
policyA: strPtr(invalidJSON),
policyB: strPtr(`{"another": "invalid`),
expectDiff: true,
},
}
Expand Down Expand Up @@ -138,51 +138,51 @@ func TestCompareRedrivePolicy(t *testing.T) {
invalidJSON := `{"deadLetterTargetArn":`

tests := []struct {
name string
policyA *string
policyB *string
name string
policyA *string
policyB *string
expectDiff bool
}{
{
name: "both nil",
policyA: nil,
policyB: nil,
name: "both nil",
policyA: nil,
policyB: nil,
expectDiff: false,
},
{
name: "a nil, b not nil",
policyA: nil,
policyB: strPtr(basePolicyJSON),
name: "a nil, b not nil",
policyA: nil,
policyB: strPtr(basePolicyJSON),
expectDiff: true,
},
{
name: "both equal pointers",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(basePolicyJSON),
name: "both equal pointers",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(basePolicyJSON),
expectDiff: false,
},
{
name: "semantically equivalent",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(equivalentPolicyJSON),
name: "semantically equivalent",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(equivalentPolicyJSON),
expectDiff: false,
},
{
name: "different policies",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(differentPolicyJSON),
name: "different policies",
policyA: strPtr(basePolicyJSON),
policyB: strPtr(differentPolicyJSON),
expectDiff: true,
},
{
name: "a invalid, b valid",
policyA: strPtr(invalidJSON),
policyB: strPtr(basePolicyJSON),
name: "a invalid, b valid",
policyA: strPtr(invalidJSON),
policyB: strPtr(basePolicyJSON),
expectDiff: true,
},
{
name: "both invalid",
policyA: strPtr(invalidJSON),
policyB: strPtr(`{"another": "invalid`),
name: "both invalid",
policyA: strPtr(invalidJSON),
policyB: strPtr(`{"another": "invalid`),
expectDiff: true,
},
}
Expand All @@ -194,7 +194,7 @@ func TestCompareRedrivePolicy(t *testing.T) {
resB := &resource{ko: &svcapitypes.Queue{Spec: svcapitypes.QueueSpec{RedrivePolicy: tt.policyB}}}

compareRedrivePolicy(delta, resA, resB)

diffCount := len(delta.Differences)

if tt.expectDiff {
Expand Down Expand Up @@ -222,4 +222,4 @@ func TestCompareRedrivePolicy(t *testing.T) {
}
})
}
}
}
4 changes: 3 additions & 1 deletion pkg/resource/queue/resource.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.