feat: replacing internal/sdk with generated client

README.md

@@ -51,10 +51,14 @@ provider "influxdb3" {
   account_id = "*******"
   cluster_id = "*******"
   token      = "*******"
-  url        = "https://console.influxdata.com"
+  url        = "https://console.influxdata.com/api/v0"
 }
 ```
 
+## Supported InfluxDB flavours
+
+* InfluxDB Cloud Dedicated
+
 ## Available functionalities
 
 ### Data Sources

docs/data-sources/database.md

@@ -17,21 +17,12 @@ Retrieves a database. Use this data source to retrieve information for a specifi
 
 ### Required
 
-- `name` (String) The name of the cluster database. The Length should be between `[ 1 .. 64 ]` characters.
+- `name` (String) The name of the cluster database.
 
 ### Read-Only
 
 - `account_id` (String) The ID of the account that the cluster belongs to.
 - `cluster_id` (String) The ID of the cluster that you want to manage.
-- `max_columns_per_table` (Number) The maximum number of columns per table for the cluster database. The default is `200`
-- `max_tables` (Number) The maximum number of tables for the cluster database. The default is `500`
-- `partition_template` (Attributes List) A [template](https://docs.influxdata.com/influxdb/cloud-dedicated/admin/custom-partitions/partition-templates/) for partitioning a cluster database. (see [below for nested schema](#nestedatt--partition_template))
-- `retention_period` (Number) The retention period of the cluster database in nanoseconds. The default is `0`. If the retention period is not set or is set to `0`, the database will have infinite retention.
-
-<a id="nestedatt--partition_template"></a>
-### Nested Schema for `partition_template`
-
-Read-Only:
-
-- `type` (String) The type of the template part.
-- `value` (String) The value of the template part.
+- `max_columns_per_table` (Number) The maximum number of columns per table for the cluster database.
+- `max_tables` (Number) The maximum number of tables for the cluster database.
+- `retention_period` (Number) The retention period of the cluster database in nanoseconds.

docs/data-sources/databases.md

@@ -26,16 +26,7 @@ Read-Only:
 
 - `account_id` (String) The ID of the account that the cluster belongs to.
 - `cluster_id` (String) The ID of the cluster that you want to manage.
-- `max_columns_per_table` (Number) The maximum number of columns per table for the cluster database. The default is `200`
-- `max_tables` (Number) The maximum number of tables for the cluster database. The default is `500`
-- `name` (String) The name of the cluster database. The Length should be between `[ 1 .. 64 ]` characters.
-- `partition_template` (Attributes List) A [template](https://docs.influxdata.com/influxdb/cloud-dedicated/admin/custom-partitions/partition-templates/) for partitioning a cluster database. (see [below for nested schema](#nestedatt--databases--partition_template))
-- `retention_period` (Number) The retention period of the cluster database in nanoseconds. The default is `0`. If the retention period is not set or is set to `0`, the database will have infinite retention.
-
-<a id="nestedatt--databases--partition_template"></a>
-### Nested Schema for `databases.partition_template`
-
-Read-Only:
-
-- `type` (String) The type of the template part.
-- `value` (String) The value of the template part.
+- `max_columns_per_table` (Number) The maximum number of columns per table for the cluster database.
+- `max_tables` (Number) The maximum number of tables for the cluster database.
+- `name` (String) The name of the cluster database.
+- `retention_period` (Number) The retention period of the cluster database in nanoseconds.

docs/data-sources/token.md

@@ -33,5 +33,5 @@ Gets a database token. Use this data source to retrieve information about a data
 
 Read-Only:
 
-- `action` (String) The action the database token permission allows. Valid values are `read` or `write`.
+- `action` (String) The action the database token permission allows.
 - `resource` (String) The resource the database token permission applies to. `*` refers to all databases.

docs/data-sources/tokens.md

@@ -22,23 +22,20 @@ Gets all database tokens for a cluster.
 <a id="nestedatt--tokens"></a>
 ### Nested Schema for `tokens`
 
-Required:
-
-- `id` (String) The ID of the database token.
-
 Read-Only:
 
 - `access_token` (String, Sensitive) The access token that can be used to authenticate query and write requests to the cluster. The access token is never stored by InfluxDB and is only returned once when the token is created. If the access token is lost, a new token must be created.
 - `account_id` (String) The ID of the account that the database token belongs to.
 - `cluster_id` (String) The ID of the cluster that the database token belongs to.
 - `created_at` (String) The date and time that the database token was created. Uses RFC3339 format.
 - `description` (String) The description of the database token.
+- `id` (String) The ID of the database token.
 - `permissions` (Attributes List) The list of permissions the database token allows. (see [below for nested schema](#nestedatt--tokens--permissions))
 
 <a id="nestedatt--tokens--permissions"></a>
 ### Nested Schema for `tokens.permissions`
 
 Read-Only:
 
-- `action` (String) The action the database token permission allows. Valid values are `read` or `write`.
+- `action` (String) The action the database token permission allows.
 - `resource` (String) The resource the database token permission applies to. `*` refers to all databases.

docs/index.md

@@ -34,7 +34,7 @@ Credentials can be provided by using the `INFLUXDB3_ACCOUNT_ID` and `INFLUXDB3_C
 export INFLUXDB3_ACCOUNT_ID="*******"
 export INFLUXDB3_CLUSTER_ID="*******"
 export INFLUXDB3_TOKEN="*******"
