fix: extra org fields

Author: jianyuan

docs/data-sources/organization.md

@@ -34,4 +34,5 @@ data "openai_organization" "example" {
 
 - `description` (String) Description of the organization.
 - `is_default` (Boolean) Whether this organization is the default organization for the user.
-- `name` (String) Human-friendly label for your organization, shown in user interfaces.
+- `name` (String) Internal label for your organization.
+- `title` (String) Human-friendly label for your organization, shown in user interfaces.

docs/data-sources/organizations.md

@@ -32,4 +32,5 @@ Read-Only:
 - `description` (String) Description of the organization.
 - `id` (String) Organization ID used in API requests.
 - `is_default` (Boolean) Whether this organization is the default organization for the user.
-- `name` (String) Human-friendly label for your organization, shown in user interfaces.
+- `name` (String) Internal label for your organization.
+- `title` (String) Human-friendly label for your organization, shown in user interfaces.

internal/provider/data_source_organization.go

@@ -23,15 +23,17 @@ type OrganizationDataSource struct {
 
 type OrganizationDataSourceModel struct {
 	Id          types.String `tfsdk:"id"`
-	Name        types.String `tfsdk:"name"`
 	IsDefault   types.Bool   `tfsdk:"is_default"`
+	Name        types.String `tfsdk:"name"`
+	Title       types.String `tfsdk:"title"`
 	Description types.String `tfsdk:"description"`
 }
 
 func (m *OrganizationDataSourceModel) Fill(organization apiclient.Organization) error {
 	m.Id = types.StringValue(organization.Id)
-	m.Name = types.StringValue(organization.Title)
 	m.IsDefault = types.BoolValue(organization.IsDefault)
+	m.Name = types.StringValue(organization.Name)
+	m.Title = types.StringValue(organization.Title)
 	m.Description = types.StringValue(organization.Description)
 	return nil
 }
@@ -49,12 +51,16 @@ func (d *OrganizationDataSource) Schema(ctx context.Context, req datasource.Sche
 				MarkdownDescription: "The unique identifier for the organization. If omitted, the default organization is used.",
 				Optional:            true,
 			},
+			"is_default": schema.BoolAttribute{
+				MarkdownDescription: "Whether this organization is the default organization for the user.",
+				Computed:            true,
+			},
 			"name": schema.StringAttribute{
-				MarkdownDescription: "Human-friendly label for your organization, shown in user interfaces.",
+				MarkdownDescription: "Internal label for your organization.",
 				Computed:            true,
 			},
-			"is_default": schema.BoolAttribute{
-				MarkdownDescription: "Whether this organization is the default organization for the user.",
+			"title": schema.StringAttribute{
+				MarkdownDescription: "Human-friendly label for your organization, shown in user interfaces.",
 				Computed:            true,
 			},
 			"description": schema.StringAttribute{

internal/provider/data_source_organization_test.go

@@ -22,8 +22,9 @@ func TestAccOrganizationDataSource(t *testing.T) {
 				Config: testAccOrganizationDataSourceConfig,
 				ConfigStateChecks: []statecheck.StateCheck{
 					statecheck.ExpectKnownValue(rn, tfjsonpath.New("id"), knownvalue.StringExact(acctest.TestOrganizationId)),
-					statecheck.ExpectKnownValue(rn, tfjsonpath.New("name"), knownvalue.NotNull()),
 					statecheck.ExpectKnownValue(rn, tfjsonpath.New("is_default"), knownvalue.Bool(true)),
+					statecheck.ExpectKnownValue(rn, tfjsonpath.New("name"), knownvalue.NotNull()),
+					statecheck.ExpectKnownValue(rn, tfjsonpath.New("title"), knownvalue.NotNull()),
 					statecheck.ExpectKnownValue(rn, tfjsonpath.New("description"), knownvalue.NotNull()),
 				},
 			},
@@ -42,8 +43,9 @@ func TestAccOrganizationDataSource_default(t *testing.T) {
 				Config: testAccOrganizationDataSourceConfig_default,
 				ConfigStateChecks: []statecheck.StateCheck{
 					statecheck.ExpectKnownValue(rn, tfjsonpath.New("id"), knownvalue.NotNull()),
-					statecheck.ExpectKnownValue(rn, tfjsonpath.New("name"), knownvalue.NotNull()),
 					statecheck.ExpectKnownValue(rn, tfjsonpath.New("is_default"), knownvalue.Bool(true)),
+					statecheck.ExpectKnownValue(rn, tfjsonpath.New("name"), knownvalue.NotNull()),
+					statecheck.ExpectKnownValue(rn, tfjsonpath.New("title"), knownvalue.NotNull()),
 					statecheck.ExpectKnownValue(rn, tfjsonpath.New("description"), knownvalue.NotNull()),
 				},
 			},

internal/provider/data_source_organizations.go

@@ -16,12 +16,10 @@ func NewOrganizationsDataSource() datasource.DataSource {
 	return &OrganizationsDataSource{}
 }
 
-// OrganizationsDataSource defines the data source implementation.
 type OrganizationsDataSource struct {
 	baseDataSource
 }
 
-// OrganizationsDataSourceModel describes the data source data model.
 type OrganizationsDataSourceModel struct {
 	Organizations []OrganizationDataSourceModel `tfsdk:"organizations"`
 }
@@ -54,12 +52,16 @@ func (d *OrganizationsDataSource) Schema(ctx context.Context, req datasource.Sch
 							MarkdownDescription: "Organization ID used in API requests.",
 							Computed:            true,
 						},
+						"is_default": schema.BoolAttribute{
+							MarkdownDescription: "Whether this organization is the default organization for the user.",
+							Computed:            true,
+						},
 						"name": schema.StringAttribute{
-							MarkdownDescription: "Human-friendly label for your organization, shown in user interfaces.",
+							MarkdownDescription: "Internal label for your organization.",
 							Computed:            true,
 						},
-						"is_default": schema.BoolAttribute{
-							MarkdownDescription: "Whether this organization is the default organization for the user.",
+						"title": schema.StringAttribute{
+							MarkdownDescription: "Human-friendly label for your organization, shown in user interfaces.",
 							Computed:            true,
 						},
 						"description": schema.StringAttribute{

internal/provider/data_source_organizations_test.go

@@ -23,8 +23,9 @@ func TestAccOrganizationsDataSource(t *testing.T) {
 					statecheck.ExpectKnownValue(rn, tfjsonpath.New("organizations"), knownvalue.SetPartial([]knownvalue.Check{
 						knownvalue.ObjectExact(map[string]knownvalue.Check{
 							"id":          knownvalue.StringExact(acctest.TestOrganizationId),
-							"name":        knownvalue.NotNull(),
 							"is_default":  knownvalue.Bool(true),
+							"name":        knownvalue.NotNull(),
+							"title":       knownvalue.NotNull(),
 							"description": knownvalue.NotNull(),
 						}),
 					})),