Skip to content

Commit b2edd3e

Browse files
authored
Merge pull request #312 from philips-software/bugfix/310
IAM Group: add lower level retry #310
2 parents 462366c + 944d07a commit b2edd3e

File tree

4 files changed

+48
-50
lines changed

4 files changed

+48
-50
lines changed

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/loafoe/easyssh-proxy/v2 v2.0.4
1818
github.com/loafoe/ferrite v0.2.0
1919
github.com/philips-labs/siderite v0.12.2
20-
github.com/philips-software/go-hsdp-api v0.77.7
20+
github.com/philips-software/go-hsdp-api v0.78.1
2121
github.com/pkg/errors v0.9.1
2222
github.com/robfig/cron/v3 v3.0.1
2323
github.com/stretchr/testify v1.8.1
@@ -34,9 +34,9 @@ require (
3434
github.com/davecgh/go-spew v1.1.1 // indirect
3535
github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
3636
github.com/fatih/color v1.13.0 // indirect
37-
github.com/go-playground/locales v0.14.0 // indirect
38-
github.com/go-playground/universal-translator v0.18.0 // indirect
39-
github.com/go-playground/validator/v10 v10.11.1 // indirect
37+
github.com/go-playground/locales v0.14.1 // indirect
38+
github.com/go-playground/universal-translator v0.18.1 // indirect
39+
github.com/go-playground/validator/v10 v10.11.2 // indirect
4040
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
4141
github.com/golang/protobuf v1.5.2 // indirect
4242
github.com/google/go-cmp v0.5.9 // indirect
@@ -83,11 +83,11 @@ require (
8383
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
8484
github.com/vmihailenco/tagparser v0.1.1 // indirect
8585
github.com/zclconf/go-cty v1.12.1 // indirect
86-
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect
87-
golang.org/x/net v0.0.0-20220927171203-f486391704dc // indirect
86+
golang.org/x/crypto v0.5.0 // indirect
87+
golang.org/x/net v0.5.0 // indirect
8888
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
89-
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
90-
golang.org/x/text v0.3.7 // indirect
89+
golang.org/x/sys v0.4.0 // indirect
90+
golang.org/x/text v0.6.0 // indirect
9191
google.golang.org/appengine v1.6.7 // indirect
9292
google.golang.org/genproto v0.0.0-20220929141241-1ce7b20da813 // indirect
9393
google.golang.org/grpc v1.50.1 // indirect

go.sum

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -296,19 +296,21 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
296296
github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
297297
github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
298298
github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
299-
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
300299
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
300+
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
301301
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
302-
github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
303302
github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
303+
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
304+
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
304305
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
305-
github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
306306
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
307+
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
308+
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
307309
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
308310
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
309311
github.com/go-playground/validator/v10 v10.9.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
310-
github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ=
311-
github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
312+
github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
313+
github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
312314
github.com/go-resty/resty/v2 v2.6.0/go.mod h1:PwvJS6hvaPkjtjNg9ph+VrSD92bi5Zq73w/BIH7cC3Q=
313315
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
314316
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -747,12 +749,10 @@ github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG
747749
github.com/philips-labs/siderite v0.12.2 h1:V8v3Dcn/TUZvqfcCZ9EZ/E1aWXfcckayAuFwEYVzpvU=
748750
github.com/philips-labs/siderite v0.12.2/go.mod h1:wDjyR2ecI8z9S/uw4v7XCtgYK1Vr/eNE1Dnqmxr0wzo=
749751
github.com/philips-software/go-hsdp-api v0.50.2/go.mod h1:+/oOyI8Equm7/YcUHJ+PO3HO4U92JcAAoOs5DYRRkIc=
750-
github.com/philips-software/go-hsdp-api v0.77.5 h1:otbf2uhb5SnvhNwrh6ERgEtojOwvxpEcu+G0A29zcXE=
751-
github.com/philips-software/go-hsdp-api v0.77.5/go.mod h1:OlEuk7MZtYxXXXP9PI1zJB7jOk78BKnl825vsNSNq68=
752-
github.com/philips-software/go-hsdp-api v0.77.6 h1:Zu2WMPScaEjPG3UwCVmPR9coRHTSITQT+Kyta/JiClc=
753-
github.com/philips-software/go-hsdp-api v0.77.6/go.mod h1:OlEuk7MZtYxXXXP9PI1zJB7jOk78BKnl825vsNSNq68=
754-
github.com/philips-software/go-hsdp-api v0.77.7 h1:JKZtz3/hHPB0ish4/MzTRaATI0xwnaqc5jvAseJsesw=
755-
github.com/philips-software/go-hsdp-api v0.77.7/go.mod h1:OlEuk7MZtYxXXXP9PI1zJB7jOk78BKnl825vsNSNq68=
752+
github.com/philips-software/go-hsdp-api v0.77.8 h1:TCwwkWu6wlZ0HkCbauz8kBUbmQRAcy0MGZe7FbmomQA=
753+
github.com/philips-software/go-hsdp-api v0.77.8/go.mod h1:J9j11CrQR7OXcvsSo+/kE20mkKpAuqB1dxVnXQETsf4=
754+
github.com/philips-software/go-hsdp-api v0.78.1 h1:pVWLxRG76t35GSByP63tY3h2DrsoMZ/qPyUn7nSdbxA=
755+
github.com/philips-software/go-hsdp-api v0.78.1/go.mod h1:J9j11CrQR7OXcvsSo+/kE20mkKpAuqB1dxVnXQETsf4=
756756
github.com/philips-software/go-hsdp-signer v1.4.0 h1:yg7UILhmI4xJhr/tQiAiQwJL0EZFvLuMqpH2GZ9ygY4=
757757
github.com/philips-software/go-hsdp-signer v1.4.0/go.mod h1:/QehZ/+Aks2t1TFpjhF/7ZSB8PJIIJHzLc03rOqwLw0=
758758
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -965,9 +965,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
965965
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
966966
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
967967
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
968-
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
969-
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
970-
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
968+
golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
969+
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
971970
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
972971
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
973972
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1063,9 +1062,8 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
10631062
golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
10641063
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
10651064
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1066-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1067-
golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
1068-
golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
1065+
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
1066+
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
10691067
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
10701068
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
10711069
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1173,11 +1171,11 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc
11731171
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11741172
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11751173
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1176-
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
1177-
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1174+
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
1175+
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11781176
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
11791177
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
1180-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
1178+
golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
11811179
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
11821180
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
11831181
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1187,8 +1185,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
11871185
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
11881186
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
11891187
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
1190-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
1191-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
1188+
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
1189+
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
11921190
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
11931191
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
11941192
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

internal/services/iam/group/resource_iam_group.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func resourceIAMGroupCreate(ctx context.Context, d *schema.ResourceData, m inter
168168
users := tools.ExpandStringList(d.Get("users").(*schema.Set).List())
169169
if len(users) > 0 {
170170
err = tools.TryHTTPCall(ctx, 5, func() (*http.Response, error) {
171-
result, resp, err := client.Groups.AddMembers(*createdGroup, users...)
171+
result, resp, err := client.Groups.AddMembers(ctx, *createdGroup, users...)
172172
if resp == nil {
173173
return nil, err
174174
}
@@ -189,7 +189,7 @@ func resourceIAMGroupCreate(ctx context.Context, d *schema.ResourceData, m inter
189189
services := tools.ExpandStringList(d.Get("services").(*schema.Set).List())
190190
if len(services) > 0 {
191191
err = tools.TryHTTPCall(ctx, 5, func() (*http.Response, error) {
192-
result, resp, err := client.Groups.AddServices(*createdGroup, services...)
192+
result, resp, err := client.Groups.AddServices(ctx, *createdGroup, services...)
193193
if resp == nil {
194194
return nil, err
195195
}
@@ -213,7 +213,7 @@ func resourceIAMGroupCreate(ctx context.Context, d *schema.ResourceData, m inter
213213
devices := tools.ExpandStringList(d.Get("devices").(*schema.Set).List())
214214
if len(devices) > 0 {
215215
err = tools.TryHTTPCall(ctx, 5, func() (*http.Response, error) {
216-
result, resp, err := client.Groups.AddDevices(*createdGroup, devices...)
216+
result, resp, err := client.Groups.AddDevices(ctx, *createdGroup, devices...)
217217
if resp == nil {
218218
return nil, err
219219
}
@@ -324,10 +324,10 @@ func resourceIAMGroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
324324
toRemove := tools.Difference(old, newList)
325325

326326
if len(toRemove) > 0 {
327-
_, _, _ = client.Groups.RemoveMembers(group, toRemove...)
327+
_, _, _ = client.Groups.RemoveMembers(ctx, group, toRemove...)
328328
}
329329
if len(toAdd) > 0 {
330-
_, _, _ = client.Groups.AddMembers(group, toAdd...)
330+
_, _, _ = client.Groups.AddMembers(ctx, group, toAdd...)
331331
}
332332
}
333333

@@ -341,7 +341,7 @@ func resourceIAMGroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
341341

342342
if len(toRemove) > 0 {
343343
err = tools.TryHTTPCall(ctx, 5, func() (*http.Response, error) {
344-
_, resp, err := client.Groups.RemoveServices(group, toRemove...)
344+
_, resp, err := client.Groups.RemoveServices(ctx, group, toRemove...)
345345
if resp == nil {
346346
return nil, err
347347
}
@@ -353,7 +353,7 @@ func resourceIAMGroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
353353
}
354354
if len(toAdd) > 0 {
355355
err = tools.TryHTTPCall(ctx, 5, func() (*http.Response, error) {
356-
_, resp, err := client.Groups.AddServices(group, toAdd...)
356+
_, resp, err := client.Groups.AddServices(ctx, group, toAdd...)
357357
if resp == nil {
358358
return nil, err
359359
}
@@ -375,7 +375,7 @@ func resourceIAMGroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
375375

376376
if len(toRemove) > 0 {
377377
err = tools.TryHTTPCall(ctx, 5, func() (*http.Response, error) {
378-
_, resp, err := client.Groups.RemoveDevices(group, toRemove...)
378+
_, resp, err := client.Groups.RemoveDevices(ctx, group, toRemove...)
379379
if resp == nil {
380380
return nil, err
381381
}
@@ -387,7 +387,7 @@ func resourceIAMGroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
387387
}
388388
if len(toAdd) > 0 {
389389
err = tools.TryHTTPCall(ctx, 5, func() (*http.Response, error) {
390-
_, resp, err := client.Groups.AddDevices(group, toAdd...)
390+
_, resp, err := client.Groups.AddDevices(ctx, group, toAdd...)
391391
if resp == nil {
392392
return nil, err
393393
}
@@ -449,7 +449,7 @@ func purgeGroupContent(ctx context.Context, client *iam.Client, id string, d *sc
449449
if len(users) > 0 {
450450
for _, u := range users {
451451
_ = tools.TryHTTPCall(ctx, 8, func() (*http.Response, error) {
452-
_, resp, err := client.Groups.RemoveMembers(group, u)
452+
_, resp, err := client.Groups.RemoveMembers(ctx, group, u)
453453
if resp != nil && resp.StatusCode() == http.StatusUnprocessableEntity {
454454
return resp.Response, nil // User is already gone
455455
}
@@ -466,7 +466,7 @@ func purgeGroupContent(ctx context.Context, client *iam.Client, id string, d *sc
466466
if len(services) > 0 {
467467
for _, s := range services {
468468
_ = tools.TryHTTPCall(ctx, 8, func() (*http.Response, error) {
469-
_, resp, err := client.Groups.RemoveServices(group, s)
469+
_, resp, err := client.Groups.RemoveServices(ctx, group, s)
470470
if resp != nil && resp.StatusCode() == http.StatusUnprocessableEntity {
471471
return resp.Response, nil // Service is already gone
472472
}
@@ -483,7 +483,7 @@ func purgeGroupContent(ctx context.Context, client *iam.Client, id string, d *sc
483483
if len(devices) > 0 {
484484
for _, s := range devices {
485485
_ = tools.TryHTTPCall(ctx, 8, func() (*http.Response, error) {
486-
_, resp, err := client.Groups.RemoveDevices(group, s)
486+
_, resp, err := client.Groups.RemoveDevices(ctx, group, s)
487487
if resp != nil && resp.StatusCode() == http.StatusUnprocessableEntity {
488488
return resp.Response, nil // Service is already gone
489489
}

internal/services/iam/resource_iam_group_membership.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func resourceIAMGroupMembershipCreate(ctx context.Context, d *schema.ResourceDat
7575
users := tools.ExpandStringList(d.Get("users").(*schema.Set).List())
7676
if len(users) > 0 {
7777
err = tools.TryHTTPCall(ctx, 10, func() (*http.Response, error) {
78-
result, resp, err := client.Groups.AddMembers(*group, users...)
78+
result, resp, err := client.Groups.AddMembers(ctx, *group, users...)
7979
if err != nil {
8080
_ = client.TokenRefresh()
8181
}
@@ -96,7 +96,7 @@ func resourceIAMGroupMembershipCreate(ctx context.Context, d *schema.ResourceDat
9696
services := tools.ExpandStringList(d.Get("services").(*schema.Set).List())
9797
if len(services) > 0 {
9898
err = tools.TryHTTPCall(ctx, 10, func() (*http.Response, error) {
99-
result, resp, err := client.Groups.AddServices(*group, services...)
99+
result, resp, err := client.Groups.AddServices(ctx, *group, services...)
100100
if err != nil {
101101
_ = client.TokenRefresh()
102102
}
@@ -147,7 +147,7 @@ func resourceIAMGroupMembershipDelete(ctx context.Context, d *schema.ResourceDat
147147
users := tools.ExpandStringList(d.Get("users").(*schema.Set).List())
148148
if len(users) > 0 {
149149
err = tools.TryHTTPCall(ctx, 10, func() (*http.Response, error) {
150-
result, resp, err := client.Groups.RemoveMembers(*group, users...)
150+
result, resp, err := client.Groups.RemoveMembers(ctx, *group, users...)
151151
if resp == nil {
152152
return nil, err
153153
}
@@ -165,7 +165,7 @@ func resourceIAMGroupMembershipDelete(ctx context.Context, d *schema.ResourceDat
165165
services := tools.ExpandStringList(d.Get("services").(*schema.Set).List())
166166
if len(services) > 0 {
167167
err = tools.TryHTTPCall(ctx, 10, func() (*http.Response, error) {
168-
result, resp, err := client.Groups.RemoveServices(*group, services...)
168+
result, resp, err := client.Groups.RemoveServices(ctx, *group, services...)
169169
if resp == nil {
170170
return nil, err
171171
}
@@ -208,10 +208,10 @@ func resourceIAMGroupMembershipUpdate(ctx context.Context, d *schema.ResourceDat
208208
toRemove := tools.Difference(old, newList)
209209

210210
if len(toRemove) > 0 {
211-
_, _, _ = client.Groups.RemoveMembers(group, toRemove...)
211+
_, _, _ = client.Groups.RemoveMembers(ctx, group, toRemove...)
212212
}
213213
if len(toAdd) > 0 {
214-
_, _, _ = client.Groups.AddMembers(group, toAdd...)
214+
_, _, _ = client.Groups.AddMembers(ctx, group, toAdd...)
215215
}
216216
}
217217

@@ -225,7 +225,7 @@ func resourceIAMGroupMembershipUpdate(ctx context.Context, d *schema.ResourceDat
225225

226226
if len(toRemove) > 0 {
227227
err = tools.TryHTTPCall(ctx, 10, func() (*http.Response, error) {
228-
_, resp, err := client.Groups.RemoveServices(group, toRemove...)
228+
_, resp, err := client.Groups.RemoveServices(ctx, group, toRemove...)
229229
if resp == nil {
230230
return nil, err
231231
}
@@ -237,7 +237,7 @@ func resourceIAMGroupMembershipUpdate(ctx context.Context, d *schema.ResourceDat
237237
}
238238
if len(toAdd) > 0 {
239239
err = tools.TryHTTPCall(ctx, 10, func() (*http.Response, error) {
240-
_, resp, err := client.Groups.AddServices(group, toAdd...)
240+
_, resp, err := client.Groups.AddServices(ctx, group, toAdd...)
241241
if resp == nil {
242242
return nil, err
243243
}

0 commit comments

Comments
 (0)