Refactor and update various resource files for improved functionality and clarity

dtoxvanilla1991 · dtoxvanilla1991 · commit 66b0d395ca66 · 2025-12-29T17:52:07.000-05:00
- Remove unnecessary comments and update descriptions in `.copywrite.hcl`, `.github/CODEOWNERS`, and `.github/CODE_OF_CONDUCT.md`.
- Enhance `.gitignore` to include additional files.
- Modify VSCode settings in `.vscode/settings.json` for explicit code actions on save.
- Update acceptance test command in `GNUmakefile`.
- Clarify application resource documentation in `docs/resources/application.md`.
- Remove deprecated permissions from `docs/resources/organization_user.md` and update examples in `examples/resources/kinde_user_role/resource.tf`.
- Improve error handling in `internal/provider/api_resource.go`, `internal/provider/role_resource.go`, and `internal/provider/user_resource.go`.
- Add pagination handling for permissions in `internal/provider/permission_resource.go`.
- Refactor user identity management in `internal/provider/user_resource.go`.
diff --git a/.copywrite.hcl b/.copywrite.hcl
@@ -1,4 +1,3 @@
-# NOTE: This file is for HashiCorp specific licensing automation and can be deleted after creating a new repo with this template.
 schema_version = 1
 
 project {
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,3 @@
-* @hashicorp/terraform-devex
+* @kinde-oss/giants-kinde
+package.json @kinde-oss/sdk-engineers
+**/package.json @kinde-oss/sdk-engineers
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -2,4 +2,4 @@
 
 HashiCorp Community Guidelines apply to you when interacting with the community here on GitHub and contributing code.
 
-Please read the full text at https://www.hashicorp.com/community-guidelines
+Please read the full text at [HashiCorp Community Guidelines](https://www.hashicorp.com/community-guidelines).
diff --git a/.gitignore b/.gitignore
@@ -21,5 +21,9 @@ coverage/
 # System files
 .DS_Store
 
+# Serena mcp
+.serena
+project.yml
+
 # ---------------------------------------------------------------------
 # Add specific rules here…
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,8 @@
 {
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.codeActionsOnSave": {"source.fixAll": true},
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "explicit"
+  },
   "editor.formatOnSave": true,
   "files.trimTrailingWhitespace": true,
   "markdown.extension.italic.indicator": "_",
diff --git a/GNUmakefile b/GNUmakefile
@@ -3,7 +3,7 @@ default: testacc
 # Run acceptance tests
 .PHONY: testacc
 testacc:
-	set -a && source .env && set +a && TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m
+	set -a && . .env && set +a && TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m
 
 # Run unit tests
 .PHONY: test
diff --git a/docs/resources/application.md b/docs/resources/application.md
@@ -10,14 +10,12 @@ description: |-
 
 Applications facilitates the interface for users to authenticate against. See [documentation](https://docs.kinde.com/build/applications/about-applications/) for more details.
 
-
-
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
 ### Required
 
-- `name` (String) Name of the application. Currently, there is no way to change this via the management application.
+- `name` (String) Name of the application. Currently, there is no way to change this via the management application, so changing this value forces creation of a new application.
 - `type` (String) Type of the application
 
 ### Optional
diff --git a/docs/resources/organization_user.md b/docs/resources/organization_user.md
@@ -10,6 +10,8 @@ description: |-
 
 Manages a user's membership and roles in a Kinde organization.
 
+> Note: The Kinde Management API currently supports attaching users to organizations and assigning roles. Direct permission assignments on memberships are not exposed by the API, so this resource only manages roles.
+
 ## Example Usage
 
 ```terraform
@@ -29,16 +31,6 @@ resource "kinde_organization_user" "with_roles" {
   ]
 }
 
-# Organization user with permissions
-resource "kinde_organization_user" "with_permissions" {
-  organization_code = "org_123" # Replace with your organization code
-  user_id          = kinde_user.example.id
-  permissions      = [
-    kinde_permission.read_users.id,
-    kinde_permission.write_users.id
-  ]
-}
-
 # Full example with user creation and organization membership
 resource "kinde_user" "example" {
   first_name = "John"
@@ -55,7 +47,6 @@ resource "kinde_organization_user" "full_example" {
   organization_code = "org_123" # Replace with your organization code
   user_id          = kinde_user.example.id
   roles            = [kinde_role.admin.id]
-  permissions      = [kinde_permission.read_users.id]
 }
 ```
 
@@ -69,7 +60,6 @@ resource "kinde_organization_user" "full_example" {
 
 ### Optional
 
-- `permissions` (List of String) The list of permission IDs to assign to the user.
 - `roles` (List of String) The list of role IDs to assign to the user.
 
 ### Read-Only
diff --git a/docs/resources/role.md b/docs/resources/role.md
@@ -17,6 +17,7 @@ Roles represent collections of permissions that can be assigned to users. See [d
 resource "kinde_role" "basic" {
   name = "basic_role"
   key  = "basic_role"
+  description = "Basic role description"
 }
 
 # Role with description
diff --git a/examples/README.md b/examples/README.md
@@ -2,8 +2,8 @@
 
 This directory contains examples that are mostly used for documentation, but can also be run/tested manually via the Terraform CLI.
 
-The document generation tool looks for files in the following locations by default. All other *.tf files besides the ones mentioned below are ignored by the documentation tool. This is useful for creating examples that can run and/or ar testable even if some parts are not relevant for the documentation.
+The document generation tool looks for files in the following locations by default. All other *.tf files besides the ones mentioned below are ignored by the documentation tool. This is useful for creating examples that can run and/or are testable even if some parts are not relevant for the documentation.
 
 * **provider/provider.tf** example file for the provider index page
 * **data-sources/`full data source name`/data-source.tf** example file for the named data source page
-* **resources/`full resource name`/resource.tf** example file for the named data source page
+* **resources/`full resource name`/resource.tf** example file for the named resource page
diff --git a/examples/resources/kinde_organization_user/resource.tf b/examples/resources/kinde_organization_user/resource.tf
@@ -14,16 +14,6 @@ resource "kinde_organization_user" "with_roles" {
   ]
 }
 
-# Organization user with permissions
-resource "kinde_organization_user" "with_permissions" {
-  organization_code = "org_123" # Replace with your organization code
-  user_id          = kinde_user.example.id
-  permissions      = [
-    kinde_permission.read_users.id,
-    kinde_permission.write_users.id
-  ]
-}
-
 # Full example with user creation and organization membership
 resource "kinde_user" "example" {
   first_name = "John"
@@ -40,5 +30,4 @@ resource "kinde_organization_user" "full_example" {
   organization_code = "org_123" # Replace with your organization code
   user_id          = kinde_user.example.id
   roles            = [kinde_role.admin.id]
-  permissions      = [kinde_permission.read_users.id]
-} 
+}
diff --git a/examples/resources/kinde_role/complete_example.tf b/examples/resources/kinde_role/complete_example.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     kinde = {
-      source = "nxt-fwd/kinde"
+      source = "kinde-oss/kinde"
     }
   }
 }
@@ -99,4 +99,4 @@ output "readonly_user_id" {
 
 output "admin_user_id" {
   value = kinde_user.admin_user.id
-} 
+}
diff --git a/examples/resources/kinde_user_role/resource.tf b/examples/resources/kinde_user_role/resource.tf
@@ -1,10 +1,39 @@
-# Basic role assignment
+# Role assignment with dependencies
+resource "kinde_user" "example_user" {
+  first_name = "John"
+  last_name  = "Doe"
+  email      = "john.doe@example.com"
+}
+
+resource "kinde_role" "example_role" {
+  name = "Example Role"
+  key  = "example_role"
+}
+
+# Basic role assignment referencing the resources above
 resource "kinde_user_role" "basic_assignment" {
-  user_id           = kinde_user.example.id
-  role_id           = kinde_role.example.id
+  user_id           = kinde_user.example_user.id
+  role_id           = kinde_role.example_role.id
   organization_code = "org_123" # Replace with your organization code
 }
 
+# Supporting resources for multiple assignments
+resource "kinde_user" "admin_user" {
+  first_name = "Ada"
+  last_name  = "Admin"
+  email      = "ada.admin@example.com"
+}
+
+resource "kinde_role" "admin" {
+  name = "Administrator"
+  key  = "administrator"
+}
+
+resource "kinde_role" "readonly" {
+  name = "Read Only"
+  key  = "read_only"
+}
+
 # Multiple role assignments for a user
 resource "kinde_user_role" "admin_assignment" {
   user_id           = kinde_user.admin_user.id
@@ -18,20 +47,8 @@ resource "kinde_user_role" "readonly_assignment" {
   organization_code = "org_123" # Replace with your organization code
 }
 
-# Role assignment with dependencies
-resource "kinde_user" "example_user" {
-  first_name = "John"
-  last_name  = "Doe"
-  email      = "john.doe@example.com"
-}
-
-resource "kinde_role" "example_role" {
-  name = "Example Role"
-  key  = "example_role"
-}
-
 resource "kinde_user_role" "example_assignment" {
   user_id           = kinde_user.example_user.id
   role_id           = kinde_role.example_role.id
   organization_code = "org_123" # Replace with your organization code
-} 
+}
diff --git a/internal/provider/api_resource.go b/internal/provider/api_resource.go
@@ -126,6 +126,10 @@ func (r *APIResource) Read(ctx context.Context, req resource.ReadRequest, resp *
 
 	api, err := r.client.Get(ctx, state.ID.ValueString())
 	if err != nil {
+		if isNotFoundError(err) {
+			resp.State.RemoveResource(ctx)
+			return
+		}
 		resp.Diagnostics.AddError(
 			"Error Reading API",
 			fmt.Sprintf("Could not read API ID %s: %s", state.ID.ValueString(), err),
@@ -155,6 +159,9 @@ func (r *APIResource) Delete(ctx context.Context, req resource.DeleteRequest, re
 
 	err := r.client.Delete(ctx, state.ID.ValueString())
 	if err != nil {
+		if isNotFoundError(err) {
+			return
+		}
 		resp.Diagnostics.AddError(
 			"Error Deleting API",
 			fmt.Sprintf("Could not delete API ID %s: %s", state.ID.ValueString(), err),
diff --git a/internal/provider/api_schema.go b/internal/provider/api_schema.go
@@ -16,19 +16,29 @@ type APIResourceModel struct {
 }
 
 func expandAPIResourceModel(model APIResourceModel) *apis.API {
-	return &apis.API{
+	api := &apis.API{
 		ID:       model.ID.ValueString(),
 		Name:     model.Name.ValueString(),
 		Audience: model.Audience.ValueString(),
 	}
+
+	if !model.IsManagementAPI.IsNull() && !model.IsManagementAPI.IsUnknown() {
+		api.IsManagementAPI = model.IsManagementAPI.ValueBool()
+	}
+
+	return api
 }
 
 func flattenAPIResource(resource *apis.API) APIResourceModel {
-	return APIResourceModel{
+	model := APIResourceModel{
 		ID:       types.StringValue(resource.ID),
 		Name:     types.StringValue(resource.Name),
 		Audience: types.StringValue(resource.Audience),
 	}
+
+	model.IsManagementAPI = types.BoolValue(resource.IsManagementAPI)
+
+	return model
 }
 
 type APIDataSourceModel struct {
diff --git a/internal/provider/application_resource.go b/internal/provider/application_resource.go
@@ -60,6 +60,7 @@ func (r *ApplicationResource) Schema(ctx context.Context, req resource.SchemaReq
 			"name": schema.StringAttribute{
 				MarkdownDescription: "Name of the application. Currently, there is no way to change this via the management application.",
 				Required:            true,
+				PlanModifiers:       []planmodifier.String{stringplanmodifier.RequiresReplace()},
 			},
 			"type": schema.StringAttribute{
 				MarkdownDescription: "Type of the application",
diff --git a/internal/provider/application_resource_test.go b/internal/provider/application_resource_test.go
@@ -110,49 +110,3 @@ resource "kinde_application_connection" "otp" {
 }
 `, name)
 }
-
-func testAccApplicationResourceConfig_ConnectionSetup(name string) string {
-	return fmt.Sprintf(`
-resource "kinde_connection" "oauth2" {
-	name         = "%[1]s-conn"
-	display_name = "Test OAuth2 Connection"
-	strategy     = "oauth2:google"
-	options = {
-		client_id     = "test-client-id"
-		client_secret = "test-client-secret"
-	}
-}
-`, name)
-}
-
-func testAccApplicationResourceConfig_ReducedConnections(name string) string {
-	return fmt.Sprintf(`
-resource "kinde_connection" "oauth2" {
-	name         = "%[1]s-conn"
-	display_name = "Test OAuth2 Connection"
-	strategy     = "oauth2:google"
-	options = {
-		client_id     = "test-client-id"
-		client_secret = "test-client-secret"
-	}
-}
-
-resource "kinde_application" "test" {
-	name = "%[1]s-app"
-	type = "reg"
-	connections = [
-		{
-			id = kinde_connection.oauth2.id
-		}
-	]
-
-	lifecycle {
-		ignore_changes = [
-			connections[*].name,
-			connections[*].display_name,
-			connections[*].strategy,
-		]
-	}
-}
-`, name)
-}
diff --git a/internal/provider/connection_resource.go b/internal/provider/connection_resource.go
@@ -28,7 +28,7 @@ type ConnectionResource struct {
 	client *connections.Client
 }
 
-// ConnectionOptionsModel represents OAuth2 connection options
+// ConnectionOptionsModel represents OAuth2 connection options.
 type ConnectionOptionsModel struct {
 	ClientID     types.String `tfsdk:"client_id" json:"client_id,omitempty"`
 	ClientSecret types.String `tfsdk:"client_secret" json:"client_secret,omitempty"`
@@ -124,12 +124,6 @@ func (m *ConnectionResourceModel) Equal(other *ConnectionResourceModel) bool {
 	return clientIDEqual && clientSecretEqual
 }
 
-// Local structs for connection options with proper tfsdk tags
-type connectionOptions struct {
-	ClientID     types.String `tfsdk:"client_id"`
-	ClientSecret types.String `tfsdk:"client_secret"`
-}
-
 // Plan modifier for options
 type optionsEmptyPreserveModifier struct{}
 
diff --git a/internal/provider/connection_resource_test.go b/internal/provider/connection_resource_test.go
@@ -345,32 +345,6 @@ resource "kinde_connection" "sensitive" {
 `, name)
 }
 
-func testAccConnectionResourceConfig_OnlyClientID(name, clientID string) string {
-	return fmt.Sprintf(`
-resource "kinde_connection" "sensitive" {
-	name         = %[1]q
-	display_name = "Test Sensitive Fields"
-	strategy     = "oauth2:google"
-	options = {
-		client_id = %[2]q
-	}
-}
-`, name, clientID)
-}
-
-func testAccConnectionResourceConfig_OnlyClientSecret(name, clientSecret string) string {
-	return fmt.Sprintf(`
-resource "kinde_connection" "sensitive" {
-	name         = %[1]q
-	display_name = "Test Sensitive Fields"
-	strategy     = "oauth2:google"
-	options = {
-		client_secret = %[2]q
-	}
-}
-`, name, clientSecret)
-}
-
 func testAccConnectionResourceConfig_EmptyOptions(name string) string {
 	return fmt.Sprintf(`
 resource "kinde_connection" "empty_to_populated" {
diff --git a/internal/provider/connections_data_source.go b/internal/provider/connections_data_source.go
diff --git a/internal/provider/organization_resource.go b/internal/provider/organization_resource.go
diff --git a/internal/provider/organization_user_resource.go b/internal/provider/organization_user_resource.go
diff --git a/internal/provider/organization_user_schema.go b/internal/provider/organization_user_schema.go
diff --git a/internal/provider/permission_resource.go b/internal/provider/permission_resource.go
diff --git a/internal/provider/role_resource.go b/internal/provider/role_resource.go
diff --git a/internal/provider/user_resource.go b/internal/provider/user_resource.go
diff --git a/internal/provider/user_resource_test.go b/internal/provider/user_resource_test.go
diff --git a/internal/provider/utils.go b/internal/provider/utils.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# NOTE: This file is for HashiCorp specific licensing automation and can be deleted after creating a new repo with this template.`
`2`	`1`	`schema_version = 1`
`3`	`2`
`4`	`3`	`project {`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`HashiCorp Community Guidelines apply to you when interacting with the community here on GitHub and contributing code.`
`4`	`4`
`5`		`-Please read the full text at https://www.hashicorp.com/community-guidelines`
	`5`	`+Please read the full text at [HashiCorp Community Guidelines](https://www.hashicorp.com/community-guidelines).`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ Roles represent collections of permissions that can be assigned to users. See [d`
`17`	`17`	`resource "kinde_role" "basic" {`
`18`	`18`	`name = "basic_role"`
`19`	`19`	`key = "basic_role"`
	`20`	`+ description = "Basic role description"`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`# Role with description`