Use the READ with the username instead of the GUID in the User CRUD

KopiCloud-AD-API · Mar 22, 2023 · 10c8756 · 10c8756
1 parent d273398
commit 10c8756
Show file tree

Hide file tree

Showing 23 changed files with 323 additions and 683 deletions.
diff --git a/docs/resources/kopicloud_user.md b/docs/resources/kopicloud_user.md
@@ -23,39 +23,20 @@ Element to create, update, delete Users from Active Directory
 ### Optional
 
 - `change_password_next_logon` (Boolean)
-- `city` (String)
 - `company` (String)
-- `country` (String)
 - `department` (String)
 - `description` (String)
 - `display_name` (String)
 - `email_address` (String)
 - `first_name` (String)
-- `home_folder_directory` (String)
-- `home_folder_drive` (String)
-- `home_folder_path` (String)
-- `home_phone` (String)
 - `initials` (String)
 - `job_title` (String)
 - `last_name` (String)
 - `manager` (String)
-- `mobile_phone` (String)
 - `office` (String)
-- `office_phone` (String)
 - `ou_path` (String)
 - `password_never_expires` (Boolean)
-- `po_box` (String)
-- `profile_logon_script` (String)
-- `profile_path` (String)
-- `rds_allow_logon` (Boolean)
-- `rds_connect_drive` (Boolean)
-- `rds_home_folder_drive` (String)
-- `rds_home_folder_path` (String)
-- `rds_profile_path` (String)
 - `show_fields` (String)
-- `state` (String)
-- `street` (String)
-- `zip_code` (String)
 
 ### Read-Only
 

diff --git a/example/main.tf b/example/main.tf
@@ -321,11 +321,12 @@ provider "kopicloud" {
 # }
 
 resource "kopicloud_user" "test" {
-  username     = "oforero13"
+  username     = "oforero14"
   password     = var.oforero11_password
   first_name   = "Oscar"
   last_name    = "Forero"
-  show_fields  = "Username,FirstName,LastName"
+  initials     = "OMFC"
+  company = "Kopicloud Inc."
 }
 
 output "user" {

diff --git a/generator-inputs/user.json b/generator-inputs/user.json
@@ -487,15 +487,16 @@
             },
             "read": {
                 "api_function": {
-                    "name": "GetApiADUserGuidDetailsWithResponse",
-                    "arguments": [],
+                    "name": "GetApiADUserUsernameDetailsWithResponse",
+                    "arguments": [
+                        {
+                            "name": "username",
+                            "type": "string"
+                        }
+                    ],
                     "params": {
-                        "name": "GetApiADUserGuidDetailsParams",
+                        "name": "GetApiADUserUsernameDetailsParams",
                         "fields": [
-                            {
-                                "api_name": "UserGuid",
-                                "type": "string"
-                            },
                             {
                                 "api_name": "ShowFields",
                                 "name": "show_fields",

diff --git a/provider/kopicloud.computer-cleanup-crud.gen.go b/provider/kopicloud.computer-cleanup-crud.gen.go
@@ -67,7 +67,7 @@ func resourceComputerCleanUp() *schema.Resource {
 
 func resourceComputerCleanUpCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	// Warning or errors can be collected in a slice type
-	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerCleanUpRead"))
+	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerCleanUpCreate"))
 	var diags diag.Diagnostics
 	c := m.(*ApiClient)
 	tflog.Debug(ctx, "Terraform data", map[string]interface{}{
@@ -267,7 +267,7 @@ func resourceComputerCleanUpRead(ctx context.Context, d *schema.ResourceData, m
 
 func resourceComputerCleanUpDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	// Warning or errors can be collected in a slice type
-	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerCleanUpRead"))
+	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerCleanUpDelete"))
 	var diags diag.Diagnostics
 	c := m.(*ApiClient)
 	tflog.Debug(ctx, "Terraform data", map[string]interface{}{

diff --git a/provider/kopicloud.computer-crud.gen.go b/provider/kopicloud.computer-crud.gen.go
@@ -62,7 +62,7 @@ func resourceComputer() *schema.Resource {
 
 func resourceComputerCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	// Warning or errors can be collected in a slice type
-	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerRead"))
+	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerCreate"))
 	var diags diag.Diagnostics
 	c := m.(*ApiClient)
 	tflog.Debug(ctx, "Terraform data", map[string]interface{}{
@@ -242,7 +242,7 @@ func resourceComputerRead(ctx context.Context, d *schema.ResourceData, m interfa
 
 func resourceComputerDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	// Warning or errors can be collected in a slice type
-	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerRead"))
+	tflog.Debug(ctx, fmt.Sprintf("Beginning resourceComputerDelete"))
 	var diags diag.Diagnostics
 	c := m.(*ApiClient)
 	tflog.Debug(ctx, "Terraform data", map[string]interface{}{