Skip to content

Commit

Permalink
upgrade aws sdk v2 (crossplane-contrib#1329)
Browse files Browse the repository at this point in the history
support endpoint overrides in iso partitions
report correct partition in reported s3 status arn

Signed-off-by: Ben McDonie <bmcdonie@awetomaton.com>
  • Loading branch information
zonybob authored and Emelie Åkerström committed Sep 28, 2022
1 parent 6ecba7c commit 21d88c5
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 84 deletions.
44 changes: 22 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ go 1.17
require (
github.com/aws/aws-sdk-go v1.42.0
github.com/aws/aws-sdk-go-v2 v1.16.2
github.com/aws/aws-sdk-go-v2/config v1.10.0
github.com/aws/aws-sdk-go-v2/credentials v1.6.0
github.com/aws/aws-sdk-go-v2/service/acm v1.8.0
github.com/aws/aws-sdk-go-v2/service/acmpca v1.10.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.21.0
github.com/aws/aws-sdk-go-v2/service/ecr v1.9.0
github.com/aws/aws-sdk-go-v2/service/eks v1.12.0
github.com/aws/aws-sdk-go-v2/service/elasticache v1.13.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.8.0
github.com/aws/aws-sdk-go-v2/service/iam v1.12.0
github.com/aws/aws-sdk-go-v2/config v1.11.1
github.com/aws/aws-sdk-go-v2/credentials v1.6.5
github.com/aws/aws-sdk-go-v2/service/acm v1.10.0
github.com/aws/aws-sdk-go-v2/service/acmpca v1.12.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.26.0
github.com/aws/aws-sdk-go-v2/service/ecr v1.12.0
github.com/aws/aws-sdk-go-v2/service/eks v1.16.0
github.com/aws/aws-sdk-go-v2/service/elasticache v1.16.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.10.0
github.com/aws/aws-sdk-go-v2/service/iam v1.14.0
github.com/aws/aws-sdk-go-v2/service/lambda v1.21.1
github.com/aws/aws-sdk-go-v2/service/rds v1.11.0
github.com/aws/aws-sdk-go-v2/service/redshift v1.13.0
github.com/aws/aws-sdk-go-v2/service/route53 v1.13.0
github.com/aws/aws-sdk-go-v2/service/rds v1.14.0
github.com/aws/aws-sdk-go-v2/service/redshift v1.17.0
github.com/aws/aws-sdk-go-v2/service/route53 v1.15.0
github.com/aws/aws-sdk-go-v2/service/route53resolver v1.10.2
github.com/aws/aws-sdk-go-v2/service/s3 v1.18.0
github.com/aws/aws-sdk-go-v2/service/sns v1.10.0
github.com/aws/aws-sdk-go-v2/service/sqs v1.11.0
github.com/aws/aws-sdk-go-v2/service/sts v1.9.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.22.0
github.com/aws/aws-sdk-go-v2/service/sns v1.13.0
github.com/aws/aws-sdk-go-v2/service/sqs v1.14.0
github.com/aws/aws-sdk-go-v2/service/sts v1.12.0
github.com/aws/smithy-go v1.11.2
github.com/crossplane/crossplane-runtime v0.15.1-0.20220315141414-988c9ba9c255
github.com/crossplane/crossplane-tools v0.0.0-20220310165030-1f43fc12793e
Expand Down Expand Up @@ -51,14 +51,14 @@ require (
github.com/armon/go-metrics v0.3.9 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.6.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.7.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
Expand Down
91 changes: 44 additions & 47 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -78,70 +78,67 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l
github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
github.com/aws/aws-sdk-go v1.42.0 h1:BMZws0t8NAhHFsfnT3B40IwD13jVDG5KerlRksctVIw=
github.com/aws/aws-sdk-go v1.42.0/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/aws/aws-sdk-go-v2 v1.11.0/go.mod h1:SQfA+m2ltnu1cA0soUkj4dRSsmITiVQUJvBIZjzfPyQ=
github.com/aws/aws-sdk-go-v2 v1.11.2/go.mod h1:SQfA+m2ltnu1cA0soUkj4dRSsmITiVQUJvBIZjzfPyQ=
github.com/aws/aws-sdk-go-v2 v1.16.2 h1:fqlCk6Iy3bnCumtrLz9r3mJ/2gUT0pJ0wLFVIdWh+JA=
github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0 h1:yVUAwvJC/0WNPbyl0nA3j1L6CW1CN8wBubCRqtG7JLI=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.0.0/go.mod h1:Xn6sxgRuIDflLRJFj5Ev7UxABIkNbccFPV/p8itDReM=
github.com/aws/aws-sdk-go-v2/config v1.10.0 h1:4i+/7DmCQCAls5Z61giur0LOPZ3PXFwnSIw7hRamzws=
github.com/aws/aws-sdk-go-v2/config v1.10.0/go.mod h1:xuqoV5etD3N3B8Ts9je4ijgAv6mb+6NiOPFMUhwRcjA=
github.com/aws/aws-sdk-go-v2/credentials v1.6.0 h1:L3O6osQTlzLKRmiTphw2QJuD21EFapWCX4IipiRJhAE=
github.com/aws/aws-sdk-go-v2/credentials v1.6.0/go.mod h1:rQkYdQPDXRrvPLeEuCNwSgtwMzBo9eDGWlTNC69Sh/0=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.0 h1:OpZjuUy8Jt3CA1WgJgBC5Bz+uOjE5Ppx4NFTRaooUuA=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.0/go.mod h1:5E1J3/TTYy6z909QNR0QnXGBpfESYGDqd3O0zqONghU=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.0/go.mod h1:NO3Q5ZTTQtO2xIg2+xTXYDiT7knSejfeDm7WGDaOo0U=
github.com/aws/aws-sdk-go-v2/config v1.11.1 h1:KXSjb7ZMLRtjxClFptukTYibiOqJS9NwBO+9WD3UMto=
github.com/aws/aws-sdk-go-v2/config v1.11.1/go.mod h1:VvfkzUhVtntSg1JfGFMSKS0CyiTZd3NqBxK5af4zsME=
github.com/aws/aws-sdk-go-v2/credentials v1.6.5 h1:ZrsO2js2v4T95rsCIWoAb/ck5+U1kwkizGdZHY+ni3s=
github.com/aws/aws-sdk-go-v2/credentials v1.6.5/go.mod h1:HWSOnsnqVMbLcWUmom6AN1cqhcLzLJ62AObW28CbYbU=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 h1:KiN5TPOLrEjbGCvdTQR4t0U4T87vVwALZ5Bg3jpMqPY=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2/go.mod h1:dF2F6tXEOgmW5X1ZFO/EPtWrcm7XkW07KNcJUGNtt4s=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.2/go.mod h1:SgKKNBIoDC/E1ZCDhhMW3yalWjwuLjMcpLzsM/QQnWo=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9 h1:onz/VaaxZ7Z4V+WIN9Txly9XLTmoOh1oJ8XcAC3pako=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9/go.mod h1:AnVH5pvai0pAF4lXRq0bmhbes1u9R8wTE+g+183bZNM=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.0/go.mod h1:anlUzBoEWglcUxUQwZA7HQOEVEnQALVZsizAapB2hq8=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.2/go.mod h1:xT4XX6w5Sa3dhg50JrYyy3e4WPYo/+WjY/BXtqXVunU=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3 h1:9stUQR/u2KXU6HkFJYlqnZEjBnbgrVbG6I5HN09xZh0=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3/go.mod h1:ssOhaLpRlh88H3UmEcsBoVKq309quMvm3Ds8e9d4eJM=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.0 h1:c10Z7fWxtJCoyc8rv06jdh9xrKnu7bAJiRaKWvTb2mU=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.0/go.mod h1:6oXGy4GLpypD3uCh8wcqztigGgmhLToMfjavgh+VySg=
github.com/aws/aws-sdk-go-v2/service/acm v1.8.0 h1:2oVPC4UGs8g7FAr0q4UOP4f24fY0dcYatKtYWtovPaM=
github.com/aws/aws-sdk-go-v2/service/acm v1.8.0/go.mod h1:RY7R36t45QePl8JASLqVCrD21ZY/S/c+A4CohZJ4Nks=
github.com/aws/aws-sdk-go-v2/service/acmpca v1.10.0 h1:bBi5CvkPlxYZzpcPsV0Jk+ML4pl6quZ0UqBwTcOuxOo=
github.com/aws/aws-sdk-go-v2/service/acmpca v1.10.0/go.mod h1:4sj1j4dKS5H23wU09EKuVo3S8Y1XXKDcy9D6hkAlCZ8=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.21.0 h1:cWWnqN+luwYCpU4pq8DxPsjf2iq282sgbgGCrDiY4Zs=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.21.0/go.mod h1:kK7lSKNwAqIMKVCTsfVcN82m8pvuPUf+6g/zrz/PnE0=
github.com/aws/aws-sdk-go-v2/service/ecr v1.9.0 h1:zVSzPcJNMkqhwq2kWErCEKdVrMG7dobA8MbwMKGI7Pg=
github.com/aws/aws-sdk-go-v2/service/ecr v1.9.0/go.mod h1:w+kCCZDC2FPKxulDIRIK8pJ1xd0uZ6rG+hhAWxE2XiA=
github.com/aws/aws-sdk-go-v2/service/eks v1.12.0 h1:gUKWVbn6Z5DnFZc5I/p5Fg7cllFq1WYOW0gTgr6Vvwg=
github.com/aws/aws-sdk-go-v2/service/eks v1.12.0/go.mod h1:xx1dG86r2c61vZwyJ78424Nk1/8TMaUR8p0NQCUTDVc=
github.com/aws/aws-sdk-go-v2/service/elasticache v1.13.0 h1:CWb43ciG+7nB6kmCf9Q/sQpzoflQRFOXBuyzk9OLvUI=
github.com/aws/aws-sdk-go-v2/service/elasticache v1.13.0/go.mod h1:+tbaz8MdaPgMyXjCvxvHq6A3XRKE3n7BFv4UJ0ZReGk=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.8.0 h1:kLRb3xQl8PJc4FF97o8QT0trBoNGuSjkW+gp3Hrlqc4=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.8.0/go.mod h1:OWoOm6HI0HN/BsacGAOkdEPHNgPgfKIRSZMMZG49T1Q=
github.com/aws/aws-sdk-go-v2/service/iam v1.12.0 h1:cRMv1RUzvdcgm8a/IBQQ3KgM6X36GWb7f7JcNljlkgU=
github.com/aws/aws-sdk-go-v2/service/iam v1.12.0/go.mod h1:NiK8Nf3qp0l9u6iUuy7h1VZWkd5spvygGL9o3xbbbIY=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 h1:IQup8Q6lorXeiA/rK72PeToWoWK8h7VAPgHNWdSrtgE=
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2/go.mod h1:VITe/MdW6EMXPb0o0txu/fsonXbMHUU2OC2Qp7ivU4o=
github.com/aws/aws-sdk-go-v2/service/acm v1.10.0 h1:h00NJuGEVi36k1BkVMpJQRRyye2SaPaCv2tQD0rm/uE=
github.com/aws/aws-sdk-go-v2/service/acm v1.10.0/go.mod h1:I43heu2RNNVqzR8q069JCllVMVgGRlDfNHRThRD70Kc=
github.com/aws/aws-sdk-go-v2/service/acmpca v1.12.0 h1:JL8J0ji+JK0t7JUUNtZg8atEUThdzk0KCgXY4a+7UXE=
github.com/aws/aws-sdk-go-v2/service/acmpca v1.12.0/go.mod h1:AcCVrQKCGEWqfC1837nKJW2H5GdYseVfmGwhDjtcX3M=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.26.0 h1:Q++veaxis1Dg7is9yi+aEPsIBRAgdkUxoIvyud7jOyo=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.26.0/go.mod h1:cIbz+b70nxJafXf9lT07Xj03pef6CsVdYTCCR0DQEQc=
github.com/aws/aws-sdk-go-v2/service/ecr v1.12.0 h1:oDIFK9jio/g88kjEihtkxt2IKelm7LjE75hX4x7rxoU=
github.com/aws/aws-sdk-go-v2/service/ecr v1.12.0/go.mod h1:IoE3h7WVE1zmlQzUHEYJ5JtfrF4g3rCG8mPz+fsp0+s=
github.com/aws/aws-sdk-go-v2/service/eks v1.16.0 h1:D8gm9wfCmTxkvbeVz9yhi7TOZm8mfoTP49cAA9NQrvA=
github.com/aws/aws-sdk-go-v2/service/eks v1.16.0/go.mod h1:xbz8pEpGLX0sMb5xCCWNSmp2mWNWQMZsOj6fFuCskjw=
github.com/aws/aws-sdk-go-v2/service/elasticache v1.16.0 h1:IQbmNCQvPs7LyfdTFTxXsSXp0JS13f0BB3PC9w0VwDI=
github.com/aws/aws-sdk-go-v2/service/elasticache v1.16.0/go.mod h1:6O2ce+L9zaOcKzEYG+vGJHSgDVcz+ucETuwNvkKTzeQ=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.10.0 h1:kSyYDcteNkn6x5gGIqNZy/iVsDYzh0SUAFG56TsfDdg=
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.10.0/go.mod h1:dCzl6Xr3MPAATrjdxRBTE602B/jVrujl7CDfbzu2wks=
github.com/aws/aws-sdk-go-v2/service/iam v1.14.0 h1:j4rKVLd4ASdTCWqCxt/p99S6BpA6bjWdAk48yOL6NnQ=
github.com/aws/aws-sdk-go-v2/service/iam v1.14.0/go.mod h1:O13Qz5IqQmrLCQYw8l4luBDLNxOIlCAYUS0i+0ySOTk=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0 h1:lPLbw4Gn59uoKqvOfSnkJr54XWk5Ak1NK20ZEiSWb3U=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.5.0/go.mod h1:80NaCIH9YU3rzTTs/J/ECATjXuRqzo/wB6ukO6MZ0XY=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.0 h1:qGZWS/WgiFY+Zgad2u0gwBHpJxz6Ne401JE7iQI1nKs=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.0/go.mod h1:Mq6AEc+oEjCUlBuLiK5YwW4shSOAKCQ3tXN0sQeYoBA=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0 h1:0BOlTqnNnrEO04oYKzDxMMe68t107pmIotn18HtVonY=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.0/go.mod h1:xKCZ4YFSF2s4Hnb/J0TLeOsKuGzICzcElaOKNGrVnx4=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 h1:CKdUNKmuilw/KNmO2Q53Av8u+ZyXMC2M9aX8Z+c/gzg=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2/go.mod h1:FgR1tCsn8C6+Hf+N5qkfrE4IXvUL1RgW87sunJ+5J4I=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.2 h1:GnPGH1FGc4fkn0Jbm/8r2+nPOwSJjYPyHSqFSvY1ii8=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.9.2/go.mod h1:eDUYjOYt4Uio7xfHi5jOsO393ZG8TSfZB92a3ZNadWM=
github.com/aws/aws-sdk-go-v2/service/lambda v1.21.1 h1:xS9qXT9z7w59VoK4XI3rxe+GkpDRHgVd4lxapEJW7bE=
github.com/aws/aws-sdk-go-v2/service/lambda v1.21.1/go.mod h1:1/klj5RfSVnRVLC6qnZYnJqL8RcKhi4KHDm5BwnilOY=
github.com/aws/aws-sdk-go-v2/service/rds v1.11.0 h1:sFjF9JiGSFnBrcXgOM3Fm95SSOrAMywiyTb1bjO0oTE=
github.com/aws/aws-sdk-go-v2/service/rds v1.11.0/go.mod h1:CD31RSZUKoDEo7ZewGGutgOeqZvlZ4v8Skoyeizjt/o=
github.com/aws/aws-sdk-go-v2/service/redshift v1.13.0 h1:3ug6vNp0LNtxJUsOF7jJmZZi9WzLv+NMVPsTDk/+Uhw=
github.com/aws/aws-sdk-go-v2/service/redshift v1.13.0/go.mod h1:MiMygOIEiP68IspP/DxZddCXvVtXb2meRH49q9MYhIY=
github.com/aws/aws-sdk-go-v2/service/route53 v1.13.0 h1:D6wCH7rAeDJoSGmxkCcnp1EIye/6ecCm8WCNOSqTY+E=
github.com/aws/aws-sdk-go-v2/service/route53 v1.13.0/go.mod h1:s0AHQXKd6Jo4hsu2N9R1kxJuKLsEY8pIp3GUegGMrqk=
github.com/aws/aws-sdk-go-v2/service/rds v1.14.0 h1:5b2q6oYmh2pZA6Ys2kPnzlKfKT+Z7s5hn4RGHBDOTmg=
github.com/aws/aws-sdk-go-v2/service/rds v1.14.0/go.mod h1:Dw97zw/NALZ7oB0NLSGbRNXO9aPkip5cDnjSgudHbCE=
github.com/aws/aws-sdk-go-v2/service/redshift v1.17.0 h1:MhHapcuStJuX86Pk9+H6d3pk46xUpdV48NkEItRMyOc=
github.com/aws/aws-sdk-go-v2/service/redshift v1.17.0/go.mod h1:MFxHzFKSXjT0CUjOpTaeeuqxcP6+uuQMvzkhTEdIEUM=
github.com/aws/aws-sdk-go-v2/service/route53 v1.15.0 h1:TtL2aQTyJ/6HOpySI81wUcz5CaLNLCblBEprVYemK/g=
github.com/aws/aws-sdk-go-v2/service/route53 v1.15.0/go.mod h1:UslaPoP9fD1ayK7ywpkIE9ft5gOEhPVJkT66D4OvSrM=
github.com/aws/aws-sdk-go-v2/service/route53resolver v1.10.2 h1:s/s1fJ9r8MKGKOX7dPjfYosuxlGQCKx5EpWjhJfIFAE=
github.com/aws/aws-sdk-go-v2/service/route53resolver v1.10.2/go.mod h1:PC9M9N+FMOYRgqdohQybDyBbfdj7rdK7xt7/IyfphV4=
github.com/aws/aws-sdk-go-v2/service/s3 v1.18.0 h1:7qgXYvv0ONAfmHYT2d/k7MdllM8xmcxRP7CF1Xyxdws=
github.com/aws/aws-sdk-go-v2/service/s3 v1.18.0/go.mod h1:Gwz3aVctJe6mUY9T//bcALArPUaFmNAy2rTB9qN4No8=
github.com/aws/aws-sdk-go-v2/service/sns v1.10.0 h1:kigqTjTrX8C7cT3xmZJlJ4SDO2FbpbQKCbczUzekxcM=
github.com/aws/aws-sdk-go-v2/service/sns v1.10.0/go.mod h1:LIPf3BTbSY5UeVli+x/1y2Qw1w8T9DYyp7p18Qt8Zc8=
github.com/aws/aws-sdk-go-v2/service/sqs v1.11.0 h1:c7o2xE8RJxeYoisArTkvq4kaAPE51rligkdaPV5IvCQ=
github.com/aws/aws-sdk-go-v2/service/sqs v1.11.0/go.mod h1:TDqDmQnsbgL2ZMIGUf3z9xTzCMqFX7FP1geAgIlYqvA=
github.com/aws/aws-sdk-go-v2/service/sso v1.6.0 h1:JDgKIUZOmLFu/Rv6zXLrVTWCmzA0jcTdvsT8iFIKrAI=
github.com/aws/aws-sdk-go-v2/service/sso v1.6.0/go.mod h1:Q/l0ON1annSU+mc0JybDy1Gy6dnJxIcWjphO6qJPzvM=
github.com/aws/aws-sdk-go-v2/service/sts v1.9.0 h1:rBLCnL8hQ7Sv1S4XCPYgTMI7Uhg81BkvzIiK+/of2zY=
github.com/aws/aws-sdk-go-v2/service/sts v1.9.0/go.mod h1:jLKCFqS+1T4i7HDqCP9GM4Uk75YW1cS0o82LdxpMyOE=
github.com/aws/aws-sdk-go-v2/service/s3 v1.22.0 h1:J78RE/YNohCGbUyIbc3hr+UwnttfOn2dJUkNfvDkT30=
github.com/aws/aws-sdk-go-v2/service/s3 v1.22.0/go.mod h1:lQ5AeEW2XWzu8hwQ3dCqZFWORQ3RntO0Kq135Xd9VCo=
github.com/aws/aws-sdk-go-v2/service/sns v1.13.0 h1:4nUAjFOrn3879YnSV8HJXcmK8BhBf9W9DUYG0OG3ROY=
github.com/aws/aws-sdk-go-v2/service/sns v1.13.0/go.mod h1:ioTOCJnuDbEBqucork8ySl7X/PtPUKs2/b0pIKb1C3g=
github.com/aws/aws-sdk-go-v2/service/sqs v1.14.0 h1:8Jq7KQDOK81r4VPKuufMCNZ5ngQjMgNnLxYKJaZvg3s=
github.com/aws/aws-sdk-go-v2/service/sqs v1.14.0/go.mod h1:gOsepb5p+dWNJqP37uG78TR3cO0zYlGFLJT9zCCaaX8=
github.com/aws/aws-sdk-go-v2/service/sso v1.7.0 h1:E4fxAg/UE8a6yiLZYv8/EP0uXKPPRImiMau4ift6S/g=
github.com/aws/aws-sdk-go-v2/service/sso v1.7.0/go.mod h1:KnIpszaIdwI33tmc/W/GGXyn22c1USYxA/2KyvoeDY0=
github.com/aws/aws-sdk-go-v2/service/sts v1.12.0 h1:7g0252k2TF3eA1DtfkTQB/tqI41YvbUPaolwTR0/ITc=
github.com/aws/aws-sdk-go-v2/service/sts v1.12.0/go.mod h1:UV2N5HaPfdbDpkgkz4sRzWCvQswZjdO1FfqCWl0t7RA=
github.com/aws/smithy-go v1.9.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.11.2 h1:eG/N+CcUMAvsdffgMvjMKwfyDzIkjM6pfxMJ8Mzc6mE=
github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM=
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func SetResolver(pc *v1beta1.ProviderConfig, cfg *aws.Config) *aws.Config { // n
// to be set.
if region == "aws-global" {
switch StringValue(pc.Spec.Endpoint.PartitionID) {
case "aws-us-gov", "aws-cn":
case "aws-us-gov", "aws-cn", "aws-iso", "aws-iso-b":
e.SigningRegion = StringValue(LateInitializeStringPtr(pc.Spec.Endpoint.SigningRegion, &region))
default:
e.SigningRegion = "us-east-1"
Expand Down Expand Up @@ -731,7 +731,7 @@ func SetResolverV1(pc *v1beta1.ProviderConfig, cfg *awsv1.Config) *awsv1.Config
// to be set.
if region == "aws-global" {
switch StringValue(pc.Spec.Endpoint.PartitionID) {
case "aws-us-gov", "aws-cn":
case "aws-us-gov", "aws-cn", "aws-iso", "aws-iso-b":
e.SigningRegion = StringValue(LateInitializeStringPtr(pc.Spec.Endpoint.SigningRegion, &region))
default:
e.SigningRegion = "us-east-1"
Expand Down
20 changes: 10 additions & 10 deletions pkg/clients/aws_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -973,8 +973,6 @@ func TestUseProviderConfigResolveEndpoint(t *testing.T) {

for name, tc := range cases {
t.Run(name, func(t *testing.T) {
g := NewGomegaWithT(t)

mg := fake.Managed{
ProviderConfigReferencer: fake.ProviderConfigReferencer{
Ref: &xpv1.Reference{Name: providerConfigReferenceName},
Expand All @@ -1001,18 +999,20 @@ func TestUseProviderConfigResolveEndpoint(t *testing.T) {
}

config, err := UseProviderConfig(context.TODO(), kubeClient, &mg, tc.args.region)
g.Expect(err).NotTo(HaveOccurred())
if err != nil {
t.Errorf("UseProviderConfig threw exception:\n%s", err)
}

// If no endpointConfig was provided the returned endpointResolver should be nil
if tc.args.endpointConfig != nil {
actual, endpointError := config.EndpointResolverWithOptions.ResolveEndpoint(tc.args.service, tc.args.region, nil)
if tc.want.error != nil {
g.Expect(endpointError).To(HaveOccurred())
} else {
g.Expect(endpointError).NotTo(HaveOccurred())
if diff := cmp.Diff(tc.want.url, actual.URL); diff != "" {
t.Errorf("add: -want, +got:\n%s", diff)
}
// Assert exceptions match
if diff := cmp.Diff(tc.want.error, endpointError, test.EquateConditions()); diff != "" {
t.Errorf("r: -want error, +got error:\n%s", diff)
}
// Assert endpoints match
if diff := cmp.Diff(tc.want.url, actual.URL); diff != "" {
t.Errorf("add: -want, +got:\n%s", diff)
}
} else if config.EndpointResolverWithOptions != nil {
t.Errorf("Expected config.EndpointResolverWithOptions to be nil")
Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/s3/bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ func GenerateCreateBucketInput(name string, s v1beta1.BucketParameters) *s3.Crea
}

// GenerateBucketObservation generates the ARN string for the external status
func GenerateBucketObservation(name string) v1beta1.BucketExternalStatus {
func GenerateBucketObservation(name string, partition string) v1beta1.BucketExternalStatus {
return v1beta1.BucketExternalStatus{
ARN: fmt.Sprintf("arn:aws:s3:::%s", name),
ARN: fmt.Sprintf("arn:%s:s3:::%s", partition, name),
}
}

Expand Down
9 changes: 8 additions & 1 deletion pkg/controller/s3/bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,14 @@ func (e *external) Observe(ctx context.Context, mg resource.Managed) (managed.Ex
return managed.ExternalObservation{}, awsclient.Wrap(resource.Ignore(s3.IsNotFound, err), errHead)
}

cr.Status.AtProvider = s3.GenerateBucketObservation(meta.GetExternalName(cr))
// get the proper partitionId for the bucket's region
resolver := awss3.NewDefaultEndpointResolver()
endpoint, err1 := resolver.ResolveEndpoint(cr.Spec.ForProvider.LocationConstraint, awss3.EndpointResolverOptions{})
if err1 != nil {
return managed.ExternalObservation{}, err1
}

cr.Status.AtProvider = s3.GenerateBucketObservation(meta.GetExternalName(cr), endpoint.PartitionID)

lateInit := false
current := cr.Spec.ForProvider.DeepCopy()
Expand Down

0 comments on commit 21d88c5

Please sign in to comment.