Skip to content

Commit 3a20edb

Browse files
zainq11zainq11
authored
Merge branch 'main' into zainq11/bitbucket-data-center
2 parents 59a0d16 + 155ebe1 commit 3a20edb

16 files changed

+144
-76
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
## UNRELEASED
1+
## v0.55.0
2+
3+
FEATURES:
4+
* `r/tfe_team`: Add attributes `manage_teams`, `manage_organization_access`, and `access_secret_teams` to `organization_access` on `tfe_team` by @juliannatetreault [#1313](https://github.com/hashicorp/terraform-provider-tfe/pull/1313)
25

36
## v0.54.0
47

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Declare the provider in your configuration and `terraform init` will automatical
2929
terraform {
3030
required_providers {
3131
tfe = {
32-
version = "~> 0.54.0"
32+
version = "~> 0.55.0"
3333
}
3434
}
3535
}

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/hashicorp/go-multierror v1.1.1 // indirect
1313
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
1414
github.com/hashicorp/go-slug v0.15.0
15-
github.com/hashicorp/go-tfe v1.51.0
15+
github.com/hashicorp/go-tfe v1.53.0
1616
github.com/hashicorp/go-version v1.6.0
1717
github.com/hashicorp/hcl v1.0.0
1818
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
@@ -28,15 +28,14 @@ require (
2828
golang.org/x/crypto v0.21.0 // indirect
2929
golang.org/x/net v0.23.0 // indirect
3030
golang.org/x/oauth2 v0.17.0 // indirect
31-
golang.org/x/sys v0.18.0 // indirect
31+
golang.org/x/sys v0.20.0 // indirect
3232
golang.org/x/text v0.14.0 // indirect
3333
golang.org/x/time v0.5.0 // indirect
3434
google.golang.org/protobuf v1.33.0 // indirect
3535
)
3636

3737
require (
3838
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/golang/mock v1.6.0
4039
github.com/google/go-cmp v0.6.0 // indirect
4140
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
4241
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -62,6 +61,7 @@ require (
6261
require (
6362
github.com/hashicorp/terraform-plugin-log v0.9.0
6463
github.com/stretchr/testify v1.9.0
64+
go.uber.org/mock v0.4.0
6565
)
6666

6767
require (
@@ -76,7 +76,7 @@ require (
7676
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
7777
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
7878
golang.org/x/mod v0.15.0 // indirect
79-
golang.org/x/sync v0.6.0 // indirect
79+
golang.org/x/sync v0.7.0 // indirect
8080
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
8181
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8282
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
3434
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
3535
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
3636
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
37-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
38-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
3937
github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
4038
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
4139
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -69,8 +67,8 @@ github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT
6967
github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
7068
github.com/hashicorp/go-slug v0.15.0 h1:AhMnE6JIyW0KoDJlmRDwv4xd52a5ZK3VdioQ7SMmZhI=
7169
github.com/hashicorp/go-slug v0.15.0/go.mod h1:THWVTAXwJEinbsp4/bBRcmbaO5EYNLTqxbG4tZ3gCYQ=
72-
github.com/hashicorp/go-tfe v1.51.0 h1:nZIIMOGxzKJvL6fNO3wS/wpTdLVGHUMT6up82H9eJCE=
73-
github.com/hashicorp/go-tfe v1.51.0/go.mod h1:yZ/FCqBsOZ/e75kL29JYqAsKctL1Tti2zYcIoQh69Ck=
70+
github.com/hashicorp/go-tfe v1.53.0 h1:FlmR+45MB9rTosra2ZGPp0XtdxiRTmdTAJAgX94WK9k=
71+
github.com/hashicorp/go-tfe v1.53.0/go.mod h1:XnTtBj3tVQ4uFkcFsv8Grn+O1CVcIcceL1uc2AgUcaU=
7472
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
7573
github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
7674
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -166,41 +164,35 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh
166164
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
167165
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
168166
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
169-
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
170167
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
171168
github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8=
172169
github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
170+
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
171+
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
173172
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
174-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
175173
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
176174
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
177175
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
178-
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
179176
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
180177
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
181178
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
182179
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
183180
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
184181
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
185-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
186182
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
187183
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
188184
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
189185
golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
190186
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
191187
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
192188
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
193-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
194189
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
195-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
196-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
190+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
191+
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
197192
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
198-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
199193
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
200194
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
201195
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
202-
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
203-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
204196
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
205197
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
206198
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -209,8 +201,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
209201
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
210202
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
211203
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
212-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
213-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
204+
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
205+
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
214206
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
215207
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
216208
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -224,14 +216,11 @@ golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
224216
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
225217
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
226218
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
227-
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
228219
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
229220
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
230221
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
231222
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
232-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
233223
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
234-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
235224
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
236225
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
237226
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=

‎internal/provider/organization_members_helpers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ package provider
66
import (
77
"testing"
88

9-
"github.com/golang/mock/gomock"
109
tfe "github.com/hashicorp/go-tfe"
1110
tfemocks "github.com/hashicorp/go-tfe/mocks"
11+
"go.uber.org/mock/gomock"
1212
)
1313

1414
func MockOrganizationMemberships(t *testing.T, client *tfe.Client, orgName string, organizationMemberships []*tfe.OrganizationMembership) {

‎internal/provider/resource_tfe_team.go‎

Lines changed: 57 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,21 @@ func resourceTFETeam() *schema.Resource {
105105
Optional: true,
106106
Default: false,
107107
},
108+
"manage_teams": {
109+
Type: schema.TypeBool,
110+
Optional: true,
111+
Default: false,
112+
},
113+
"manage_organization_access": {
114+
Type: schema.TypeBool,
115+
Optional: true,
116+
Default: false,
117+
},
118+
"access_secret_teams": {
119+
Type: schema.TypeBool,
120+
Optional: true,
121+
Default: false,
122+
},
108123
},
109124
},
110125
},
@@ -144,17 +159,20 @@ func resourceTFETeamCreate(d *schema.ResourceData, meta interface{}) error {
144159
organizationAccess := v.([]interface{})[0].(map[string]interface{})
145160

146161
options.OrganizationAccess = &tfe.OrganizationAccessOptions{
147-
ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)),
148-
ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)),
149-
ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)),
150-
ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)),
151-
ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)),
152-
ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)),
153-
ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)),
154-
ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)),
155-
ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)),
156-
ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)),
157-
ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)),
162+
ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)),
163+
ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)),
164+
ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)),
165+
ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)),
166+
ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)),
167+
ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)),
168+
ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)),
169+
ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)),
170+
ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)),
171+
ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)),
172+
ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)),
173+
ManageTeams: tfe.Bool(organizationAccess["manage_teams"].(bool)),
174+
ManageOrganizationAccess: tfe.Bool(organizationAccess["manage_organization_access"].(bool)),
175+
AccessSecretTeams: tfe.Bool(organizationAccess["access_secret_teams"].(bool)),
158176
}
159177
}
160178

