Merge remote-tracking branch 'origin/main'

Author: Fodoj

Makefile

@@ -7,7 +7,7 @@ REGISTRY_HOSTNAME=registry.terraform.io
 NAMESPACE=mkdev-me
 NAME=openai
 BINARY=terraform-provider-${NAME}
-VERSION=1.1.2
+VERSION=1.2.0-rc.1
 OS_ARCH=darwin_arm64
 
 default: install

docs/data-sources/organization_user.md

@@ -22,7 +22,7 @@ description: |-
 
 ### Read-Only
 
-- `added_at` (Number) The Unix timestamp when the user was added to the organization
+- `created` (Number) The Unix timestamp when the user was added to the organization
 - `id` (String) The ID of this resource.
 - `name` (String) The name of the user
 - `role` (String) The role of the user in the organization (owner, member, or reader)

docs/data-sources/organization_users.md

@@ -46,7 +46,7 @@ output "all_users_count" {
 
 Read-Only:
 
-- `added_at` (Number)
+- `created` (Number)
 - `email` (String)
 - `id` (String)
 - `name` (String)

docs/data-sources/project.md

@@ -28,7 +28,7 @@ output "project_id" {
 # Use project data to set variables
 locals {
   project_active = data.openai_project.production.status == "active"
-  project_name   = data.openai_project.production.name
+  project_title  = data.openai_project.production.title
 }
 ```
 
@@ -45,17 +45,9 @@ locals {
 
 ### Read-Only
 
-- `created_at` (Number) Timestamp when the project was created
+- `archived_at` (Number) Timestamp when the project was archived (null if not archived)
+- `created` (Number) Timestamp when the project was created
 - `id` (String) The ID of this resource.
-- `name` (String) The name of the project
+- `is_initial` (Boolean) Whether this is the initial project
 - `status` (String) The status of the project
-- `usage_limits` (List of Object) Usage limits for the project (see [below for nested schema](#nestedatt--usage_limits))
-
-<a id="nestedatt--usage_limits"></a>
-### Nested Schema for `usage_limits`
-
-Read-Only:
-
-- `max_monthly_dollars` (Number)
-- `max_parallel_requests` (Number)
-- `max_tokens` (Number)
+- `title` (String) The title of the project

docs/data-sources/projects.md

@@ -42,7 +42,9 @@ output "project_count" {
 
 Read-Only:
 
-- `created_at` (Number)
+- `archived_at` (Number)
+- `created` (Number)
 - `id` (String)
-- `name` (String)
+- `is_initial` (Boolean)
 - `status` (String)
+- `title` (String)

docs/resources/organization_user.md

@@ -41,7 +41,7 @@ resource "openai_organization_user" "organization_users" {
 
 ### Read-Only
 
-- `added_at` (Number) The Unix timestamp when the user was added to the organization
+- `created` (Number) The Unix timestamp when the user was added to the organization
 - `email` (String) The email address of the user
 - `id` (String) The ID of this resource.
 - `name` (String) The name of the user

docs/resources/project.md

@@ -15,14 +15,12 @@ description: |-
 ```terraform
 # Create a new OpenAI project
 resource "openai_project" "development" {
-  name        = "Development Project"
-  description = "Project for development and testing purposes"
+  title = "Development Project"
 }
 
 # Create a production project
 resource "openai_project" "production" {
-  name        = "Production API Services"
-  description = "Project for production API services and deployments"
+  title = "Production API Services"
 }
 
 # Output the project ID
@@ -37,18 +35,18 @@ output "dev_project_id" {
 
 ### Required
 
-- `name` (String) The name of the project
+- `title` (String) The title of the project
 
 ### Optional
 
-- `description` (String) A description of the project
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
 ### Read-Only
 
-- `archived_at` (String) Timestamp when the project was archived, if applicable
-- `created_at` (String) Timestamp when the project was created
+- `archived_at` (Number) Timestamp when the project was archived, if applicable
+- `created` (Number) Timestamp when the project was created
 - `id` (String) The ID of this resource.
+- `is_initial` (Boolean) Whether this is the initial project
 - `status` (String) Status of the project (active, archived, etc.)
 
 <a id="nestedblock--timeouts"></a>

examples/data-sources/openai_project/data-source.tf

@@ -13,5 +13,5 @@ output "project_id" {
 # Use project data to set variables
 locals {
   project_active = data.openai_project.production.status == "active"
-  project_name   = data.openai_project.production.name
+  project_title  = data.openai_project.production.title
 }

examples/resources/openai_project/resource.tf

@@ -1,13 +1,11 @@
 # Create a new OpenAI project
 resource "openai_project" "development" {
-  name        = "Development Project"
-  description = "Project for development and testing purposes"
+  title = "Development Project"
 }
 
 # Create a production project
 resource "openai_project" "production" {
-  name        = "Production API Services"
-  description = "Project for production API services and deployments"
+  title = "Production API Services"
 }
 
 # Output the project ID

internal/client/client.go

@@ -141,19 +141,13 @@ func (c *OpenAIClient) SetTimeout(timeout time.Duration) {
 
 // Project represents a project in OpenAI
 type Project struct {
-	Object         string        `json:"object"`
-	ID             string        `json:"id"`
-	Name           string        `json:"name"`
-	Description    string        `json:"description,omitempty"`
-	OrganizationID string        `json:"organization_id,omitempty"`
-	CreatedAt      *int64        `json:"created_at"`
-	ArchivedAt     *int64        `json:"archived_at"`
-	Status         string        `json:"status"`
-	IsDefault      bool          `json:"is_default,omitempty"`
-	BillingMode    string        `json:"billing_mode,omitempty"`
-	APIKeys        []APIKey      `json:"api_keys,omitempty"`
-	RateLimits     []RateLimit   `json:"rate_limits,omitempty"`
-	Users          []ProjectUser `json:"users,omitempty"`
+	ID         string `json:"id"`
+	Object     string `json:"object"`
+	Created    int64  `json:"created"`
+	Status     string `json:"status"`
+	ArchivedAt *int64 `json:"archived_at"`
+	IsInitial  bool   `json:"is_initial"`
+	Title      string `json:"title"`
 }
 
 // ProjectUser represents a user associated with a project
@@ -197,9 +191,7 @@ type APIKey struct {
 
 // CreateProjectRequest represents the request to create a project
 type CreateProjectRequest struct {
-	Name        string `json:"name"`
-	Description string `json:"description,omitempty"`
-	IsDefault   bool   `json:"is_default,omitempty"`
+	Title string `json:"title"`
 }
 
 // Error represents an error from the OpenAI API
@@ -567,23 +559,64 @@ type AssistantFunction struct {
 	Parameters  json.RawMessage `json:"parameters"`
 }
 
-// User represents an OpenAI user
+// UserInfo represents the nested user details in an organization user response
+type UserInfo struct {
+	ID     string `json:"id"`
+	Object string `json:"object"`
+	Email  string `json:"email"`
+	Name   string `json:"name"`
+}
+
+// OrganizationUser represents an OpenAI organization user as returned by the API
+type OrganizationUser struct {
+	Object                         string   `json:"object"`
+	Created                        int64    `json:"created"`
+	IsDefault                      bool     `json:"is_default"`
+	IsScaleTierAuthorizedPurchaser bool     `json:"is_scale_tier_authorized_purchaser"`
+	IsScimManaged                  bool     `json:"is_scim_managed"`
+	IsServiceAccount               bool     `json:"is_service_account"`
+	Role                           string   `json:"role"`
+	User                           UserInfo `json:"user"`
+}
+
+// User provides a flattened view of OrganizationUser for easier access
+// This is a convenience wrapper used internally
 type User struct {
-	ID      string `json:"id"`
-	Object  string `json:"object"`
-	Email   string `json:"email"`
-	Name    string `json:"name"`
-	Role    string `json:"role"`
-	AddedAt int64  `json:"added_at"`
+	ID                             string `json:"id"`
+	Object                         string `json:"object"`
+	Email                          string `json:"email"`
+	Name                           string `json:"name"`
+	Role                           string `json:"role"`
+	Created                        int64  `json:"created"`
+	IsDefault                      bool   `json:"is_default"`
+	IsScaleTierAuthorizedPurchaser bool   `json:"is_scale_tier_authorized_purchaser"`
+	IsScimManaged                  bool   `json:"is_scim_managed"`
+	IsServiceAccount               bool   `json:"is_service_account"`
+}
+
+// ToUser converts an OrganizationUser to a flattened User struct
+func (ou *OrganizationUser) ToUser() *User {
+	return &User{
+		ID:                             ou.User.ID,
+		Object:                         ou.Object,
+		Email:                          ou.User.Email,
+		Name:                           ou.User.Name,
+		Role:                           ou.Role,
+		Created:                        ou.Created,
+		IsDefault:                      ou.IsDefault,
+		IsScaleTierAuthorizedPurchaser: ou.IsScaleTierAuthorizedPurchaser,
+		IsScimManaged:                  ou.IsScimManaged,
+		IsServiceAccount:               ou.IsServiceAccount,
+	}
 }
 
 // UsersResponse represents the response from the list users API
 type UsersResponse struct {
-	Object  string `json:"object"`
-	Data    []User `json:"data"`
-	FirstID string `json:"first_id"`
-	LastID  string `json:"last_id"`
-	HasMore bool   `json:"has_more"`
+	Object  string             `json:"object"`
+	Data    []OrganizationUser `json:"data"`
+	FirstID string             `json:"first_id"`
+	LastID  string             `json:"last_id"`
+	HasMore bool               `json:"has_more"`
 }
 
 // ListUsers retrieves a list of users in the organization
@@ -660,12 +693,13 @@ func (c *OpenAIClient) FindUserByEmail(email string) (*User, bool, error) {
 		return nil, false, nil
 	}
 
-	// Return the first matching user
-	user := usersResponse.Data[0]
+	// Return the first matching user (convert from OrganizationUser to User)
+	orgUser := usersResponse.Data[0]
+	user := orgUser.ToUser()
 
 	// Double check that the email matches exactly (case insensitive)
 	if strings.EqualFold(user.Email, email) {
-		return &user, true, nil
+		return user, true, nil
 	}
 
 	// No exact match found
@@ -691,13 +725,14 @@ func (c *OpenAIClient) GetUser(userID string) (*User, bool, error) {
 		return nil, false, fmt.Errorf("error getting user: %w", err)
 	}
 
-	// Parse the response
-	var user User
-	if err := json.Unmarshal(respBody, &user); err != nil {
+	// Parse the response into OrganizationUser (new API format)
+	var orgUser OrganizationUser
+	if err := json.Unmarshal(respBody, &orgUser); err != nil {
 		return nil, false, fmt.Errorf("error decoding user response: %w", err)
 	}
 
-	return &user, true, nil
+	// Convert to flattened User struct
+	return orgUser.ToUser(), true, nil
 }
 
 // UpdateUserRole updates a user's role
@@ -719,13 +754,14 @@ func (c *OpenAIClient) UpdateUserRole(userID string, role string) (*User, error)
 		return nil, fmt.Errorf("error updating user role: %w", err)
 	}
 
-	// Parse the response
-	var user User
-	if err := json.Unmarshal(respBody, &user); err != nil {
+	// Parse the response into OrganizationUser (new API format)
+	var orgUser OrganizationUser
+	if err := json.Unmarshal(respBody, &orgUser); err != nil {
 		return nil, fmt.Errorf("error decoding user response: %w", err)
 	}
 
-	return &user, nil
+	// Convert to flattened User struct
+	return orgUser.ToUser(), nil
 }
 
 // DeleteUser removes a user from the organization
@@ -1075,25 +1111,15 @@ func (c *OpenAIClient) ListProjects(limit int, includeArchived bool, after strin
 	return &resp, nil
 }
 
-// CreateProject creates a new project with the given name and description
-func (c *OpenAIClient) CreateProject(name, description string, isDefault bool) (*Project, error) {
+// CreateProject creates a new project with the given title
+func (c *OpenAIClient) CreateProject(title string) (*Project, error) {
 	// Create the request body
 	requestBody := map[string]interface{}{
-		"name": name,
-	}
-
-	// Only include description if it's not empty
-	if description != "" {
-		requestBody["description"] = description
-	}
-
-	// Only include is_default if it's true (don't send false)
-	if isDefault {
-		requestBody["is_default"] = isDefault
+		"title": title,
 	}
 
 	// Debug information
-	fmt.Printf("Creating project with name: %s\n", name)
+	fmt.Printf("Creating project with title: %s\n", title)
 	fmt.Printf("Request body: %+v\n", requestBody)
 
 	// Use the exact endpoint from the curl command that works
@@ -1140,21 +1166,11 @@ func (c *OpenAIClient) GetProject(id string) (*Project, error) {
 	return &project, nil
 }
 
-// UpdateProject updates an existing project with the given details
-func (c *OpenAIClient) UpdateProject(id, name, description string, isDefault bool) (*Project, error) {
+// UpdateProject updates an existing project with the given title
+func (c *OpenAIClient) UpdateProject(id, title string) (*Project, error) {
 	// Create the request body
 	requestBody := map[string]interface{}{
-		"name": name,
-	}
-
-	// Only include description if it's not empty
-	if description != "" {
-		requestBody["description"] = description
-	}
-
-	// Only include is_default if it's true (don't send false)
-	if isDefault {
-		requestBody["is_default"] = isDefault
+		"title": title,
 	}
 
 	// Use the exact endpoint structure consistent with the curl command