Skip to content

Commit f7400da

Browse files
authored
Go v2 support (#33)
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 1973778 commit f7400da

File tree

12 files changed

+194
-142
lines changed

12 files changed

+194
-142
lines changed

apis/v1alpha1/ack-generate-metadata.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ack_generate_info:
2-
build_date: "2025-01-23T02:37:06Z"
3-
build_hash: 2442aa071c05fcdf54841e63abd5f91d1951e152
2+
build_date: "2025-02-05T01:31:24Z"
3+
build_hash: d2d639403dd853736e63c2bc1e3ca51251fd1bd1
44
go_version: go1.23.5
5-
version: v0.41.0
6-
api_directory_checksum: 2b3e49c747df63b01cfb28a5d6dc48b1ed9665cf
5+
version: v0.41.0-16-gd2d6394-dirty
6+
api_directory_checksum: 4af1044839a67f8e9bbfb3134dade085289e2945
77
api_version: v1alpha1
8-
aws_sdk_go_version: v1.44.167
8+
aws_sdk_go_version: v1.32.6
99
generator_config_info:
1010
file_checksum: 126f69fc5150ad38b50044c98271d2498d1cf597
1111
original_file_name: generator.yaml

apis/v1alpha1/enums.go

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

apis/v1alpha1/organizational_unit.go

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

cmd/controller/main.go

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

config/crd/bases/organizations.services.k8s.aws_organizationalunits.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
about tagging, see Tagging Organizations resources (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_tagging.html)
7474
in the Organizations User Guide.
7575
76-
If any one of the tags is invalid or if you exceed the allowed number of
76+
If any one of the tags is not valid or if you exceed the allowed number of
7777
tags for an OU, then the entire request fails and the OU is not created.
7878
items:
7979
description: |-
@@ -168,7 +168,8 @@ spec:
168168
type: array
169169
id:
170170
description: |-
171-
The unique identifier (ID) associated with this OU.
171+
The unique identifier (ID) associated with this OU. The ID is unique to the
172+
organization only.
172173
173174
The regex pattern (http://wikipedia.org/wiki/regex) for an organizational
174175
unit ID string requires "ou-" followed by from 4 to 32 lowercase letters

go.mod

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/aws-controllers-k8s/runtime v0.41.0
8+
github.com/aws-controllers-k8s/runtime v0.41.1-0.20250204215244-e48dd7b2d6d0
99
github.com/aws/aws-sdk-go v1.49.0
10+
github.com/aws/aws-sdk-go-v2 v1.34.0
11+
github.com/aws/aws-sdk-go-v2/service/organizations v1.37.4
12+
github.com/aws/smithy-go v1.22.2
1013
github.com/go-logr/logr v1.4.2
1114
github.com/spf13/pflag v1.0.5
1215
k8s.io/api v0.31.0
@@ -16,6 +19,17 @@ require (
1619
)
1720

1821
require (
22+
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
23+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
24+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29 // indirect
26+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29 // indirect
27+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
29+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
30+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
31+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
32+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
1933
github.com/beorn7/perks v1.0.1 // indirect
2034
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2135
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -39,7 +53,6 @@ require (
3953
github.com/itchyny/gojq v0.12.6 // indirect
4054
github.com/itchyny/timefmt-go v0.1.3 // indirect
4155
github.com/jaypipes/envutil v1.0.0 // indirect
42-
github.com/jmespath/go-jmespath v0.4.0 // indirect
4356
github.com/josharian/intern v1.0.0 // indirect
4457
github.com/json-iterator/go v1.1.12 // indirect
4558
github.com/mailru/easyjson v0.7.7 // indirect

go.sum

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,35 @@
1-
github.com/aws-controllers-k8s/runtime v0.41.0 h1:WumDnUiVlqnYYGEIGSOUBgDPWTIEozW8HT0qwGapDgA=
2-
github.com/aws-controllers-k8s/runtime v0.41.0/go.mod h1:Tuq5AFGJQcU00MY+J5hBYbLctpR50I8iGs5TPLox+u8=
1+
github.com/aws-controllers-k8s/runtime v0.41.1-0.20250204215244-e48dd7b2d6d0 h1:ygZwhPfearlE8/P0HY8rXpFsbarwJ5tzBIov+3xgQfk=
2+
github.com/aws-controllers-k8s/runtime v0.41.1-0.20250204215244-e48dd7b2d6d0/go.mod h1:Oy0JKvDxZMZ+SVupm4NZVqP00KLIIAMfk93KnOwlt5c=
33
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
44
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
5+
github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU=
6+
github.com/aws/aws-sdk-go-v2 v1.34.0/go.mod h1:JgstGg0JjWU1KpVJjD5H0y0yyAIpSdKEq556EI6yOOM=
7+
github.com/aws/aws-sdk-go-v2/config v1.28.6 h1:D89IKtGrs/I3QXOLNTH93NJYtDhm8SYa9Q5CsPShmyo=
8+
github.com/aws/aws-sdk-go-v2/config v1.28.6/go.mod h1:GDzxJ5wyyFSCoLkS+UhGB0dArhb9mI+Co4dHtoTxbko=
9+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 h1:48bA+3/fCdi2yAwVt+3COvmatZ6jUDNkDTIsqDiMUdw=
10+
github.com/aws/aws-sdk-go-v2/credentials v1.17.47/go.mod h1:+KdckOejLW3Ks3b0E3b5rHsr2f9yuORBum0WPnE5o5w=
11+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 h1:AmoU1pziydclFT/xRV+xXE/Vb8fttJCLRPv8oAkprc0=
12+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21/go.mod h1:AjUdLYe4Tgs6kpH4Bv7uMZo7pottoyHMn4eTcIcneaY=
13+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29 h1:Ej0Rf3GMv50Qh4G4852j2djtoDb7AzQ7MuQeFHa3D70=
14+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29/go.mod h1:oeNTC7PwJNoM5AznVr23wxhLnuJv0ZDe5v7w0wqIs9M=
15+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29 h1:6e8a71X+9GfghragVevC5bZqvATtc3mAMgxpSNbgzF0=
16+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29/go.mod h1:c4jkZiQ+BWpNqq7VtrxjwISrLrt/VvPq3XiopkUIolI=
17+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
18+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
19+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
20+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
21+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 h1:50+XsN70RS7dwJ2CkVNXzj7U2L1HKP8nqTd3XWEXBN4=
22+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6/go.mod h1:WqgLmwY7so32kG01zD8CPTJWVWM+TzJoOVHwTg4aPug=
23+
github.com/aws/aws-sdk-go-v2/service/organizations v1.37.4 h1:tnZdzF6NRpkixgjgpI4jZQWbS0SADjybU1oWxMH47iE=
24+
github.com/aws/aws-sdk-go-v2/service/organizations v1.37.4/go.mod h1:+cn2w8QsHagJJeNGw6GnC+PtffLpF0cEMPoEX2noWWU=
25+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 h1:rLnYAfXQ3YAccocshIH5mzNNwZBkBo+bP6EhIxak6Hw=
26+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7/go.mod h1:ZHtuQJ6t9A/+YDuxOLnbryAmITtr8UysSny3qcyvJTc=
27+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 h1:JnhTZR3PiYDNKlXy50/pNeix9aGMo6lLpXwJ1mw8MD4=
28+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6/go.mod h1:URronUEGfXZN1VpdktPSD1EkAL9mfrV+2F4sjH38qOY=
29+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 h1:s4074ZO1Hk8qv65GqNXqDjmkf4HSQqJukaLuuW0TpDA=
30+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2/go.mod h1:mVggCnIWoM09jP71Wh+ea7+5gAp53q+49wDFs1SW5z8=
31+
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
32+
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
533
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
634
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
735
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -65,8 +93,6 @@ github.com/jaypipes/envutil v1.0.0 h1:u6Vwy9HwruFihoZrL0bxDLCa/YNadGVwKyPElNmZWo
6593
github.com/jaypipes/envutil v1.0.0/go.mod h1:vgIRDly+xgBq0eeZRcflOHMMobMwgC6MkMbxo/Nw65M=
6694
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
6795
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
68-
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
69-
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
7096
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
7197
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7298
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

helm/crds/organizations.services.k8s.aws_organizationalunits.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ spec:
7373
about tagging, see Tagging Organizations resources (https://docs.aws.amazon.com/organizations/latest/userguide/orgs_tagging.html)
7474
in the Organizations User Guide.
7575
76-
If any one of the tags is invalid or if you exceed the allowed number of
76+
If any one of the tags is not valid or if you exceed the allowed number of
7777
tags for an OU, then the entire request fails and the OU is not created.
7878
items:
7979
description: |-
@@ -168,7 +168,8 @@ spec:
168168
type: array
169169
id:
170170
description: |-
171-
The unique identifier (ID) associated with this OU.
171+
The unique identifier (ID) associated with this OU. The ID is unique to the
172+
organization only.
172173
173174
The regex pattern (http://wikipedia.org/wiki/regex) for an organizational
174175
unit ID string requires "ou-" followed by from 4 to 32 lowercase letters

pkg/resource/organizational_unit/manager.go

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

pkg/resource/organizational_unit/manager_factory.go

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

0 commit comments

Comments
 (0)