diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..fa0086a952236971ab37901954d596efae9f4af6
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0e1904e4915ade24025876e5ff239ad20b3e1338
--- /dev/null
+++ b/README.md
@@ -0,0 +1,24 @@
+# VT ED Terraform Provider
+
+This project was meant to be an opportunity to learn GoLang, while building a custom Terraform Provider.
+It provides the ability to manage ED groups using TF scripts.
+
+
+## Installation
+
+1. To use the provider, you can either [download a release](https://code.vt.edu/mikesir/vt-ed-terraform-provider/-/releases) or build from source. For convenience, a Dockerfile is included to build in a container.
+1. Once you have a binary, place it in your `~/.terraform.d/plugins` directory.
+1. Write your Terraform configuration.
+
+
+## Documentation
+
+[View documentation here](./docs)
+
+All provider docs (including resources and data sources) are found in the `docs` folder. Feel free to submit a MR for changes or clarifications.
+
+
+## License
+
+[Per the Terraform provider documentation](https://www.terraform.io/guides/terraform-provider-development-program.html#3-development-amp-test), "all Terraform providers are required to contain a MPL-2.0 open source license." Therefore, this provider is leveraging the MPL-2.0 license.
+
diff --git a/docs/d/vted_groups.md b/docs/d/vted_groups.md
new file mode 100644
index 0000000000000000000000000000000000000000..66785aee4ed1ef8aada950d0dc6df4a66d841f6e
--- /dev/null
+++ b/docs/d/vted_groups.md
@@ -0,0 +1,42 @@
+# vted_groups
+
+Provides the ability to lookup many groups.
+
+## Example Usage
+
+```hcl
+data "vted_groups" "app_roles" {
+ name = "example.app.roles.*"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported. At least one is required:
+
+- `name` (Optional) - The name/uugid of the group to search for. Supports wildcards using `*`
+- `created_before` (Optional) - Filter for groups created before the provided RFC3339 date
+- `created_after` (Optional) - Filter for groups created after the provided RFC3339 date
+- `expires_before` (Optional) - Filter for groups that expire before the provided RFC3339 date
+- `expires_after` (Optional) - Filter for groups that expire after the provided RFC3339 date
+- `contains_admin` (Optional) - Filter for groups that have the provided PID as an admin
+- `contains_contact` (Optional) - Filter for groups that have the provided PID as a contact
+- `contains_manager` (Optional) - Filter for groups that have the provided PID as a manager
+- `contains_member` (Optional) - Filter for groups that have the provided PID or group name as a member
+- `contains_viewer` (Optional) - Filter for groups that have the provided service id as an admin
+
+## Attributes Reference
+
+The resource exports the following attributes:
+
+- `groups` - A list of the [group results](#group-result-attributes)
+
+### Group Result Attributes
+
+Each group result has the following attributes:
+
+- `name` - The group's name (same as `uugid`)
+- `uugid` - The group's uugid (also exported as `name`)
+- `display_name` - The display name of the group. Empty string if not set
+- `creation_date` - The group's expiration date as a RFC3339 date
+- `expiration_date` - The group's expiration date as a RFC3339 date
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..6367a3af084f437f3101cf89a09888adaf37de48
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,33 @@
+
+# VT ED Provider
+
+The VT ED provider is used to interact with the Virginia Tech ED REST API. [Additional documentation about the VT ED webservices can be found here.](https://middleware.vt.edu/ed/ws/operations.html)
+
+Authentication is required to connect to the ED services. As of right now, this provider only supports using a service credential.
+
+## Example Usage
+
+```hcl
+# Configure the VTED provider
+provider "vted" {
+ service_auth = {
+ private_key_path = "path/to/client.key"
+ key_cert_path = "path/to/client.crt"
+ ca_cert_path = "path/toca.crt"
+ }
+}
+```
+
+## Argument Reference
+
+The following arguments are supported in the `provider` block:
+
+- `service_auth` (Required) - A [service auth](#service-auth-arguments) block that configures mutual TLS authentication
+
+### Service Auth Arguments
+
+All files for service authentication should be PEM-encoded. A passphrase for the private key is currently not supported.
+
+- `private_key_path` (Required) - The file path to the service's private key
+- `key_cert_path` (Required) - The file path to the service's certificate
+- `ca_cert_path` (Required) - The file path to a CA that should be used to verify the server's certificate
diff --git a/docs/r/vted_group.md b/docs/r/vted_group.md
new file mode 100644
index 0000000000000000000000000000000000000000..2e9c0ec40a79a72bf57d3cd1bd9f917e8b500f43
--- /dev/null
+++ b/docs/r/vted_group.md
@@ -0,0 +1,52 @@
+
+# vted_group
+
+This resource allows you to create and manage an ED group.
+
+## Example usage
+
+```hcl
+resource "vted_group" "my_group" {
+ name = "it.platform.test1"
+ expiration_date = "2020-10-10"
+ suppress_display = true
+ suppress_members = true
+
+ admins = ["mikesir"]
+ contacts = ["mikesir", "ceharris"]
+ managers = ["mikesir", "ceharris"]
+
+ members {
+ people = ["mikesir", "ceharris"]
+ groups = ["it.platform.roles.role1"]
+ }
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+- `name` - (Required) The name of the group.
+- `expiration_date` - (Optional) The expiration date of the group. Supported formats are RFC3339 and `YYYY-MM-DD`. Note that when using `YYYY-MM-DD`, the time is set to 00:00 UTC, which might cause date display differences.
+- `admins` - (Required) A collection of PIDs that are allowed to administer the group.
+- `contacts` - (Required) A collection of PIDs that are contacts for the group.
+- `managers` - (Optional) A collection of PIDs that are allowed to manage the group membership.
+- `members` - (Optional) A map of the `people` (PIDs) and `groups` (uusids) that are members of this group
+- `suppress_display` - (Optional) Boolean, defaults to true. Is this group visible in public listings?
+- `suppress_members` - (Optional) Boolean, defaults to true. Is this group's membership visible in public queries?
+
+## Attributes Reference
+
+The resource exports all argument attributes, as well as the following:
+
+- `creation_date` - The date in which the group was created
+
+
+## Importing groups
+
+You can import a group using the `terraform import <resource> <id>` command, using the group's name as it's `id` value. Example:
+
+```bash
+terraform import vted_group.example my.example.group.id
+```
diff --git a/terraform.tfstate b/terraform.tfstate
new file mode 100644
index 0000000000000000000000000000000000000000..4d64bfd515f89aa8640d59bb93ac455535b3794b
--- /dev/null
+++ b/terraform.tfstate
@@ -0,0 +1,8 @@
+{
+ "version": 4,
+ "terraform_version": "0.12.24",
+ "serial": 1,
+ "lineage": "1bdf1755-0411-0524-d59f-e4d23c92255e",
+ "outputs": {},
+ "resources": []
+}
diff --git a/vted/data_source_vted_groups.go b/vted/data_source_vted_groups.go
index 974cfbc35553a0b179e16a2fdfb377d4b4c5196d..96c9db04cf5ade60cff3edad8811b6ac6bdf6a04 100644
--- a/vted/data_source_vted_groups.go
+++ b/vted/data_source_vted_groups.go
@@ -9,9 +9,9 @@ func dataSourceVtEdGroups() *schema.Resource {
return &schema.Resource{
Read: dataSourceVtEdGroupsRead,
Schema: map[string]*schema.Schema{
- "uugid": {
+ "name": {
Type: schema.TypeString,
- Description: "The uuid to search for. Supports wildcards with *",
+ Description: "The name/uugid to search for. Supports wildcards with *",
Computed: true,
Optional: true,
AtLeastOneOf: []string{
@@ -103,6 +103,7 @@ func dataSourceVtEdGroupsRead(d *schema.ResourceData, meta interface{}) error {
for _, group := range data.Array() {
g := map[string]interface{}{
"uugid": group.Get("uugid").String(),
+ "name": group.Get("uugid").String(),
"display_name": group.Get("displayName").String(),
"creation_date": group.Get("creationDate").String(),
"expiration_date": group.Get("expirationDate").String(),
@@ -117,7 +118,7 @@ func dataSourceVtEdGroupsRead(d *schema.ResourceData, meta interface{}) error {
}
func getGroupSearchQueryParams(d *schema.ResourceData) string {
- uugid, uugidOk := d.GetOk("uugid")
+ uugid, uugidOk := d.GetOk("name")
createdBefore, createdBeforeOk := d.GetOk("created_before")
createdAfter, createdAfterOk := d.GetOk("created_after")
expiresBefore, expiresBeforeOk := d.GetOk("expires_before")
diff --git a/vted/resource_schemas.go b/vted/resource_schemas.go
index f3a3b6ca1c08c03c0fd0fe939d1305f6987af905..3b754c069396a75b7c039e335951ccc9dcb59e9d 100644
--- a/vted/resource_schemas.go
+++ b/vted/resource_schemas.go
@@ -27,9 +27,14 @@ func PersonResource() *schema.Resource {
func GroupSummary() *schema.Resource {
return &schema.Resource{
Schema: map[string]*schema.Schema{
+ "name": {
+ Type: schema.TypeString,
+ Description: "The name/uugid of the group",
+ Computed: true,
+ },
"uugid": {
Type: schema.TypeString,
- Description: "The uugid of the group",
+ Description: "The name/uugid of the group",
Computed: true,
},
"display_name": {
diff --git a/vted/resource_vted_group.go b/vted/resource_vted_group.go
index 2ea69117f8e6940e6c79a9e67beb5d1faf71e738..6d47e310a6e0fb587ac85cbd5a5b218dde869734 100644
--- a/vted/resource_vted_group.go
+++ b/vted/resource_vted_group.go
@@ -20,7 +20,7 @@ func resourceVtEdGroup() *schema.Resource {
Importer: resourceVtEdGroupImporter(),
Schema: map[string]*schema.Schema{
- "uugid": &schema.Schema{
+ "name": &schema.Schema{
Type: schema.TypeString,
Description: "The name/uugid of the group",
Required: true,
@@ -101,7 +101,7 @@ func resourceVtEdGroup() *schema.Resource {
func resourceVtEdGroupCreate(d *schema.ResourceData, meta interface{}) error {
edClient := meta.(*EdClient)
- uugid := d.Get("uugid").(string)
+ groupName := d.Get("name").(string)
err := validateAdminsAndContacts(d.Get("admins").(*schema.Set), d.Get("contacts").(*schema.Set))
if err != nil {
@@ -113,19 +113,19 @@ func resourceVtEdGroupCreate(d *schema.ResourceData, meta interface{}) error {
return err
}
- d.SetId(uugid)
+ d.SetId(groupName)
err = applyPatchesWhereNecessary(edClient, d)
if err != nil {
return err
}
- err = syncRole(uugid, "managers", d.Get("managers").(*schema.Set), nil, edClient, "person")
+ err = syncRole(groupName, "managers", d.Get("managers").(*schema.Set), nil, edClient, "person")
if err != nil {
return err
}
- err = syncMembers(uugid, d.Get("members").([]interface{}), nil, edClient)
+ err = syncMembers(groupName, d.Get("members").([]interface{}), nil, edClient)
if err != nil {
return err
}
@@ -133,7 +133,7 @@ func resourceVtEdGroupCreate(d *schema.ResourceData, meta interface{}) error {
return resourceVtEdGroupRead(d, meta)
}
-func syncMembers(uugid string, newMemberCollection []interface{}, oldMemberCollection []interface{}, client *EdClient) error {
+func syncMembers(groupName string, newMemberCollection []interface{}, oldMemberCollection []interface{}, client *EdClient) error {
var newPeopleSet *schema.Set
var oldPeopleSet *schema.Set
var newGroupSet *schema.Set
@@ -157,12 +157,12 @@ func syncMembers(uugid string, newMemberCollection []interface{}, oldMemberColle
oldGroupSet = schema.NewSet(schema.HashString, []interface{}{})
}
- err := syncRole(uugid, "members", newPeopleSet, oldPeopleSet, client, "person")
+ err := syncRole(groupName, "members", newPeopleSet, oldPeopleSet, client, "person")
if err != nil {
return err
}
- err = syncRole(uugid, "members", newGroupSet, oldGroupSet, client, "group")
+ err = syncRole(groupName, "members", newGroupSet, oldGroupSet, client, "group")
if err != nil {
return err
}
@@ -178,7 +178,6 @@ func resourceVtEdGroupRead(d *schema.ResourceData, meta interface{}) error {
return err
}
- d.SetId(groupInfo.Get("uugid").String())
d.Set("expiration_date", groupInfo.Get("expirationDate").String())
d.Set("creation_date", groupInfo.Get("creationDate").String())
d.Set("suppress_members", groupInfo.Get("suppressMembers").Bool())
@@ -194,7 +193,7 @@ func resourceVtEdGroupRead(d *schema.ResourceData, meta interface{}) error {
func resourceVtEdGroupUpdate(d *schema.ResourceData, meta interface{}) error {
edClient := meta.(*EdClient)
- uugid := d.Get("uugid").(string)
+ groupName := d.Get("name").(string)
err := applyPatchesWhereNecessary(edClient, d)
if err != nil {
@@ -203,7 +202,7 @@ func resourceVtEdGroupUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("admins") {
oldValue, newValue := d.GetChange("admins")
- err := syncRole(uugid, "admins", newValue.(*schema.Set), oldValue.(*schema.Set), edClient, "person")
+ err := syncRole(groupName, "admins", newValue.(*schema.Set), oldValue.(*schema.Set), edClient, "person")
if err != nil {
return err
}
@@ -211,7 +210,7 @@ func resourceVtEdGroupUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("contacts") {
oldValue, newValue := d.GetChange("contacts")
- err := syncRole(uugid, "contacts", newValue.(*schema.Set), oldValue.(*schema.Set), edClient, "person")
+ err := syncRole(groupName, "contacts", newValue.(*schema.Set), oldValue.(*schema.Set), edClient, "person")
if err != nil {
return err
}
@@ -219,7 +218,7 @@ func resourceVtEdGroupUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("managers") {
oldValue, newValue := d.GetChange("managers")
- err := syncRole(uugid, "managers", newValue.(*schema.Set), oldValue.(*schema.Set), edClient, "person")
+ err := syncRole(groupName, "managers", newValue.(*schema.Set), oldValue.(*schema.Set), edClient, "person")
if err != nil {
return err
}
@@ -227,7 +226,7 @@ func resourceVtEdGroupUpdate(d *schema.ResourceData, meta interface{}) error {
if d.HasChange("members") {
oldValue, newValue := d.GetChange("members")
- err := syncMembers(uugid, newValue.([]interface{}), oldValue.([]interface{}), edClient)
+ err := syncMembers(groupName, newValue.([]interface{}), oldValue.([]interface{}), edClient)
if err != nil {
return err
}
@@ -239,7 +238,7 @@ func resourceVtEdGroupUpdate(d *schema.ResourceData, meta interface{}) error {
func resourceVtEdGroupDelete(d *schema.ResourceData, meta interface{}) error {
edClient := meta.(*EdClient)
- _, err := edClient.Delete("/groups/" + d.Get("uugid").(string))
+ _, err := edClient.Delete("/groups/" + d.Get("name").(string))
if err != nil {
return err
}
@@ -280,7 +279,7 @@ func validateAdminsAndContacts(admins *schema.Set, contacts *schema.Set) error {
// Creation only supports specifying uugid, admins, and contacts
func groupConfigToFormBody(d *schema.ResourceData) string {
formDataObj := url.Values{}
- formDataObj.Set("uugid", d.Get("uugid").(string))
+ formDataObj.Set("uugid", d.Get("name").(string))
for _, name := range d.Get("admins").(*schema.Set).List() {
formDataObj.Add("administrator", name.(string))
@@ -323,7 +322,7 @@ func applyPatchesWhereNecessary(edClient *EdClient, d *schema.ResourceData) erro
if len(patches) > 0 {
patch := "[" + strings.Join(patches, ",") + "]"
log.Println("[DEBUG] Making a patch with the following: " + patch)
- _, err := edClient.Patch("/groups/"+d.Get("uugid").(string), patch)
+ _, err := edClient.Patch("/groups/"+d.Get("name").(string), patch)
if err != nil {
return err
}
@@ -332,7 +331,7 @@ func applyPatchesWhereNecessary(edClient *EdClient, d *schema.ResourceData) erro
return nil
}
-func syncRole(uugid string, roleName string, newMembers *schema.Set, oldMembers *schema.Set, client *EdClient, memberType string) error {
+func syncRole(groupName string, roleName string, newMembers *schema.Set, oldMembers *schema.Set, client *EdClient, memberType string) error {
var peopleToAdd []interface{}
if oldMembers == nil {
peopleToAdd = newMembers.List()
@@ -340,7 +339,7 @@ func syncRole(uugid string, roleName string, newMembers *schema.Set, oldMembers
peopleToAdd = newMembers.Difference(oldMembers).List()
}
- postUrl := fmt.Sprintf("/groups/%s/%s", uugid, roleName)
+ postUrl := fmt.Sprintf("/groups/%s/%s", groupName, roleName)
for _, n := range peopleToAdd {
formDataObj := url.Values{}
formDataObj.Set("kind", memberType)
@@ -359,8 +358,8 @@ func syncRole(uugid string, roleName string, newMembers *schema.Set, oldMembers
}
for _, n := range peopleToRemove {
- log.Printf("[DEBUG] Removing '%s' from role '%s' from group '%s'", n.(string), roleName, uugid)
- deleteUrl := fmt.Sprintf("/groups/%s/%s/%s", uugid, roleName, n.(string))
+ log.Printf("[DEBUG] Removing '%s' from role '%s' from group '%s'", n.(string), roleName, groupName)
+ deleteUrl := fmt.Sprintf("/groups/%s/%s/%s", groupName, roleName, n.(string))
_, err := client.Delete(deleteUrl)
if err != nil {
return err