Skip to content

Add support for adoption of existing Flow Logs and Security Groups #160

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

Closed
pcolazurdo wants to merge 4 commits into from
Closed

Add support for adoption of existing Flow Logs and Security Groups #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3084e82
Adding support for custom additionalKeys for Flowlogs
pcolazurdo Dec 4, 2023
ccd7cf2
Adding support for custom additionalKeys for Security Groups
pcolazurdo Dec 5, 2023
c13188c
updated generated files to support FlowLogs and Security Group additi…
pcolazurdo Dec 5, 2023
9194960
renamed variables to add clarity
pcolazurdo Dec 5, 2023
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
10 changes: 5 additions & 5 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-09-18T23:03:44Z"
build_hash: 892f29d00a4c4ad21a2fa32919921de18190979d
go_version: go1.20.3
version: v0.27.1
build_date: "2023-12-05T16:46:52Z"
build_hash: 3653329ceeb20015851b8776a6061a3fb0ec2935
go_version: go1.21.4
version: v0.27.1-6-g3653329-dirty
api_directory_checksum: 6e2d850d97f2f72db31c9bef522eca4ab95b3fcd
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
generator_config_info:
file_checksum: c474e6cdec9622afad4b4cef415483a7bd0eda41
file_checksum: e900e7783872dcd15c10fd4efb10d069047e3db4
original_file_name: generator.yaml
last_modification:
reason: API generation
4 changes: 4 additions & 0 deletions apis/v1alpha1/generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ resources:
template_path: hooks/flow_log/sdk_read_many_post_build_request.go.tpl
sdk_file_end:
template_path: hooks/flow_log/sdk_file_end.go.tpl
post_set_resource_identifiers:
template_path: hooks/flow_log/post_set_resource_identifiers.go.tpl
update_operation:
custom_method_name: customUpdateFlowLog
InternetGateway:
Expand Down Expand Up @@ -537,6 +539,8 @@ resources:
template_path: hooks/security_group/sdk_create_post_set_output.go.tpl
sdk_read_many_post_set_output:
template_path: hooks/security_group/sdk_read_many_post_set_output.go.tpl
post_set_resource_identifiers:
template_path: hooks/security_group/post_set_resource_identifiers.go.tpl
update_operation:
custom_method_name: customUpdateSecurityGroup
NetworkAcl:
Expand Down
4 changes: 4 additions & 0 deletions generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ resources:
template_path: hooks/flow_log/sdk_read_many_post_build_request.go.tpl
sdk_file_end:
template_path: hooks/flow_log/sdk_file_end.go.tpl
post_set_resource_identifiers:
template_path: hooks/flow_log/post_set_resource_identifiers.go.tpl
update_operation:
custom_method_name: customUpdateFlowLog
InternetGateway:
Expand Down Expand Up @@ -537,6 +539,8 @@ resources:
template_path: hooks/security_group/sdk_create_post_set_output.go.tpl
sdk_read_many_post_set_output:
template_path: hooks/security_group/sdk_read_many_post_set_output.go.tpl
post_set_resource_identifiers:
template_path: hooks/security_group/post_set_resource_identifiers.go.tpl
update_operation:
custom_method_name: customUpdateSecurityGroup
NetworkAcl:
Expand Down
6 changes: 3 additions & 3 deletions helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ spec:
readOnly: true
{{- end }}
{{- if .Values.deployment.extraVolumeMounts -}}
{{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }}
{{ toYaml .Values.deployment.extraVolumeMounts | nindent 10 }}
{{- end }}
securityContext:
allowPrivilegeEscalation: false
Expand Down Expand Up @@ -151,11 +151,11 @@ spec:
hostNetwork: {{ .Values.deployment.hostNetwork }}
dnsPolicy: {{ .Values.deployment.dnsPolicy }}
volumes:
{{- if .Values.aws.credentials.secretName -}}
{{- if .Values.aws.credentials.secretName }}
- name: {{ .Values.aws.credentials.secretName }}
secret:
secretName: {{ .Values.aws.credentials.secretName }}
{{ end -}}
{{- end }}
{{- if .Values.deployment.extraVolumes }}
{{ toYaml .Values.deployment.extraVolumes | indent 8}}
{{- end }}
9 changes: 9 additions & 0 deletions pkg/resource/flow_log/resource.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 pkg/resource/security_group/resource.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: 8 additions & 0 deletions templates/hooks/flow_log/post_set_resource_identifiers.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
identifierResourceID, identifierResourceIDOk := identifier.AdditionalKeys["resourceID"]
if identifierResourceIDOk {
r.ko.Spec.ResourceID = &identifierResourceID
}
identifierResourceType, identifierResourceTypeOk := identifier.AdditionalKeys["resourceType"]
if identifierResourceTypeOk {
r.ko.Spec.ResourceType = &identifierResourceType
}
4 changes: 4 additions & 0 deletions templates/hooks/security_group/post_set_resource_identifiers.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
identifierName, identifierNameOk := identifier.AdditionalKeys["name"]
if identifierNameOk {
r.ko.Spec.Name = &identifierName
}