Skip to content

Support queues RedriveAllowPolicy #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2023
Merged

Support queues RedriveAllowPolicy #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ack_generate_info:
build_date: "2023-05-15T22:57:03Z"
build_date: "2023-05-20T02:19:20Z"
build_hash: 8f3ba427974fd6e769926778d54834eaee3b81a3
go_version: go1.19
go_version: go1.20.1
version: v0.26.1
api_directory_checksum: 3741e855a47295ce5921a70cf58ca4fc020fae5d
api_directory_checksum: 3f2eabdb24056446ab978af269536dd7f2fef116
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
generator_config_info:
file_checksum: 91bff6ceb1de65791e99fe6fa5f8edbc3dbd2323
file_checksum: 9eac8d3730cfe212c3a88aa5173b22de93c2d0b7
original_file_name: generator.yaml
last_modification:
reason: API generation
3 changes: 3 additions & 0 deletions apis/v1alpha1/generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ resources:
RedrivePolicy:
is_attribute: true
type: string
RedriveAllowPolicy:
is_attribute: true
type: string
QueueArn:
is_attribute: true
is_arn: true
Expand Down
1 change: 1 addition & 0 deletions apis/v1alpha1/queue.go
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions apis/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion config/controller/kustomization.yaml
View file
Open in desktop
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.0.3
newTag: 1.0.2
Copy link
Collaborator

@jaypipes jaypipes May 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, @a-hilaly you will need to rebase and correct this. Should not be going backwards by a version. :)

2 changes: 2 additions & 0 deletions config/crd/bases/sqs.services.k8s.aws_queues.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ spec:
type: string
receiveMessageWaitTimeSeconds:
type: string
redriveAllowPolicy:
type: string
redrivePolicy:
type: string
tags:
Expand Down
3 changes: 3 additions & 0 deletions generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ resources:
RedrivePolicy:
is_attribute: true
type: string
RedriveAllowPolicy:
is_attribute: true
type: string
QueueArn:
is_attribute: true
is_arn: true
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
View file
Open in desktop
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.0.3
appVersion: 1.0.3
version: 1.0.2
appVersion: 1.0.2
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: 2 additions & 0 deletions helm/crds/sqs.services.k8s.aws_queues.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ spec:
type: string
receiveMessageWaitTimeSeconds:
type: string
redriveAllowPolicy:
type: string
redrivePolicy:
type: string
tags:
Expand Down
2 changes: 1 addition & 1 deletion helm/templates/NOTES.txt
View file
Open in desktop
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.0.3".
This chart deploys "public.ecr.aws/aws-controllers-k8s/sqs-controller:1.0.2".

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
View file
Open in desktop
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.0.3
tag: 1.0.2
pullPolicy: IfNotPresent
pullSecrets: []

Expand Down
7 changes: 7 additions & 0 deletions pkg/resource/queue/delta.go
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions pkg/resource/queue/sdk.go
View file
Open in desktop

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

8 changes: 7 additions & 1 deletion test/e2e/tests/test_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,21 @@ def test_crud(self, simple_queue):

# Test updating one of the attributes...
new_delay = "10"
redrive_policy = '{"redrivePermission":"denyAll"}'

updates = {
"spec": {"delaySeconds": new_delay},
"spec": {
"delaySeconds": new_delay,
"redriveAllowPolicy": redrive_policy,
},
}
k8s.patch_custom_resource(ref, updates)
time.sleep(MODIFY_WAIT_AFTER_SECONDS)

latest_attrs = sqsqueue.get_attributes(queue_url)
assert 'DelaySeconds' in latest_attrs
assert latest_attrs['DelaySeconds'] == new_delay
assert latest_attrs['RedriveAllowPolicy'] == redrive_policy

# Test updating tags...
assert 'tags' in cr['spec']
Expand Down