chore: SDK API client improvements (#437)

castai · Jan 14, 2025 · e014225 · e014225
1 parent 0152881
commit e014225
Show file tree

Hide file tree

Showing 14 changed files with 4,101 additions and 47 deletions.
diff --git a/castai/cluster.go b/castai/cluster.go
@@ -112,7 +112,7 @@ func resourceCastaiClusterDelete(ctx context.Context, data *schema.ResourceData,
 	return nil
 }
 
-func fetchClusterData(ctx context.Context, client *sdk.ClientWithResponses, clusterID string) (*sdk.ExternalClusterAPIGetClusterResponse, error) {
+func fetchClusterData(ctx context.Context, client sdk.ClientWithResponsesInterface, clusterID string) (*sdk.ExternalClusterAPIGetClusterResponse, error) {
 	resp, err := client.ExternalClusterAPIGetClusterWithResponse(ctx, clusterID)
 	if err != nil {
 		return nil, err
@@ -140,7 +140,7 @@ func fetchClusterData(ctx context.Context, client *sdk.ClientWithResponses, clus
 // Caller is responsible to populate data and request parameters with all data.
 func resourceCastaiClusterUpdate(
 	ctx context.Context,
-	client *sdk.ClientWithResponses,
+	client sdk.ClientWithResponsesInterface,
 	data *schema.ResourceData,
 	request *sdk.ExternalClusterAPIUpdateClusterJSONRequestBody,
 ) error {
@@ -206,7 +206,7 @@ func resourceCastaiClusterUpdate(
 	return nil
 }
 
-func createClusterToken(ctx context.Context, client *sdk.ClientWithResponses, clusterID string) (string, error) {
+func createClusterToken(ctx context.Context, client sdk.ClientWithResponsesInterface, clusterID string) (string, error) {
 	resp, err := client.ExternalClusterAPICreateClusterTokenWithResponse(ctx, clusterID)
 	if err != nil {
 		return "", fmt.Errorf("creating cluster token: %w", err)

diff --git a/castai/provider.go b/castai/provider.go
@@ -13,7 +13,7 @@ import (
 )
 
 type ProviderConfig struct {
-	api *sdk.ClientWithResponses
+	api sdk.ClientWithResponsesInterface
 }
 
 func Provider(version string) *schema.Provider {

diff --git a/castai/resource_aks_cluster.go b/castai/resource_aks_cluster.go
@@ -193,7 +193,7 @@ func resourceCastaiAKSClusterUpdate(ctx context.Context, data *schema.ResourceDa
 	return resourceCastaiAKSClusterRead(ctx, data, meta)
 }
 
-func updateAKSClusterSettings(ctx context.Context, data *schema.ResourceData, client *sdk.ClientWithResponses) error {
+func updateAKSClusterSettings(ctx context.Context, data *schema.ResourceData, client sdk.ClientWithResponsesInterface) error {
 	if !data.HasChanges(
 		FieldAKSClusterClientID,
 		FieldAKSClusterClientSecret,

diff --git a/castai/resource_autoscaler.go b/castai/resource_autoscaler.go
@@ -553,7 +553,7 @@ func resourceCastaiAutoscalerUpdate(ctx context.Context, data *schema.ResourceDa
 	return nil
 }
 
-func getCurrentPolicies(ctx context.Context, client *sdk.ClientWithResponses, clusterId string) ([]byte, error) {
+func getCurrentPolicies(ctx context.Context, client sdk.ClientWithResponsesInterface, clusterId string) ([]byte, error) {
 	log.Printf("[INFO] Getting cluster autoscaler information.")
 
 	resp, err := client.PoliciesAPIGetClusterPolicies(ctx, clusterId)

diff --git a/castai/resource_eks_cluster.go b/castai/resource_eks_cluster.go
@@ -183,7 +183,7 @@ func resourceCastaiEKSClusterUpdate(ctx context.Context, data *schema.ResourceDa
 	return resourceCastaiEKSClusterRead(ctx, data, meta)
 }
 
-func updateClusterSettings(ctx context.Context, data *schema.ResourceData, client *sdk.ClientWithResponses) error {
+func updateClusterSettings(ctx context.Context, data *schema.ResourceData, client sdk.ClientWithResponsesInterface) error {
 	if !data.HasChanges(
 		FieldEKSClusterAssumeRoleArn,
 		FieldClusterCredentialsId,

diff --git a/castai/resource_gke_cluster.go b/castai/resource_gke_cluster.go
@@ -187,7 +187,7 @@ func resourceCastaiGKEClusterUpdate(ctx context.Context, data *schema.ResourceDa
 	return resourceCastaiGKEClusterRead(ctx, data, meta)
 }
 
-func updateGKEClusterSettings(ctx context.Context, data *schema.ResourceData, client *sdk.ClientWithResponses) error {
+func updateGKEClusterSettings(ctx context.Context, data *schema.ResourceData, client sdk.ClientWithResponsesInterface) error {
 	if !data.HasChanges(
 		FieldGKEClusterCredentials,
 		FieldClusterCredentialsId,

diff --git a/castai/resource_organization_group.go b/castai/resource_organization_group.go
@@ -222,7 +222,7 @@ func resourceOrganizationGroupDelete(ctx context.Context, data *schema.ResourceD
 	return nil
 }
 
-func getGroup(client *sdk.ClientWithResponses, ctx context.Context, organizationID, groupID string) (*sdk.CastaiRbacV1beta1Group, error) {
+func getGroup(client sdk.ClientWithResponsesInterface, ctx context.Context, organizationID, groupID string) (*sdk.CastaiRbacV1beta1Group, error) {
 	groupsResp, err := client.RbacServiceAPIGetGroupWithResponse(ctx, organizationID, groupID)
 	if err != nil {
 		return nil, fmt.Errorf("fetching group: %w", err)

diff --git a/castai/resource_rebalancing_job.go b/castai/resource_rebalancing_job.go
@@ -205,7 +205,7 @@ func rebalancingJobToState(job *sdk.ScheduledrebalancingV1RebalancingJob, d *sch
 	return nil
 }
 
-func getRebalancingJobByScheduleName(ctx context.Context, client *sdk.ClientWithResponses, clusterID string, scheduleName string) (*sdk.ScheduledrebalancingV1RebalancingJob, error) {
+func getRebalancingJobByScheduleName(ctx context.Context, client sdk.ClientWithResponsesInterface, clusterID string, scheduleName string) (*sdk.ScheduledrebalancingV1RebalancingJob, error) {
 	schedule, err := getRebalancingScheduleByName(ctx, client, scheduleName)
 	if err != nil {
 		return nil, fmt.Errorf("getting schedule: %w", err)
@@ -234,7 +234,7 @@ func getRebalancingJobByScheduleName(ctx context.Context, client *sdk.ClientWith
 	return nil, fmt.Errorf("rebalancing job for schedule %q was not found", scheduleName)
 }
 
-func getRebalancingJobById(ctx context.Context, client *sdk.ClientWithResponses, clusterID string, id string) (*sdk.ScheduledrebalancingV1RebalancingJob, bool, error) {
+func getRebalancingJobById(ctx context.Context, client sdk.ClientWithResponsesInterface, clusterID string, id string) (*sdk.ScheduledrebalancingV1RebalancingJob, bool, error) {
 	resp, err := client.ScheduledRebalancingAPIGetRebalancingJobWithResponse(ctx, clusterID, id)
 	if err != nil {
 		return nil, false, err
@@ -249,7 +249,7 @@ func getRebalancingJobById(ctx context.Context, client *sdk.ClientWithResponses,
 	return resp.JSON200, true, nil
 }
 
-func getRebalancingJobByScheduleId(ctx context.Context, client *sdk.ClientWithResponses, clusterID, scheduleID string) (*sdk.ScheduledrebalancingV1RebalancingJob, bool, error) {
+func getRebalancingJobByScheduleId(ctx context.Context, client sdk.ClientWithResponsesInterface, clusterID, scheduleID string) (*sdk.ScheduledrebalancingV1RebalancingJob, bool, error) {
 	params := &sdk.ScheduledRebalancingAPIListRebalancingJobsParams{
 		RebalancingScheduleId: lo.ToPtr(scheduleID),
 	}

diff --git a/castai/resource_rebalancing_schedule.go b/castai/resource_rebalancing_schedule.go
@@ -409,7 +409,7 @@ func nullifySelectorRequirements(requirements *[]sdk.ScheduledrebalancingV1NodeS
 	}
 }
 
-func getRebalancingScheduleByName(ctx context.Context, client *sdk.ClientWithResponses, name string) (*sdk.ScheduledrebalancingV1RebalancingSchedule, error) {
+func getRebalancingScheduleByName(ctx context.Context, client sdk.ClientWithResponsesInterface, name string) (*sdk.ScheduledrebalancingV1RebalancingSchedule, error) {
 	resp, err := client.ScheduledRebalancingAPIListRebalancingSchedulesWithResponse(ctx)
 	if checkErr := sdk.CheckOKResponse(resp, err); checkErr != nil {
 		return nil, checkErr
@@ -424,7 +424,7 @@ func getRebalancingScheduleByName(ctx context.Context, client *sdk.ClientWithRes
 	return nil, fmt.Errorf("rebalancing schedule %q was not found", name)
 }
 
-func getRebalancingScheduleById(ctx context.Context, client *sdk.ClientWithResponses, id string) (*sdk.ScheduledrebalancingV1RebalancingSchedule, error) {
+func getRebalancingScheduleById(ctx context.Context, client sdk.ClientWithResponsesInterface, id string) (*sdk.ScheduledrebalancingV1RebalancingSchedule, error) {
 	resp, err := client.ScheduledRebalancingAPIGetRebalancingScheduleWithResponse(ctx, id)
 	if err != nil {
 		return nil, err

diff --git a/castai/resource_role_bindings.go b/castai/resource_role_bindings.go
@@ -290,7 +290,7 @@ func resourceRoleBindingsDelete(ctx context.Context, data *schema.ResourceData,
 	return nil
 }
 
-func getRoleBinding(client *sdk.ClientWithResponses, ctx context.Context, organizationID, roleBindingID string) (*sdk.CastaiRbacV1beta1RoleBinding, error) {
+func getRoleBinding(client sdk.ClientWithResponsesInterface, ctx context.Context, organizationID, roleBindingID string) (*sdk.CastaiRbacV1beta1RoleBinding, error) {
 	resp, err := client.RbacServiceAPIGetRoleBindingWithResponse(ctx, organizationID, roleBindingID)
 	if err != nil {
 		return nil, fmt.Errorf("fetching role binding: %w", err)

diff --git a/castai/sdk/api.gen.go b/castai/sdk/api.gen.go
diff --git a/castai/sdk/client.gen.go b/castai/sdk/client.gen.go
diff --git a/castai/sdk/codegen/templates/client-with-responses.tmpl b/castai/sdk/codegen/templates/client-with-responses.tmpl
@@ -27,6 +27,7 @@ func WithBaseURL(baseURL string) ClientOption {
 
 // ClientWithResponsesInterface is the interface specification for the client with responses above.
 type ClientWithResponsesInterface interface {
+    ClientInterface
 {{range . -}}
 {{$hasParams := .RequiresParamObject -}}
 {{$pathParams := .PathParams -}}