Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
36188cd
DO NOT MERGE: Use my branch of upjet
negz Feb 26, 2025
219f47d
Move generate.go into its own package
negz Feb 13, 2025
c247a88
Move APIs, controllers, examples, and CRDs to namespaced subdirs
negz Feb 26, 2025
1765672
Manually update imports under config
negz Feb 26, 2025
8090c98
Copy cluster-scoped APIs to namespaced unchanged
negz Feb 27, 2025
b54706e
Fix linter_run.go package names
negz Feb 27, 2025
5fe3d9f
Manually change namespaced APIs to scope=Namespaced
negz Feb 27, 2025
7b97cb2
Copy cluster scoped controllers to namespaced
negz Feb 27, 2025
0ffe0cc
Run code generation
negz Feb 27, 2025
1927fed
Fix imports in hand-written clients and controllers
negz Feb 27, 2025
0b9aacc
Fix eks/clusterauth import path
negz Feb 27, 2025
7a32027
Import cluster and namespaced types in provider binaries
negz Feb 27, 2025
2213132
build: run kustomize on cluster and namespaced CRD dirs
jbw976 Mar 8, 2025
e87e1ea
refactor: duplicate config into cluster and namespaced subdirs
jbw976 Mar 12, 2025
df40e8b
generated provider main.go files will use cluster config for now
jbw976 Mar 12, 2025
e90ed74
generator main.go creates both cluster scoped and namespaced config t…
jbw976 Mar 12, 2025
0cd4d7f
update root group name of namespaced config to m.aws.upbound.io
jbw976 Mar 12, 2025
67c545b
Remove conversion/bumping of singleton lists from namespaced config
jbw976 Mar 12, 2025
cbeba32
delete all generated namespaced apis, crds, examples for a clean slate
jbw976 Mar 12, 2025
e820d24
update group name for namespaced root apis
jbw976 Mar 12, 2025
1fb6aa6
generated namespaced apis, crds, and examples
jbw976 Mar 12, 2025
b2f493c
generated: namespaced controller version bumps for controllers specia…
jbw976 Mar 12, 2025
7f2b834
generated: new AWS partitions
jbw976 Mar 12, 2025
2bfcd13
copy manual api files from cluster to namespaced and run make generate
jbw976 Mar 12, 2025
53179b8
register singleton list conversions for namespace resources
jbw976 Mar 18, 2025
84edebc
use both cluster and namespaced config during provider start up
jbw976 Mar 20, 2025
de5db99
make generate provider main.go's
jbw976 Mar 20, 2025
19e69b9
don't separate generated CRDs into cluster/namespaced dirs
jbw976 Mar 21, 2025
16ab73c
update group name of namespaced core/config types to be aws.m.upbound.io
jbw976 Mar 21, 2025
281731d
run make generate to generate all CRDs to a single package/crds direc…
jbw976 Mar 21, 2025
c6008de
chore(deps): point at latest upjet from github.com/negz/upjet/tree/sp…
jbw976 Mar 21, 2025
cf8258c
build: update tag.sh for cluster and namespaced scoped resources
jbw976 Mar 23, 2025
057b2f1
refactor: cleanly separate config/common to cluster and namespaced
jbw976 Mar 24, 2025
37d0bef
run make generate to update apis pointing at config/common
jbw976 Mar 24, 2025
962a5ad
lint: fixes for imports ordering provider main.go and removing unused…
jbw976 Mar 24, 2025
ccb992e
run make generate for provider main.go import ordering
jbw976 Mar 24, 2025
959eefa
update namespaced group name to aws.m.upbound.io
jbw976 Mar 25, 2025
f828426
run make generate for namespaced group name change to aws.m.upbound.io
jbw976 Mar 25, 2025
098ab7b
build: update lint job runs-on to large runner ubuntu-latest-16-cores
jbw976 Mar 25, 2025
1b4320b
build: allow wild card exceptions in check-examples.py script
jbw976 Mar 25, 2025
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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module github.com/upbound/provider-aws

go 1.23.6

replace github.com/crossplane/upjet => github.com/negz/upjet v0.0.0-20250227033622-bf0ba4f0de9d
replace github.com/crossplane/upjet => github.com/negz/upjet v0.0.0-20250320063135-520f63c242c6
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just adding a note that we shouldn't merge this until we switch this to the crossplane/upjet crossplane-v2 branch after crossplane/upjet#480 is merged.


require (
dario.cat/mergo v1.0.1
Expand All @@ -26,6 +26,7 @@ require (
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.59
github.com/hashicorp/awspolicyequivalence v1.6.0
github.com/hashicorp/terraform-json v0.24.0
github.com/hashicorp/terraform-plugin-framework v1.13.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
github.com/hashicorp/terraform-provider-aws v0.0.0-00010101000000-000000000000
github.com/json-iterator/go v1.1.12
Expand Down Expand Up @@ -353,7 +354,6 @@ require (
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.21.0 // indirect
github.com/hashicorp/terraform-plugin-framework v1.13.0 // indirect
github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0 // indirect
github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 // indirect
github.com/hashicorp/terraform-plugin-framework-timetypes v0.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -804,8 +804,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/muvaf/typewriter v0.0.0-20210910160850-80e49fe1eb32 h1:yBQlHXLeUJL3TWVmzup5uT3wG5FLxhiTAiTsmNVocys=
github.com/muvaf/typewriter v0.0.0-20210910160850-80e49fe1eb32/go.mod h1:SAAdeMEiFXR8LcHffvIdiLI1w243DCH2DuHq7UrA5YQ=
github.com/negz/upjet v0.0.0-20250227033622-bf0ba4f0de9d h1:CKQmdkKYGLzM5PpQucRobIY5fVzK4u8W4M2ACLcZHqA=
github.com/negz/upjet v0.0.0-20250227033622-bf0ba4f0de9d/go.mod h1:F2u9XwKNzxM+myfS1Opjnc6a5E1N2PC7Mytbkavawvs=
github.com/negz/upjet v0.0.0-20250320063135-520f63c242c6 h1:UvITk13uQc754KSHQKcLvjXdwrOtho9Dxeu4pMJSNlM=
github.com/negz/upjet v0.0.0-20250320063135-520f63c242c6/go.mod h1:F2u9XwKNzxM+myfS1Opjnc6a5E1N2PC7Mytbkavawvs=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
Expand Down
Loading