Skip to content

Commit

Permalink
Revert "make tf.string into go string"
Browse files Browse the repository at this point in the history
This reverts commit 77c25f3.
  • Loading branch information
JensWalter committed Sep 9, 2024
1 parent 77c25f3 commit f8a7fa4
Showing 1 changed file with 29 additions and 28 deletions.
57 changes: 29 additions & 28 deletions internal/provider/containers_job_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-log/tflog"
)

Expand All @@ -22,15 +23,15 @@ func newContainersJobResource() resource.Resource {
}

type containersJobResource struct {
Id string `tfsdk:"id" json:"id"`
Name string `tfsdk:"name" json:"name"`
ContainerImage string `tfsdk:"container_image" json:"containerImage"`
ContainerPullUser string `tfsdk:"container_pull_user" json:"containerPullUser"`
ContainerPullPwd string `tfsdk:"container_pull_pwd" json:"containerPullPwd"`
ScheduleType string `tfsdk:"schedule_type" json:"scheduleType"`
ScheduleRepeat string `tfsdk:"schedule_repeat" json:"scheduleRepeat"`
ScheduleCron string `tfsdk:"schedule_cron" json:"scheduleCron"`
ScheduleCostOptimzation string `tfsdk:"schedule_cost_optimization" json:"scheduleCostOptimzation"`
Id types.String `tfsdk:"id" json:"id"`
Name types.String `tfsdk:"name" json:"name"`
ContainerImage types.String `tfsdk:"container_image" json:"containerImage"`
ContainerPullUser types.String `tfsdk:"container_pull_user" json:"containerPullUser"`
ContainerPullPwd types.String `tfsdk:"container_pull_pwd" json:"containerPullPwd"`
ScheduleType types.String `tfsdk:"schedule_type" json:"scheduleType"`
ScheduleRepeat types.String `tfsdk:"schedule_repeat" json:"scheduleRepeat"`
ScheduleCron types.String `tfsdk:"schedule_cron" json:"scheduleCron"`
ScheduleCostOptimzation types.String `tfsdk:"schedule_cost_optimization" json:"scheduleCostOptimzation"`
api_key string
}

Expand Down Expand Up @@ -93,14 +94,14 @@ func (d *containersJobResource) Create(ctx context.Context, req resource.CreateR
}

createJob := createJobRequest{
Name: plan.Name,
ContainerImage: plan.ContainerImage,
ContainerPullUser: plan.ContainerPullUser,
ContainerPullPwd: plan.ContainerPullPwd,
ScheduleType: plan.ScheduleType,
ScheduleCron: plan.ScheduleCron,
ScheduleCostOptimzation: plan.ScheduleCostOptimzation,
ScheduleRepeat: plan.ScheduleRepeat,
Name: plan.Name.ValueString(),
ContainerImage: plan.ContainerImage.ValueString(),
ContainerPullUser: plan.ContainerPullUser.ValueString(),
ContainerPullPwd: plan.ContainerPullPwd.ValueString(),
ScheduleType: plan.ScheduleType.ValueString(),
ScheduleCron: plan.ScheduleCron.ValueString(),
ScheduleCostOptimzation: plan.ScheduleCostOptimzation.ValueString(),
ScheduleRepeat: plan.ScheduleRepeat.ValueString(),
}

body, err := json.Marshal(createJob)
Expand Down Expand Up @@ -166,7 +167,7 @@ func (d *containersJobResource) Read(ctx context.Context, req resource.ReadReque
return
}

url := fmt.Sprintf("https://containers.dtz.rocks/api/2021-02-21/job/%s", state.Id)
url := fmt.Sprintf("https://containers.dtz.rocks/api/2021-02-21/job/%s", state.Id.ValueString())
request, err := http.NewRequest(http.MethodGet, url, nil)
if err != nil {
resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create request, got error: %s", err))
Expand Down Expand Up @@ -221,14 +222,14 @@ func (d *containersJobResource) Update(ctx context.Context, req resource.UpdateR
}

updateJob := createJobRequest{
Name: plan.Name,
ContainerImage: plan.ContainerImage,
ContainerPullUser: plan.ContainerPullUser,
ContainerPullPwd: plan.ContainerPullPwd,
ScheduleType: plan.ScheduleType,
ScheduleCron: plan.ScheduleCron,
ScheduleCostOptimzation: plan.ScheduleCostOptimzation,
ScheduleRepeat: plan.ScheduleRepeat,
Name: plan.Name.ValueString(),
ContainerImage: plan.ContainerImage.ValueString(),
ContainerPullUser: plan.ContainerPullUser.ValueString(),
ContainerPullPwd: plan.ContainerPullPwd.ValueString(),
ScheduleType: plan.ScheduleType.ValueString(),
ScheduleCron: plan.ScheduleCron.ValueString(),
ScheduleCostOptimzation: plan.ScheduleCostOptimzation.ValueString(),
ScheduleRepeat: plan.ScheduleRepeat.ValueString(),
}

body, err := json.Marshal(updateJob)
Expand All @@ -237,7 +238,7 @@ func (d *containersJobResource) Update(ctx context.Context, req resource.UpdateR
return
}

url := fmt.Sprintf("https://containers.dtz.rocks/api/2021-02-21/job/%s", plan.Id)
url := fmt.Sprintf("https://containers.dtz.rocks/api/2021-02-21/job/%s", plan.Id.ValueString())
httpReq, err := http.NewRequest(http.MethodPost, url, strings.NewReader(string(body)))
if err != nil {
resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create request, got error: %s", err))
Expand Down Expand Up @@ -293,7 +294,7 @@ func (d *containersJobResource) Delete(ctx context.Context, req resource.DeleteR
return
}

url := fmt.Sprintf("https://containers.dtz.rocks/api/2021-02-21/job/%s", state.Id)
url := fmt.Sprintf("https://containers.dtz.rocks/api/2021-02-21/job/%s", state.Id.ValueString())
request, err := http.NewRequest(http.MethodDelete, url, nil)
if err != nil {
resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create request, got error: %s", err))
Expand Down

0 comments on commit f8a7fa4

Please sign in to comment.