Skip to content

update DataSourceData and ResourceData to client instance #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rtbenfield wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update DataSourceData and ResourceData to client instance #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions internal/provider/instance_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/diag"
"github.com/hashicorp/terraform-plugin-framework/types"

ukc "sdk.kraft.cloud"
"sdk.kraft.cloud/instances"
)

Expand Down Expand Up @@ -156,16 +157,16 @@ func (d *InstanceDataSource) Configure(ctx context.Context, req datasource.Confi
return
}

client, ok := req.ProviderData.(instances.InstancesService)
client, ok := req.ProviderData.(ukc.KraftCloud)
if !ok {
resp.Diagnostics.AddError(
"Unexpected Data Source Configure Type",
fmt.Sprintf("Expected instances.InstancesServices, got: %T. Please report this issue to the provider developers.", req.ProviderData),
fmt.Sprintf("Expected KraftCloud, got: %T. Please report this issue to the provider developers.", req.ProviderData),
)
return
}

d.client = client
d.client = client.Instances()
}

// Read implements datasource.DataSource.
Expand Down
7 changes: 4 additions & 3 deletions internal/provider/instance_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types"

ukc "sdk.kraft.cloud"
"sdk.kraft.cloud/instances"
"sdk.kraft.cloud/services"
)
Expand Down Expand Up @@ -240,16 +241,16 @@ func (r *InstanceResource) Configure(ctx context.Context, req resource.Configure
return
}

client, ok := req.ProviderData.(instances.InstancesService)
client, ok := req.ProviderData.(ukc.KraftCloud)
if !ok {
resp.Diagnostics.AddError(
"Unexpected Resource Configure Type",
fmt.Sprintf("Expected instances.InstancesServices, got: %T. Please report this issue to the provider developers.", req.ProviderData),
fmt.Sprintf("Expected KraftCloud, got: %T. Please report this issue to the provider developers.", req.ProviderData),
)
return
}

r.client = client
r.client = client.Instances()
}

// Create implements resource.Resource.
Expand Down
7 changes: 4 additions & 3 deletions internal/provider/instances_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types"

ukc "sdk.kraft.cloud"
"sdk.kraft.cloud/instances"
)

Expand Down Expand Up @@ -82,16 +83,16 @@ func (d *InstancesDataSource) Configure(ctx context.Context, req datasource.Conf
return
}

client, ok := req.ProviderData.(instances.InstancesService)
client, ok := req.ProviderData.(ukc.KraftCloud)
if !ok {
resp.Diagnostics.AddError(
"Unexpected Data Source Configure Type",
fmt.Sprintf("Expected instances.InstancesServices, got: %T. Please report this issue to the provider developers.", req.ProviderData),
fmt.Sprintf("Expected KraftCloud, got: %T. Please report this issue to the provider developers.", req.ProviderData),
)
return
}

d.client = client
d.client = client.Instances()
}

// Read implements datasource.DataSource.
Expand Down
12 changes: 6 additions & 6 deletions internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/types"

unikraftcloud "sdk.kraft.cloud"
ukc "sdk.kraft.cloud"
"sdk.kraft.cloud/client"
)

Expand Down Expand Up @@ -146,13 +146,13 @@ func (p *UnikraftCloudProvider) Configure(ctx context.Context, req provider.Conf
}

// Client configuration for data sources and resources
client := unikraftcloud.NewClient(
unikraftcloud.WithDefaultMetro(metro),
unikraftcloud.WithToken(token),
client := ukc.NewClient(
ukc.WithDefaultMetro(metro),
ukc.WithToken(token),
)

resp.DataSourceData = client.Instances()
resp.ResourceData = client.Instances()
resp.DataSourceData = client
resp.ResourceData = client
}

// Resources describes the provider data model.
Expand Down