diff --git a/CHANGELOG.md b/CHANGELOG.md index 29b831d24..9e3f06793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -## UNRELEASED +## v0.55.0 +FEATURES: +* `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) ## v0.54.0 diff --git a/go.mod b/go.mod index 6caaa17d8..77e20ccf1 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-retryablehttp v0.7.5 // indirect github.com/hashicorp/go-slug v0.15.0 - github.com/hashicorp/go-tfe v1.51.0 + github.com/hashicorp/go-tfe v1.53.0 github.com/hashicorp/go-version v1.6.0 github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hcl/v2 v2.19.1 // indirect @@ -28,7 +28,7 @@ require ( golang.org/x/crypto v0.21.0 // indirect golang.org/x/net v0.23.0 // indirect golang.org/x/oauth2 v0.17.0 // indirect - golang.org/x/sys v0.18.0 // indirect + golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.33.0 // indirect @@ -36,7 +36,6 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.6.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect @@ -62,6 +61,7 @@ require ( require ( github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/stretchr/testify v1.9.0 + go.uber.org/mock v0.4.0 ) require ( @@ -76,7 +76,7 @@ require ( github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect golang.org/x/mod v0.15.0 // indirect - golang.org/x/sync v0.6.0 // indirect + golang.org/x/sync v0.7.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index bc65260ce..2e04030ca 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,6 @@ github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= 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 github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/go-slug v0.15.0 h1:AhMnE6JIyW0KoDJlmRDwv4xd52a5ZK3VdioQ7SMmZhI= github.com/hashicorp/go-slug v0.15.0/go.mod h1:THWVTAXwJEinbsp4/bBRcmbaO5EYNLTqxbG4tZ3gCYQ= -github.com/hashicorp/go-tfe v1.51.0 h1:nZIIMOGxzKJvL6fNO3wS/wpTdLVGHUMT6up82H9eJCE= -github.com/hashicorp/go-tfe v1.51.0/go.mod h1:yZ/FCqBsOZ/e75kL29JYqAsKctL1Tti2zYcIoQh69Ck= +github.com/hashicorp/go-tfe v1.53.0 h1:FlmR+45MB9rTosra2ZGPp0XtdxiRTmdTAJAgX94WK9k= +github.com/hashicorp/go-tfe v1.53.0/go.mod h1:XnTtBj3tVQ4uFkcFsv8Grn+O1CVcIcceL1uc2AgUcaU= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -166,23 +164,21 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= @@ -190,17 +186,13 @@ golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= 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= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= diff --git a/internal/provider/organization_members_helpers_test.go b/internal/provider/organization_members_helpers_test.go index 839c19361..e01fb699f 100644 --- a/internal/provider/organization_members_helpers_test.go +++ b/internal/provider/organization_members_helpers_test.go @@ -6,9 +6,9 @@ package provider import ( "testing" - "github.com/golang/mock/gomock" tfe "github.com/hashicorp/go-tfe" tfemocks "github.com/hashicorp/go-tfe/mocks" + "go.uber.org/mock/gomock" ) func MockOrganizationMemberships(t *testing.T, client *tfe.Client, orgName string, organizationMemberships []*tfe.OrganizationMembership) { diff --git a/internal/provider/resource_tfe_team.go b/internal/provider/resource_tfe_team.go index e85916563..e871d07e7 100644 --- a/internal/provider/resource_tfe_team.go +++ b/internal/provider/resource_tfe_team.go @@ -105,6 +105,21 @@ func resourceTFETeam() *schema.Resource { Optional: true, Default: false, }, + "manage_teams": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "manage_organization_access": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "access_secret_teams": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, }, }, }, @@ -144,17 +159,20 @@ func resourceTFETeamCreate(d *schema.ResourceData, meta interface{}) error { organizationAccess := v.([]interface{})[0].(map[string]interface{}) options.OrganizationAccess = &tfe.OrganizationAccessOptions{ - ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)), - ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)), - ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)), - ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)), - ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)), - ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)), - ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)), - ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)), - ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)), - ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)), - ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)), + ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)), + ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)), + ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)), + ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)), + ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)), + ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)), + ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)), + ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)), + ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)), + ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)), + ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)), + ManageTeams: tfe.Bool(organizationAccess["manage_teams"].(bool)), + ManageOrganizationAccess: tfe.Bool(organizationAccess["manage_organization_access"].(bool)), + AccessSecretTeams: tfe.Bool(organizationAccess["access_secret_teams"].(bool)), } } @@ -204,17 +222,20 @@ func resourceTFETeamRead(d *schema.ResourceData, meta interface{}) error { d.Set("name", team.Name) if team.OrganizationAccess != nil { organizationAccess := []map[string]bool{{ - "manage_policies": team.OrganizationAccess.ManagePolicies, - "manage_policy_overrides": team.OrganizationAccess.ManagePolicyOverrides, - "manage_workspaces": team.OrganizationAccess.ManageWorkspaces, - "manage_vcs_settings": team.OrganizationAccess.ManageVCSSettings, - "manage_providers": team.OrganizationAccess.ManageProviders, - "manage_modules": team.OrganizationAccess.ManageModules, - "manage_run_tasks": team.OrganizationAccess.ManageRunTasks, - "manage_projects": team.OrganizationAccess.ManageProjects, - "read_projects": team.OrganizationAccess.ReadProjects, - "read_workspaces": team.OrganizationAccess.ReadWorkspaces, - "manage_membership": team.OrganizationAccess.ManageMembership, + "manage_policies": team.OrganizationAccess.ManagePolicies, + "manage_policy_overrides": team.OrganizationAccess.ManagePolicyOverrides, + "manage_workspaces": team.OrganizationAccess.ManageWorkspaces, + "manage_vcs_settings": team.OrganizationAccess.ManageVCSSettings, + "manage_providers": team.OrganizationAccess.ManageProviders, + "manage_modules": team.OrganizationAccess.ManageModules, + "manage_run_tasks": team.OrganizationAccess.ManageRunTasks, + "manage_projects": team.OrganizationAccess.ManageProjects, + "read_projects": team.OrganizationAccess.ReadProjects, + "read_workspaces": team.OrganizationAccess.ReadWorkspaces, + "manage_membership": team.OrganizationAccess.ManageMembership, + "manage_teams": team.OrganizationAccess.ManageTeams, + "manage_organization_access": team.OrganizationAccess.ManageOrganizationAccess, + "access_secret_teams": team.OrganizationAccess.AccessSecretTeams, }} if err := d.Set("organization_access", organizationAccess); err != nil { 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 { organizationAccess := v.([]interface{})[0].(map[string]interface{}) options.OrganizationAccess = &tfe.OrganizationAccessOptions{ - ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)), - ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)), - ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)), - ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)), - ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)), - ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)), - ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)), - ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)), - ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)), - ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)), - ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)), + ManagePolicies: tfe.Bool(organizationAccess["manage_policies"].(bool)), + ManagePolicyOverrides: tfe.Bool(organizationAccess["manage_policy_overrides"].(bool)), + ManageWorkspaces: tfe.Bool(organizationAccess["manage_workspaces"].(bool)), + ManageVCSSettings: tfe.Bool(organizationAccess["manage_vcs_settings"].(bool)), + ManageProviders: tfe.Bool(organizationAccess["manage_providers"].(bool)), + ManageModules: tfe.Bool(organizationAccess["manage_modules"].(bool)), + ManageRunTasks: tfe.Bool(organizationAccess["manage_run_tasks"].(bool)), + ManageProjects: tfe.Bool(organizationAccess["manage_projects"].(bool)), + ReadProjects: tfe.Bool(organizationAccess["read_projects"].(bool)), + ReadWorkspaces: tfe.Bool(organizationAccess["read_workspaces"].(bool)), + ManageMembership: tfe.Bool(organizationAccess["manage_membership"].(bool)), + ManageTeams: tfe.Bool(organizationAccess["manage_teams"].(bool)), + ManageOrganizationAccess: tfe.Bool(organizationAccess["manage_organization_access"].(bool)), + AccessSecretTeams: tfe.Bool(organizationAccess["access_secret_teams"].(bool)), } } diff --git a/internal/provider/resource_tfe_team_test.go b/internal/provider/resource_tfe_team_test.go index d90be75a5..22f79c60d 100644 --- a/internal/provider/resource_tfe_team_test.go +++ b/internal/provider/resource_tfe_team_test.go @@ -79,6 +79,12 @@ func TestAccTFETeam_full(t *testing.T) { "tfe_team.foobar", "organization_access.0.read_workspaces", "true"), resource.TestCheckResourceAttr( "tfe_team.foobar", "organization_access.0.manage_membership", "true"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_teams", "true"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_organization_access", "true"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.access_secret_teams", "true"), ), }, }, @@ -126,6 +132,12 @@ func TestAccTFETeam_full_update(t *testing.T) { "tfe_team.foobar", "organization_access.0.read_workspaces", "true"), resource.TestCheckResourceAttr( "tfe_team.foobar", "organization_access.0.manage_membership", "true"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_teams", "true"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_organization_access", "true"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.access_secret_teams", "true"), ), }, { @@ -160,6 +172,12 @@ func TestAccTFETeam_full_update(t *testing.T) { "tfe_team.foobar", "sso_team_id", "changed-sso-id"), resource.TestCheckResourceAttr( "tfe_team.foobar", "organization_access.0.manage_membership", "false"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_teams", "false"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_organization_access", "false"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.access_secret_teams", "false"), ), }, { @@ -195,6 +213,12 @@ func TestAccTFETeam_full_update(t *testing.T) { "tfe_team.foobar", "sso_team_id", ""), resource.TestCheckResourceAttr( "tfe_team.foobar", "organization_access.0.manage_membership", "false"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_teams", "false"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.manage_organization_access", "false"), + resource.TestCheckResourceAttr( + "tfe_team.foobar", "organization_access.0.access_secret_teams", "false"), ), }, }, @@ -447,6 +471,16 @@ func testAccCheckTFETeamAttributes_full( if !team.OrganizationAccess.ManageMembership { return fmt.Errorf("OrganizationAccess.ManageMembership should be true") } + if !team.OrganizationAccess.ManageTeams { + return fmt.Errorf("OrganizationAccess.ManageTeams should be true") + } + if !team.OrganizationAccess.ManageOrganizationAccess { + return fmt.Errorf("OrganizationAccess.ManageOrganizationAccess should be true") + } + if !team.OrganizationAccess.AccessSecretTeams { + return fmt.Errorf("OrganizationAccess.AccessSecretTeams should be true") + } + if team.SSOTeamID != "team-test-sso-id" { return fmt.Errorf("Bad SSO Team ID: %s", team.SSOTeamID) } @@ -484,6 +518,15 @@ func testAccCheckTFETeamAttributes_full_update( if team.OrganizationAccess.ManageMembership { return fmt.Errorf("OrganizationAccess.ManageMembership should be false") } + if team.OrganizationAccess.ManageTeams { + return fmt.Errorf("OrganizationAccess.ManageTeams should be false") + } + if team.OrganizationAccess.ManageOrganizationAccess { + return fmt.Errorf("OrganizationAccess.ManageOrganizationAccess should be false") + } + if team.OrganizationAccess.AccessSecretTeams { + return fmt.Errorf("OrganizationAccess.AccessSecretTeams should be false") + } if team.SSOTeamID != "changed-sso-id" { return fmt.Errorf("Bad SSO Team ID: %s", team.SSOTeamID) @@ -552,6 +595,9 @@ resource "tfe_team" "foobar" { read_workspaces = true read_projects = true manage_membership = true + manage_teams = true + manage_organization_access = true + access_secret_teams = true } sso_team_id = "team-test-sso-id" }`, rInt) @@ -582,6 +628,9 @@ resource "tfe_team" "foobar" { read_projects = false read_workspaces = false manage_membership = false + manage_teams = false + manage_organization_access = false + access_secret_teams = false } sso_team_id = "changed-sso-id" diff --git a/internal/provider/run_task_helpers_test.go b/internal/provider/run_task_helpers_test.go index de7781d87..464e35795 100644 --- a/internal/provider/run_task_helpers_test.go +++ b/internal/provider/run_task_helpers_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "github.com/golang/mock/gomock" "github.com/hashicorp/go-tfe" tfemocks "github.com/hashicorp/go-tfe/mocks" + "go.uber.org/mock/gomock" ) func MockASingleOrgRunTask(t *testing.T, client *tfe.Client, task tfe.RunTask) { diff --git a/internal/provider/workspace_run_helpers_test.go b/internal/provider/workspace_run_helpers_test.go index dbdd8e98f..5574251fa 100644 --- a/internal/provider/workspace_run_helpers_test.go +++ b/internal/provider/workspace_run_helpers_test.go @@ -6,9 +6,9 @@ package provider import ( "testing" - "github.com/golang/mock/gomock" tfe "github.com/hashicorp/go-tfe" tfemocks "github.com/hashicorp/go-tfe/mocks" + "go.uber.org/mock/gomock" ) func MockRunsListForWorkspaceQueue(t *testing.T, client *tfe.Client, workspaceIDWithExpectedRun string, workspaceIDWithUnexpectedRun string) { diff --git a/website/docs/r/team.html.markdown b/website/docs/r/team.html.markdown index 6886b2b9d..4a2e76d49 100644 --- a/website/docs/r/team.html.markdown +++ b/website/docs/r/team.html.markdown @@ -55,6 +55,9 @@ The `organization_access` block supports: * `manage_run_tasks` - (Optional) Allow members to create, edit, and delete the organization's run tasks. * `manage_projects` - (Optional) Allow members to create and administrate all projects within the organization. Requires `manage_workspaces` to be set to `true`. * `manage_membership` - (Optional) Allow members to add/remove users from the organization, and to add/remove users from visible teams. +* `manage_teams` - (Optional) Allow members to create, update, and delete teams. +* `manage_organization_access` - (Optional) Allow members to update the organization access settings of teams. +* `access_secret_teams` - (Optional) Allow members access to secret teams up to the level of permissions granted by their team permissions setting. ## Attributes Reference