Skip to content
This repository was archived by the owner on Jun 27, 2021. It is now read-only.

Commit ea829e6

Browse files
committed
misc fixes
1 parent e936175 commit ea829e6

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ GOVERSION := 1.12
1919
PROJECT := github.com/DeviaVir/terraform-provider-gsuite
2020
OWNER := $(notdir $(patsubst %/,%,$(dir $(PROJECT))))
2121
NAME := $(notdir $(PROJECT))
22-
VERSION := 0.1.20
22+
VERSION := 0.1.21
2323
EXTERNAL_TOOLS = \
2424
github.com/golang/dep/cmd/dep
2525

examples/domain/domain.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Make sure you have allowed the domain scope before you try to use the
2+
# gsuite_domain resources.
3+
#
4+
# https://www.googleapis.com/auth/admin.directory.domain
5+
# https://github.com/DeviaVir/terraform-provider-gsuite/issues/65#issuecomment-492879619
6+
17
resource "gsuite_domain" "my_domain" {
28
domain_name = "example.com"
39
}

gsuite/data_user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func dataUser() *schema.Resource {
2222

2323
"org_unit_path": {
2424
Type: schema.TypeString,
25-
Required: true,
25+
Computed: true,
2626
},
2727

2828
"aliases": {

gsuite/resource_user.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
func flattenUserName(name *directory.UserName) map[string]interface{} {
1515
return map[string]interface{}{
1616
"family_name": name.FamilyName,
17-
"full_name": name.FullName,
1817
"given_name": name.GivenName,
1918
}
2019
}
@@ -118,10 +117,6 @@ func resourceUser() *schema.Resource {
118117
Type: schema.TypeString,
119118
Required: true,
120119
},
121-
"full_name": {
122-
Type: schema.TypeString,
123-
Computed: true,
124-
},
125120
"given_name": {
126121
Type: schema.TypeString,
127122
Required: true,
@@ -197,7 +192,8 @@ func resourceUser() *schema.Resource {
197192

198193
"org_unit_path": {
199194
Type: schema.TypeString,
200-
Required: true,
195+
Optional: true,
196+
Default: "/",
201197
},
202198

203199
"ssh_public_keys": {

0 commit comments

Comments
 (0)