From 41639d2be47d27c498c448dadea3f46957559be9 Mon Sep 17 00:00:00 2001 From: Matt Bush Date: Mon, 22 Jan 2024 12:02:26 -0800 Subject: [PATCH 1/3] Update elasticache replication group example to show diff calculation bug --- examples/elasticache/replicationgroup.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/elasticache/replicationgroup.yaml b/examples/elasticache/replicationgroup.yaml index 395361d4e2..d78c9a6644 100644 --- a/examples/elasticache/replicationgroup.yaml +++ b/examples/elasticache/replicationgroup.yaml @@ -16,6 +16,7 @@ spec: parameterGroupName: default.redis7 port: 6379 preferredCacheClusterAzs: - - us-west-1a - - us-west-1b - region: us-west-1 + - us-east-2a + - us-east-2b + region: us-east-2 + engineVersion: "7.1" \ No newline at end of file From 03592e670818c50fd5ce06c650a270457e9c9679 Mon Sep 17 00:00:00 2001 From: Matt Bush Date: Mon, 22 Jan 2024 12:05:20 -0800 Subject: [PATCH 2/3] Revert to upjet commit fb8acdbaec54 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7a0a56b23f..62c08c749c 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/aws/smithy-go v1.13.5 github.com/crossplane/crossplane-runtime v1.15.0-rc.0.0.20231215091746-d23a82b3a2f5 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 - github.com/crossplane/upjet v1.1.0-rc.0.0.20231227120826-4cb45f9104ac + github.com/crossplane/upjet v1.1.0-rc.0.0.20231226094952-fb8acdbaec54 github.com/go-ini/ini v1.46.0 github.com/google/go-cmp v0.6.0 github.com/hashicorp/terraform-json v0.17.0 diff --git a/go.sum b/go.sum index 342b887b8e..266eb4210b 100644 --- a/go.sum +++ b/go.sum @@ -174,8 +174,8 @@ github.com/crossplane/crossplane-runtime v1.15.0-rc.0.0.20231215091746-d23a82b3a github.com/crossplane/crossplane-runtime v1.15.0-rc.0.0.20231215091746-d23a82b3a2f5/go.mod h1:pgt7PaTvvOQz3jILyxbCaeleU9MrAqKaNoPJavhGBgM= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0= -github.com/crossplane/upjet v1.1.0-rc.0.0.20231227120826-4cb45f9104ac h1:T1MTxsPAE/Cs0/EAGjeC29H9O/rO81yol2/5qGsf888= -github.com/crossplane/upjet v1.1.0-rc.0.0.20231227120826-4cb45f9104ac/go.mod h1:t9etxIdYaxgyvFPBToikm5zBHi8RIpX8N4mTH77lQFM= +github.com/crossplane/upjet v1.1.0-rc.0.0.20231226094952-fb8acdbaec54 h1:uTK0QsKg3cM0/La5DvJlqlZwK+ueD3joYsVam63Ik9M= +github.com/crossplane/upjet v1.1.0-rc.0.0.20231226094952-fb8acdbaec54/go.mod h1:t9etxIdYaxgyvFPBToikm5zBHi8RIpX8N4mTH77lQFM= github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw= github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From d1da9ea9c9052e1453fb76e9b1c03c26b70cf78c Mon Sep 17 00:00:00 2001 From: Matt Bush Date: Tue, 23 Jan 2024 14:37:47 -0800 Subject: [PATCH 3/3] switch to forked version of upjet to revert 2 more PRs --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 62c08c749c..881be97733 100644 --- a/go.mod +++ b/go.mod @@ -213,3 +213,5 @@ require ( replace golang.org/x/exp => golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 replace github.com/hashicorp/terraform-provider-aws => github.com/upbound/terraform-provider-aws v0.0.0-20231026091456-f2d38ee240d7 + +replace github.com/crossplane/upjet => github.com/mbbush/upjet v0.0.0-20240123213939-7cbf31737861 diff --git a/go.sum b/go.sum index 266eb4210b..cd019fb149 100644 --- a/go.sum +++ b/go.sum @@ -174,8 +174,6 @@ github.com/crossplane/crossplane-runtime v1.15.0-rc.0.0.20231215091746-d23a82b3a github.com/crossplane/crossplane-runtime v1.15.0-rc.0.0.20231215091746-d23a82b3a2f5/go.mod h1:pgt7PaTvvOQz3jILyxbCaeleU9MrAqKaNoPJavhGBgM= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y= github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0= -github.com/crossplane/upjet v1.1.0-rc.0.0.20231226094952-fb8acdbaec54 h1:uTK0QsKg3cM0/La5DvJlqlZwK+ueD3joYsVam63Ik9M= -github.com/crossplane/upjet v1.1.0-rc.0.0.20231226094952-fb8acdbaec54/go.mod h1:t9etxIdYaxgyvFPBToikm5zBHi8RIpX8N4mTH77lQFM= github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw= github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -384,6 +382,8 @@ github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPn github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mbbush/upjet v0.0.0-20240123213939-7cbf31737861 h1:vwMPKijPK5/ZzlHTBbZEUewJWtISHFHA3CuHjcOsdfM= +github.com/mbbush/upjet v0.0.0-20240123213939-7cbf31737861/go.mod h1:t9etxIdYaxgyvFPBToikm5zBHi8RIpX8N4mTH77lQFM= github.com/mitchellh/cli v1.1.5/go.mod h1:v8+iFts2sPIKUV1ltktPXMCC8fumSKFItNcD2cLtRR4= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=