-export INFLUXDB3_URL="https://console.influxdata.com"
+export INFLUXDB3_URL="https://console.influxdata.com/api/v0"
 
 provider "influxdb3" {}
 
@@ -49,4 +49,4 @@ terraform plan
 - `account_id` (String, Sensitive) The ID of the account that the cluster belongs to
 - `cluster_id` (String, Sensitive) The ID of the cluster that you want to manage
 - `token` (String, Sensitive) The InfluxDB management token
-- `url` (String) The InfluxDB Cloud Dedicated URL
+- `url` (String) The InfluxDB Cloud Dedicated Management API URL

docs/resources/database.md

@@ -23,18 +23,9 @@ Creates and manages a database.
 
 - `max_columns_per_table` (Number) The maximum number of columns per table for the cluster database. The default is `200`
 - `max_tables` (Number) The maximum number of tables for the cluster database. The default is `500`
-- `partition_template` (Attributes List) A [template](https://docs.influxdata.com/influxdb/cloud-dedicated/admin/custom-partitions/partition-templates/) for partitioning a cluster database. API does not support updating partition template, so updating this will force resource replacement. (see [below for nested schema](#nestedatt--partition_template))
 - `retention_period` (Number) The retention period of the cluster database in nanoseconds. The default is `0`. If the retention period is not set or is set to `0`, the database will have infinite retention.
 
 ### Read-Only
 
 - `account_id` (String) The ID of the account that the cluster belongs to.
 - `cluster_id` (String) The ID of the cluster that you want to manage.
-
-<a id="nestedatt--partition_template"></a>
-### Nested Schema for `partition_template`
-
-Required:
-
-- `type` (String) The type of the template part.
-- `value` (String) The value of the template part.

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

@@ -9,5 +9,6 @@ terraform {
 data "influxdb3_tokens" "all" {}
 
 output "all_tokens" {
-  value = data.influxdb3_tokens.all.tokens[*].id
+  value     = data.influxdb3_tokens.all.tokens
+  sensitive = true
 }

examples/resources/database/resource.tf

@@ -11,12 +11,6 @@ provider "influxdb3" {}
 resource "influxdb3_database" "signals" {
   name             = "signals"
   retention_period = 604800
-  partition_template = [
-    {
-      type  = "time"
-      value = "%M"
-    }
-  ]
 }
 
 output "signals_database" {

go.mod

@@ -1,14 +1,16 @@
 module github.com/komminarlabs/terraform-provider-influxdb3
 
-go 1.22
+go 1.22.2
 
 require (
+	github.com/google/uuid v1.6.0
 	github.com/hashicorp/terraform-plugin-docs v0.19.4
 	github.com/hashicorp/terraform-plugin-framework v1.9.0
 	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
 	github.com/hashicorp/terraform-plugin-go v0.23.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-testing v1.8.0
+	github.com/komminarlabs/influxdb3 v0.1.0
 )
 
 require (
@@ -19,6 +21,7 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
@@ -27,7 +30,6 @@ require (
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/cli v1.1.6 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -57,11 +59,11 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/oapi-codegen/runtime v1.1.1 // indirect
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect

go.sum

@@ -14,15 +14,19 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
 github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
@@ -126,8 +130,11 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOl
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/komminarlabs/influxdb3 v0.1.0 h1:C/Ka8mzYABMXZIAjvZYw+ZXlk0jo6u9shJ7vPgKoseo=
+github.com/komminarlabs/influxdb3 v0.1.0/go.mod h1:yEFMuSRwwd1/nO9tKtc1HapjEm5h1Ac/3+or3ckkURE=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -158,6 +165,8 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro=
+github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
@@ -178,8 +187,10 @@ github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=

internal/provider/database_data_source.go

@@ -4,12 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
-	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
-	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/komminarlabs/terraform-provider-influxdb3/internal/sdk/influxdb3"
+	"github.com/komminarlabs/influxdb3"
 )
 
 // Ensure the implementation satisfies the expected interfaces.
@@ -25,7 +22,9 @@ func NewDatabaseDataSource() datasource.DataSource {
 
 // DatabasesDataSource is the data source implementation.
 type DatabaseDataSource struct {
-	client influxdb3.Client
+	accountID influxdb3.UuidV4
+	client    influxdb3.ClientWithResponses
+	clusterID influxdb3.UuidV4
 }
 
 // Metadata returns the data source type name.
@@ -50,38 +49,19 @@ func (d *DatabaseDataSource) Schema(ctx context.Context, req datasource.SchemaRe
 			},
 			"name": schema.StringAttribute{
 				Required:    true,
-				Description: "The name of the cluster database. The Length should be between `[ 1 .. 64 ]` characters.",
-				Validators: []validator.String{
-					stringvalidator.LengthBetween(1, 64),
-				},
+				Description: "The name of the cluster database.",
 			},
 			"max_tables": schema.Int64Attribute{
 				Computed:    true,
-				Description: "The maximum number of tables for the cluster database. The default is `500`",
+				Description: "The maximum number of tables for the cluster database.",
 			},
 			"max_columns_per_table": schema.Int64Attribute{
 				Computed:    true,
-				Description: "The maximum number of columns per table for the cluster database. The default is `200`",
+				Description: "The maximum number of columns per table for the cluster database.",
 			},
 			"retention_period": schema.Int64Attribute{
 				Computed:    true,
-				Description: "The retention period of the cluster database in nanoseconds. The default is `0`. If the retention period is not set or is set to `0`, the database will have infinite retention.",
-			},
-			"partition_template": schema.ListNestedAttribute{
-				Computed:            true,
-				MarkdownDescription: "A [template](https://docs.influxdata.com/influxdb/cloud-dedicated/admin/custom-partitions/partition-templates/) for partitioning a cluster database.",
-				NestedObject: schema.NestedAttributeObject{
-					Attributes: map[string]schema.Attribute{
-						"type": schema.StringAttribute{
-							Computed:    true,
-							Description: "The type of the template part.",
-						},
-						"value": schema.StringAttribute{
-							Computed:    true,
-							Description: "The value of the template part.",
-						},
-					},
-				},
+				Description: "The retention period of the cluster database in nanoseconds.",
 			},
 		},
 	}
@@ -94,15 +74,18 @@ func (d *DatabaseDataSource) Configure(ctx context.Context, req datasource.Confi
 		return
 	}
 
-	client, ok := req.ProviderData.(influxdb3.Client)
+	pd, ok := req.ProviderData.(providerData)
 	if !ok {
 		resp.Diagnostics.AddError(
 			"Unexpected Data Source Configure Type",
-			fmt.Sprintf("Expected influxdb3.Client, got: %T. Please report this issue to the provider developers.", req.ProviderData),
+			fmt.Sprintf("Expected influxdb3.ClientWithResponses, got: %T. Please report this issue to the provider developers.", req.ProviderData),
 		)
 		return
 	}
-	d.client = client
+
+	d.accountID = pd.accountID
+	d.client = pd.client
+	d.clusterID = pd.clusterID
 }
 
 // Read refreshes the Terraform state with the latest data.
@@ -123,23 +106,35 @@ func (d *DatabaseDataSource) Read(ctx context.Context, req datasource.ReadReques
 		return
 	}
 
-	readDatabase, err := d.client.DatabaseAPI().GetDatabaseByName(ctx, databaseName.ValueString())
+	readDatabasesResponse, err := d.client.GetClusterDatabasesWithResponse(ctx, d.accountID, d.clusterID)
 	if err != nil {
 		resp.Diagnostics.AddError(
-			"Database not found",
+			"Error getting database",
 			err.Error(),
 		)
 		return
 	}
 
+	if readDatabasesResponse.StatusCode() != 200 {
+		resp.Diagnostics.AddError(
+			"Error getting database",
+			fmt.Sprintf("Status: %s", readDatabasesResponse.Status()),
+		)
+		return
+	}
+
+	// Check if the database exists
+	readDatabase := getDatabaseByName(*readDatabasesResponse, databaseName.ValueString())
+	if readDatabase == nil {
+		resp.Diagnostics.AddError(
+			"Database not found",
+			fmt.Sprintf("Database with name %s not found", databaseName.ValueString()),
+		)
+		return
+	}
+
 	// Map response body to model
-	state.AccountId = types.StringValue(readDatabase.AccountId)
-	state.ClusterId = types.StringValue(readDatabase.ClusterId)
-	state.Name = types.StringValue(readDatabase.Name)
-	state.MaxTables = types.Int64Value(readDatabase.MaxTables)
-	state.MaxColumnsPerTable = types.Int64Value(readDatabase.MaxColumnsPerTable)
-	state.RetentionPeriod = types.Int64Value(readDatabase.RetentionPeriod)
-	state.PartitionTemplate = getPartitionTemplate(readDatabase.PartitionTemplate)
+	state = *readDatabase
 
 	// Set state
 	diags := resp.State.Set(ctx, &state)