@@ -204,17 +222,20 @@ func resourceTFETeamRead(d *schema.ResourceData, meta interface{}) error {
204222
d.Set("name", team.Name)
205223
if team.OrganizationAccess != nil {
206224
organizationAccess := []map[string]bool{{
207-
"manage_policies": team.OrganizationAccess.ManagePolicies,
208-
"manage_policy_overrides": team.OrganizationAccess.ManagePolicyOverrides,
209-
"manage_workspaces": team.OrganizationAccess.ManageWorkspaces,
210-
"manage_vcs_settings": team.OrganizationAccess.ManageVCSSettings,
211-
"manage_providers": team.OrganizationAccess.ManageProviders,
212-
"manage_modules": team.OrganizationAccess.ManageModules,
213-
"manage_run_tasks": team.OrganizationAccess.ManageRunTasks,
214-
"manage_projects": team.OrganizationAccess.ManageProjects,
215-
"read_projects": team.OrganizationAccess.ReadProjects,
216-
"read_workspaces": team.OrganizationAccess.ReadWorkspaces,
217-
"manage_membership": team.OrganizationAccess.ManageMembership,
225+
"manage_policies": team.OrganizationAccess.ManagePolicies,
226+
"manage_policy_overrides": team.OrganizationAccess.ManagePolicyOverrides,
227+
"manage_workspaces": team.OrganizationAccess.ManageWorkspaces,
228+
"manage_vcs_settings": team.OrganizationAccess.ManageVCSSettings,
229+
"manage_providers": team.OrganizationAccess.ManageProviders,
230+
"manage_modules": team.OrganizationAccess.ManageModules,
231+
"manage_run_tasks": team.OrganizationAccess.ManageRunTasks,
232+
"manage_projects": team.OrganizationAccess.ManageProjects,
233+
"read_projects": team.OrganizationAccess.ReadProjects,
234+
"read_workspaces": team.OrganizationAccess.ReadWorkspaces,
235+
"manage_membership": team.OrganizationAccess.ManageMembership,
236+
"manage_teams": team.OrganizationAccess.ManageTeams,
237+
"manage_organization_access": team.OrganizationAccess.ManageOrganizationAccess,
238+
"access_secret_teams": team.OrganizationAccess.AccessSecretTeams,
218239
}}
219240
if err := d.Set("organization_access", organizationAccess); err != nil {
220241
return fmt.Errorf("error setting organization access for team %s: %w", d.Id(), err)
@@ -241,17 +262,20 @@ func resourceTFETeamUpdate(d *schema.ResourceData, meta interface{}) error {
241262
organizationAccess := v.([]interface{})[0].(map[string]interface{})
242263

243264
options.OrganizationAccess = &tfe.OrganizationAccessOptions{
244-
ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)),
245-
ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)),
246-
ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)),
247-
ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)),
248-
ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)),
249-
ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)),
250-
ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)),
251-
ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)),
252-
ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)),
253-
ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)),
254-
ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)),
265+
ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)),
266+
ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)),
267+
ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)),
268+
ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)),
269+
ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)),
270+
ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)),
271+
ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)),
272+
ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)),
273+
ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)),
274+
ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)),
275+
ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)),
276+
ManageTeams: tfe.Bool(organizationAccess["manage_teams"].(bool)),
277+
ManageOrganizationAccess: tfe.Bool(organizationAccess["manage_organization_access"].(bool)),
278+
AccessSecretTeams: tfe.Bool(organizationAccess["access_secret_teams"].(bool)),
255279
}
256280
}
257281

0 commit comments

Comments
 (0)