Skip to content

feat(VPCEndpointService): add custom resource and allowedPrincipals functionality #172

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
032df37
feat(VPCEndpointService): add custom resource
marcdavoli Dec 21, 2023
ec2a4c9
chore: add e2e tests
marcdavoli Dec 21, 2023
69d507b
chore: add hooks
marcdavoli Dec 21, 2023
b1533e5
chore: add hooks.go
marcdavoli Dec 21, 2023
c54a0a2
test: remove all tests except those for VPC Endpoint Service
marcdavoli Dec 21, 2023
4c4fc09
Merge remote-tracking branch 'upstream/main' into feat(VPCEndpointSer…
marcdavoli Dec 21, 2023
639ccde
chore: add AllowPrincipals field of type []string
marcdavoli Dec 21, 2023
1ef97e6
fix: add AllowPrincipals field from ModifyVpcEndpointServicePermissio…
marcdavoli Dec 21, 2023
c3a32a8
chore: add VerifyPrivateDNSName field of type bool
marcdavoli Dec 21, 2023
028d520
revert: add VerifyPrivateDNSName field of type bool
marcdavoli Dec 21, 2023
8c737a4
chore: add logic for and rename field to AllowedPrincipals
marcdavoli Dec 21, 2023
1a86426
chore: add logic for and rename field to AllowedPrincipals
marcdavoli Dec 21, 2023
8c3a842
chore: add logic to add and remove principals
marcdavoli Dec 22, 2023
f9c8ab8
Merge branch 'main' into feat(VPCEndpointService)/add-custom-resource
marcdavoli Dec 27, 2023
6117a9c
feat(VPCEndpointService): add custom resource
marcdavoli Dec 21, 2023
1188ac8
chore: add e2e tests
marcdavoli Dec 21, 2023
7f780d1
chore: add hooks
marcdavoli Dec 21, 2023
ad08cf9
chore: add hooks.go
marcdavoli Dec 21, 2023
84d0279
test: remove all tests except those for VPC Endpoint Service
marcdavoli Dec 21, 2023
a9006f9
chore: add AllowPrincipals field of type []string
marcdavoli Dec 21, 2023
0a07678
fix: add AllowPrincipals field from ModifyVpcEndpointServicePermissio…
marcdavoli Dec 21, 2023
578b995
chore: add VerifyPrivateDNSName field of type bool
marcdavoli Dec 21, 2023
e1354fc
revert: add VerifyPrivateDNSName field of type bool
marcdavoli Dec 21, 2023
bb3f231
chore: add logic for and rename field to AllowedPrincipals
marcdavoli Dec 21, 2023
d32d4d8
chore: add logic for and rename field to AllowedPrincipals
marcdavoli Dec 21, 2023
a85f06f
chore: add logic to add and remove principals
marcdavoli Dec 22, 2023
310f577
Merge branch 'feat(VPCEndpointService)/add-custom-resource' of https:…
marcdavoli Dec 27, 2023
0522846
feat(VPCEndpointService): add custom resource
marcdavoli Dec 21, 2023
a6a66c4
chore: add hooks
marcdavoli Dec 21, 2023
817a489
Merge branch 'feat(VPCEndpointService)/add-custom-resource' of https:…
marcdavoli Dec 27, 2023
56441ef
fix: undefined: time
marcdavoli Dec 27, 2023
3ab56ff
chore: add sdkfind logic
marcdavoli Dec 27, 2023
fc699c6
chore: add debug logging
marcdavoli Dec 27, 2023
d1623ff
chore: fix code for comparing add/remove principals
marcdavoli Dec 28, 2023
2ad88bd
chore: reduce amount of API calls + improve readability
marcdavoli Dec 28, 2023
575ec12
test: add assert for checking allowedPrincipals
marcdavoli Dec 28, 2023
04cc147
fix: api request output shape assert
marcdavoli Dec 28, 2023
c1e147b
fix: use a-hilaly patched ack-code-generator
marcdavoli Dec 29, 2023
1fe9231
test: add them all back
marcdavoli Dec 29, 2023
0464d2b
Discard changes to test/e2e/tests/test_vpc_peering_connection.py
marcdavoli Dec 29, 2023
e7faab2
test: add Principal removal test
marcdavoli Dec 29, 2023
d41ba69
revert: undo unwanted changes with latest go version
marcdavoli Dec 29, 2023
d3f029f
test: run e2e tests 1 more time quickly
marcdavoli Dec 29, 2023
afdff0d
test: fix assert condition
marcdavoli Dec 29, 2023
407e5ae
test: add them all back
marcdavoli Dec 29, 2023
18985be
chore: put logic in syncAllowedPrincipals func
marcdavoli Dec 29, 2023
3c42c79
chore: put sdkRead Permissions logic in setAdditionalFields func
marcdavoli Dec 29, 2023
4f143d2
chore: put logic in syncAllowedPrincipals func
marcdavoli Dec 29, 2023
ecf5d51
chore: slightly refactor code to resemble iam-controller logic
marcdavoli Jan 2, 2024
f89546a
fix: regen code with code-gen v0.28.0
marcdavoli Jan 2, 2024
8dd97c8
test: remove duplicate functions
marcdavoli Jan 2, 2024
1ac2150
test: move nlb booststrap logic to service_bootstrap.py
marcdavoli Jan 2, 2024
b21bcb7
fix: missing ref
marcdavoli Jan 2, 2024
591d730
Update pkg/resource/vpc_endpoint_service_configuration/hooks.go
marcdavoli Jan 3, 2024
b32a5fc
Update pkg/resource/vpc_endpoint_service_configuration/hooks.go
marcdavoli Jan 3, 2024
66d1f14
chore: remove unneeded 'if'
Marcvd316 Jan 3, 2024
419adbd
Update pkg/resource/vpc_endpoint_service_configuration/hooks.go
marcdavoli Jan 3, 2024
0e222d1
fix: := error
Marcvd316 Jan 3, 2024
3e69844
fix: := error
Marcvd316 Jan 3, 2024
ebb92a2
test: use new test-infra repo commit
marcdavoli Jan 3, 2024
68dd871
test: use new test-infra repo commit
marcdavoli Jan 3, 2024
fd9ae88
fix: NLB param name
marcdavoli Jan 3, 2024
f63a0af
fix: remove duplicates
marcdavoli Jan 3, 2024
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
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ack_generate_info:
build_date: "2023-12-21T23:08:47Z"
build_hash: 1f16813c807af6889060b4ce7ded2a69dc027d8c
build_date: "2024-01-03T22:47:06Z"
build_hash: 00e081fb541587f33970ad80c99f2ac02e9c2525
go_version: go1.21.5
version: v0.28.0
api_directory_checksum: d452bf19bfd1496aacdc215bf7cc9ea86c55c122
version: v0.28.0-8-g00e081f
api_directory_checksum: 8b27f9e65dbad1f5f825c84d1dbe8fd333baf2a5
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
generator_config_info:
file_checksum: 0ea278e11a33d237e88a1bcdca878656a8ba43f9
file_checksum: 216d65c35dbc73d4eaaa52c2f5c84444abf4a960
original_file_name: generator.yaml
last_modification:
reason: API generation
56 changes: 55 additions & 1 deletion apis/v1alpha1/generator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ ignore:
- CreateVpcEndpointInput.DryRun
- CreateVpcEndpointInput.TagSpecifications
- CreateVpcEndpointInput.ClientToken
- CreateVpcEndpointServiceConfigurationInput.ClientToken
- CreateVpcEndpointServiceConfigurationInput.DryRun
- CreateVpcEndpointServiceConfigurationInput.TagSpecifications
- CreateVpcPeeringConnectionInput.DryRun
- CreateVpcPeeringConnectionInput.TagSpecifications
- DeleteRouteInput.DryRun
Expand Down Expand Up @@ -130,7 +133,7 @@ ignore:
- VerifiedAccessTrustProvider
- Volume
- VpcEndpointConnectionNotification
- VpcEndpointServiceConfiguration
#- VpcEndpointServiceConfiguration
#- VpcEndpoint
#- Vpc
- VpcCidrBlock
Expand Down Expand Up @@ -162,6 +165,18 @@ operations:
operation_type:
- Delete
resource_name: VpcEndpoint
CreateVpcEndpointServiceConfiguration:
output_wrapper_field_path: ServiceConfiguration
DeleteVpcEndpointServiceConfigurations:
operation_type:
- Delete
resource_name: VpcEndpointServiceConfiguration
CreateVpcEndpointServiceConfiguration:
output_wrapper_field_path: ServiceConfiguration
DeleteVpcEndpointServiceConfigurations:
operation_type:
- Delete
resource_name: VpcEndpointServiceConfiguration
CreateFlowLogs:
operation_type:
- Create
Expand Down Expand Up @@ -802,6 +817,45 @@ resources:
template_path: hooks/vpc_endpoint/sdk_file_end.go.tpl
update_operation:
custom_method_name: customUpdateVPCEndpoint
VpcEndpointServiceConfiguration:
fields:
AllowedPrincipals:
from:
operation: ModifyVpcEndpointServicePermissions
path: AddAllowedPrincipals
ServiceID:
is_primary_key: true
is_read_only: true
print:
path: Status.serviceID
name: ServiceID
ServiceState:
is_read_only: true
print:
path: Status.serviceState
name: ServiceState
Tags:
from:
operation: CreateTags
path: Tags
compare:
is_ignored: true
synced:
when:
- path: Status.ServiceState
in:
- available
hooks:
delta_pre_compare:
code: compareTags(delta, a, b)
sdk_delete_post_build_request:
template_path: hooks/vpc_endpoint_service_configuration/sdk_delete_post_build_request.go.tpl
sdk_file_end:
template_path: hooks/vpc_endpoint_service_configuration/sdk_file_end.go.tpl
sdk_update_pre_build_request:
template_path: hooks/vpc_endpoint_service_configuration/sdk_update_pre_build_request.go.tpl
sdk_read_many_post_set_output:
template_path: hooks/vpc_endpoint_service_configuration/sdk_read_many_post_set_output.go.tpl
VpcPeeringConnection:
fields:
VpcId:
Expand Down
42 changes: 29 additions & 13 deletions apis/v1alpha1/types.go

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

114 changes: 114 additions & 0 deletions apis/v1alpha1/vpc_endpoint_service_configuration.go

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

Loading