Lint

tobio · Jun 27, 2024 · b0b4990 · b0b4990
1 parent 0d8339b
commit b0b4990
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 77 deletions.
diff --git a/ec/ecresource/projectresource/create.go b/ec/ecresource/projectresource/create.go
@@ -29,7 +29,7 @@ func (r *Resource[T]) Create(ctx context.Context, request resource.CreateRequest
 		return
 	}
 
-	model, diags := r.modelReader.readFrom(ctx, request.Plan)
+	model, diags := r.modelHandler.ReadFrom(ctx, request.Plan)
 	response.Diagnostics.Append(diags...)
 	if response.Diagnostics.HasError() {
 		return
@@ -40,7 +40,7 @@ func (r *Resource[T]) Create(ctx context.Context, request resource.CreateRequest
 		return
 	}
 
-	createdModel, diags := r.api.create(ctx, *model)
+	createdModel, diags := r.api.Create(ctx, *model)
 	response.Diagnostics.Append(diags...)
 	if response.Diagnostics.HasError() {
 		return
@@ -51,12 +51,12 @@ func (r *Resource[T]) Create(ctx context.Context, request resource.CreateRequest
 		return
 	}
 
-	response.Diagnostics.Append(r.api.ensureInitialised(ctx, createdModel)...)
+	response.Diagnostics.Append(r.api.EnsureInitialised(ctx, createdModel)...)
 	if response.Diagnostics.HasError() {
 		return
 	}
 
-	found, createdModel, diags := r.api.read(ctx, r.modelReader.getID(createdModel), createdModel)
+	found, createdModel, diags := r.api.Read(ctx, r.modelHandler.GetID(createdModel), createdModel)
 	response.Diagnostics.Append(diags...)
 
 	if !found {

diff --git a/ec/ecresource/projectresource/delete.go b/ec/ecresource/projectresource/delete.go
@@ -28,13 +28,13 @@ func (r *Resource[T]) Delete(ctx context.Context, request resource.DeleteRequest
 		return
 	}
 
-	model, diags := r.modelReader.readFrom(ctx, request.State)
+	model, diags := r.modelHandler.ReadFrom(ctx, request.State)
 	response.Diagnostics.Append(diags...)
 	if response.Diagnostics.HasError() {
 		return
 	}
 
-	response.Diagnostics.Append(r.api.delete(ctx, *model)...)
+	response.Diagnostics.Append(r.api.Delete(ctx, *model)...)
 	if response.Diagnostics.HasError() {
 		return
 	}

diff --git a/ec/ecresource/projectresource/elasticsearch.go b/ec/ecresource/projectresource/elasticsearch.go
@@ -32,26 +32,26 @@ import (
 
 func NewElasticsearchProjectResource() *Resource[resource_elasticsearch_project.ElasticsearchProjectModel] {
 	return &Resource[resource_elasticsearch_project.ElasticsearchProjectModel]{
-		modelReader: elasticsearchModelReader{},
-		api:         elasticsearchApi{},
-		name:        "elasticsearch",
+		modelHandler: elasticsearchModelReader{},
+		api:          elasticsearchApi{},
+		name:         "elasticsearch",
 	}
 }
 
 type elasticsearchModelReader struct{}
 
-func (es elasticsearchModelReader) readFrom(ctx context.Context, getter modelGetter) (*resource_elasticsearch_project.ElasticsearchProjectModel, diag.Diagnostics) {
+func (es elasticsearchModelReader) ReadFrom(ctx context.Context, getter modelGetter) (*resource_elasticsearch_project.ElasticsearchProjectModel, diag.Diagnostics) {
 	var model resource_elasticsearch_project.ElasticsearchProjectModel
 	diags := getter.Get(ctx, &model)
 
 	return &model, diags
 }
 
-func (es elasticsearchModelReader) getID(model resource_elasticsearch_project.ElasticsearchProjectModel) string {
+func (es elasticsearchModelReader) GetID(model resource_elasticsearch_project.ElasticsearchProjectModel) string {
 	return model.Id.ValueString()
 }
 
-func (es elasticsearchModelReader) modify(plan resource_elasticsearch_project.ElasticsearchProjectModel, state resource_elasticsearch_project.ElasticsearchProjectModel, cfg resource_elasticsearch_project.ElasticsearchProjectModel) resource_elasticsearch_project.ElasticsearchProjectModel {
+func (es elasticsearchModelReader) Modify(plan resource_elasticsearch_project.ElasticsearchProjectModel, state resource_elasticsearch_project.ElasticsearchProjectModel, cfg resource_elasticsearch_project.ElasticsearchProjectModel) resource_elasticsearch_project.ElasticsearchProjectModel {
 	plan.Credentials = useStateForUnknown(plan.Credentials, state.Credentials)
 	plan.Endpoints = useStateForUnknown(plan.Endpoints, state.Endpoints)
 	plan.Metadata = useStateForUnknown(plan.Metadata, state.Metadata)
@@ -83,16 +83,16 @@ type elasticsearchApi struct {
 	client serverless.ClientWithResponsesInterface
 }
 
-func (es elasticsearchApi) ready() bool {
+func (es elasticsearchApi) Ready() bool {
 	return es.client != nil
 }
 
-func (es elasticsearchApi) withClient(client serverless.ClientWithResponsesInterface) api[resource_elasticsearch_project.ElasticsearchProjectModel] {
+func (es elasticsearchApi) WithClient(client serverless.ClientWithResponsesInterface) api[resource_elasticsearch_project.ElasticsearchProjectModel] {
 	es.client = client
 	return es
 }
 
-func (es elasticsearchApi) create(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) (resource_elasticsearch_project.ElasticsearchProjectModel, diag.Diagnostics) {
+func (es elasticsearchApi) Create(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) (resource_elasticsearch_project.ElasticsearchProjectModel, diag.Diagnostics) {
 	createBody := serverless.CreateElasticsearchProjectRequest{
 		Name:     model.Name.ValueString(),
 		RegionId: model.RegionId.ValueString(),
@@ -152,7 +152,7 @@ func (es elasticsearchApi) create(ctx context.Context, model resource_elasticsea
 	return model, diags
 }
 
-func (es elasticsearchApi) patch(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) diag.Diagnostics {
+func (es elasticsearchApi) Patch(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) diag.Diagnostics {
 	updateBody := serverless.PatchElasticsearchProjectRequest{
 		Name: model.Name.ValueStringPointer(),
 	}
@@ -197,7 +197,7 @@ func (es elasticsearchApi) patch(ctx context.Context, model resource_elasticsear
 	return nil
 }
 
-func (es elasticsearchApi) ensureInitialised(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) diag.Diagnostics {
+func (es elasticsearchApi) EnsureInitialised(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) diag.Diagnostics {
 	id := model.Id.ValueString()
 	for {
 		resp, err := es.client.GetElasticsearchProjectStatusWithResponse(ctx, id)
@@ -225,7 +225,7 @@ func (es elasticsearchApi) ensureInitialised(ctx context.Context, model resource
 	}
 }
 
-func (es elasticsearchApi) read(ctx context.Context, id string, model resource_elasticsearch_project.ElasticsearchProjectModel) (bool, resource_elasticsearch_project.ElasticsearchProjectModel, diag.Diagnostics) {
+func (es elasticsearchApi) Read(ctx context.Context, id string, model resource_elasticsearch_project.ElasticsearchProjectModel) (bool, resource_elasticsearch_project.ElasticsearchProjectModel, diag.Diagnostics) {
 	resp, err := es.client.GetElasticsearchProjectWithResponse(ctx, id)
 	if err != nil {
 		return false, model, diag.Diagnostics{
@@ -317,7 +317,7 @@ func (es elasticsearchApi) read(ctx context.Context, id string, model resource_e
 	return true, model, nil
 }
 
-func (es elasticsearchApi) delete(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) diag.Diagnostics {
+func (es elasticsearchApi) Delete(ctx context.Context, model resource_elasticsearch_project.ElasticsearchProjectModel) diag.Diagnostics {
 	resp, err := es.client.DeleteElasticsearchProjectWithResponse(ctx, model.Id.ValueString(), nil)
 	if err != nil {
 		return diag.Diagnostics{

diff --git a/ec/ecresource/projectresource/observability.go b/ec/ecresource/projectresource/observability.go
@@ -32,26 +32,26 @@ import (
 
 func NewObservabilityProjectResource() *Resource[resource_observability_project.ObservabilityProjectModel] {
 	return &Resource[resource_observability_project.ObservabilityProjectModel]{
-		modelReader: observabilityModelReader{},
-		api:         observabilityApi{},
-		name:        "observability",
+		modelHandler: observabilityModelReader{},
+		api:          observabilityApi{},
+		name:         "observability",
 	}
 }
 
 type observabilityModelReader struct{}
 
-func (es observabilityModelReader) readFrom(ctx context.Context, getter modelGetter) (*resource_observability_project.ObservabilityProjectModel, diag.Diagnostics) {
+func (es observabilityModelReader) ReadFrom(ctx context.Context, getter modelGetter) (*resource_observability_project.ObservabilityProjectModel, diag.Diagnostics) {
 	var model resource_observability_project.ObservabilityProjectModel
 	diags := getter.Get(ctx, &model)
 
 	return &model, diags
 }
 
-func (es observabilityModelReader) getID(model resource_observability_project.ObservabilityProjectModel) string {
+func (es observabilityModelReader) GetID(model resource_observability_project.ObservabilityProjectModel) string {
 	return model.Id.ValueString()
 }
 
-func (es observabilityModelReader) modify(plan resource_observability_project.ObservabilityProjectModel, state resource_observability_project.ObservabilityProjectModel, cfg resource_observability_project.ObservabilityProjectModel) resource_observability_project.ObservabilityProjectModel {
+func (es observabilityModelReader) Modify(plan resource_observability_project.ObservabilityProjectModel, state resource_observability_project.ObservabilityProjectModel, cfg resource_observability_project.ObservabilityProjectModel) resource_observability_project.ObservabilityProjectModel {
 	plan.Credentials = useStateForUnknown(plan.Credentials, state.Credentials)
 	plan.Endpoints = useStateForUnknown(plan.Endpoints, state.Endpoints)
 	plan.Metadata = useStateForUnknown(plan.Metadata, state.Metadata)
@@ -83,16 +83,16 @@ type observabilityApi struct {
 	client serverless.ClientWithResponsesInterface
 }
 
-func (obs observabilityApi) ready() bool {
+func (obs observabilityApi) Ready() bool {
 	return obs.client != nil
 }
 
-func (obs observabilityApi) withClient(client serverless.ClientWithResponsesInterface) api[resource_observability_project.ObservabilityProjectModel] {
+func (obs observabilityApi) WithClient(client serverless.ClientWithResponsesInterface) api[resource_observability_project.ObservabilityProjectModel] {
 	obs.client = client
 	return obs
 }
 
-func (obs observabilityApi) create(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) (resource_observability_project.ObservabilityProjectModel, diag.Diagnostics) {
+func (obs observabilityApi) Create(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) (resource_observability_project.ObservabilityProjectModel, diag.Diagnostics) {
 	createBody := serverless.CreateObservabilityProjectRequest{
 		Name:     model.Name.ValueString(),
 		RegionId: model.RegionId.ValueString(),
@@ -134,7 +134,7 @@ func (obs observabilityApi) create(ctx context.Context, model resource_observabi
 	return model, diags
 }
 
-func (obs observabilityApi) patch(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) diag.Diagnostics {
+func (obs observabilityApi) Patch(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) diag.Diagnostics {
 	updateBody := serverless.PatchObservabilityProjectRequest{
 		Name: model.Name.ValueStringPointer(),
 	}
@@ -165,7 +165,7 @@ func (obs observabilityApi) patch(ctx context.Context, model resource_observabil
 	return nil
 }
 
-func (obs observabilityApi) ensureInitialised(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) diag.Diagnostics {
+func (obs observabilityApi) EnsureInitialised(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) diag.Diagnostics {
 	id := model.Id.ValueString()
 	for {
 		resp, err := obs.client.GetObservabilityProjectStatusWithResponse(ctx, id)
@@ -193,7 +193,7 @@ func (obs observabilityApi) ensureInitialised(ctx context.Context, model resourc
 	}
 }
 
-func (obs observabilityApi) read(ctx context.Context, id string, model resource_observability_project.ObservabilityProjectModel) (bool, resource_observability_project.ObservabilityProjectModel, diag.Diagnostics) {
+func (obs observabilityApi) Read(ctx context.Context, id string, model resource_observability_project.ObservabilityProjectModel) (bool, resource_observability_project.ObservabilityProjectModel, diag.Diagnostics) {
 	resp, err := obs.client.GetObservabilityProjectWithResponse(ctx, id)
 	if err != nil {
 		return false, model, diag.Diagnostics{
@@ -262,7 +262,7 @@ func (obs observabilityApi) read(ctx context.Context, id string, model resource_
 	return true, model, nil
 }
 
-func (obs observabilityApi) delete(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) diag.Diagnostics {
+func (obs observabilityApi) Delete(ctx context.Context, model resource_observability_project.ObservabilityProjectModel) diag.Diagnostics {
 	resp, err := obs.client.DeleteObservabilityProjectWithResponse(ctx, model.Id.ValueString(), nil)
 	if err != nil {
 		return diag.Diagnostics{

diff --git a/ec/ecresource/projectresource/read.go b/ec/ecresource/projectresource/read.go
@@ -30,13 +30,13 @@ func (r *Resource[T]) Read(ctx context.Context, request resource.ReadRequest, re
 		return
 	}
 
-	model, diags := r.modelReader.readFrom(ctx, request.State)
+	model, diags := r.modelHandler.ReadFrom(ctx, request.State)
 	response.Diagnostics.Append(diags...)
 	if response.Diagnostics.HasError() {
 		return
 	}
 
-	found, readModel, diags := r.api.read(ctx, r.modelReader.getID(*model), *model)
+	found, readModel, diags := r.api.Read(ctx, r.modelHandler.GetID(*model), *model)
 	response.Diagnostics.Append(diags...)
 	if response.Diagnostics.HasError() {
 		return

diff --git a/ec/ecresource/projectresource/resource.go b/ec/ecresource/projectresource/resource.go
@@ -35,33 +35,33 @@ var _ resource.ResourceWithConfigure = &Resource[resource_elasticsearch_project.
 var _ resource.ResourceWithModifyPlan = &Resource[resource_elasticsearch_project.ElasticsearchProjectModel]{}
 
 type Resource[T any] struct {
-	modelReader modelHandler[T]
-	api         api[T]
-	name        string
+	modelHandler modelHandler[T]
+	api          api[T]
+	name         string
 }
 
 type modelGetter interface {
 	Get(ctx context.Context, target interface{}) diag.Diagnostics
 }
 
 type modelHandler[T any] interface {
-	readFrom(context.Context, modelGetter) (*T, diag.Diagnostics)
-	getID(T) string
-	modify(T, T, T) T
+	ReadFrom(context.Context, modelGetter) (*T, diag.Diagnostics)
+	GetID(T) string
+	Modify(T, T, T) T
 }
 
 type api[TModel any] interface {
-	create(context.Context, TModel) (TModel, diag.Diagnostics)
-	patch(context.Context, TModel) diag.Diagnostics
-	ensureInitialised(context.Context, TModel) diag.Diagnostics
-	read(context.Context, string, TModel) (bool, TModel, diag.Diagnostics)
-	delete(context.Context, TModel) diag.Diagnostics
-	withClient(serverless.ClientWithResponsesInterface) api[TModel]
-	ready() bool
+	Create(context.Context, TModel) (TModel, diag.Diagnostics)
+	Patch(context.Context, TModel) diag.Diagnostics
+	EnsureInitialised(context.Context, TModel) diag.Diagnostics
+	Read(context.Context, string, TModel) (bool, TModel, diag.Diagnostics)
+	Delete(context.Context, TModel) diag.Diagnostics
+	WithClient(serverless.ClientWithResponsesInterface) api[TModel]
+	Ready() bool
 }
 
 func resourceReady[T any](r *Resource[T], dg *diag.Diagnostics) bool {
-	if !r.api.ready() {
+	if !r.api.Ready() {
 		dg.AddError(
 			"Unconfigured API Client",
 			"Expected configured API client. Please report this issue to the provider developers.",
@@ -75,7 +75,7 @@ func resourceReady[T any](r *Resource[T], dg *diag.Diagnostics) bool {
 func (r *Resource[T]) Configure(ctx context.Context, request resource.ConfigureRequest, response *resource.ConfigureResponse) {
 	clients, diags := internal.ConvertProviderData(request.ProviderData)
 	response.Diagnostics.Append(diags...)
-	r.api = r.api.withClient(clients.Serverless)
+	r.api = r.api.WithClient(clients.Serverless)
 }
 
 func (r *Resource[T]) Metadata(ctx context.Context, request resource.MetadataRequest, response *resource.MetadataResponse) {
@@ -87,19 +87,19 @@ func (r *Resource[T]) Schema(ctx context.Context, _ resource.SchemaRequest, resp
 }
 
 func (r Resource[T]) ModifyPlan(ctx context.Context, req resource.ModifyPlanRequest, resp *resource.ModifyPlanResponse) {
-	cfgModel, diags := r.modelReader.readFrom(ctx, req.Config)
+	cfgModel, diags := r.modelHandler.ReadFrom(ctx, req.Config)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	planModel, diags := r.modelReader.readFrom(ctx, req.Plan)
+	planModel, diags := r.modelHandler.ReadFrom(ctx, req.Plan)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	stateModel, diags := r.modelReader.readFrom(ctx, req.State)
+	stateModel, diags := r.modelHandler.ReadFrom(ctx, req.State)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -111,7 +111,7 @@ func (r Resource[T]) ModifyPlan(ctx context.Context, req resource.ModifyPlanRequ
 		return
 	}
 
-	modifiedModel := r.modelReader.modify(*planModel, *stateModel, *cfgModel)
+	modifiedModel := r.modelHandler.Modify(*planModel, *stateModel, *cfgModel)
 	resp.Diagnostics.Append(resp.Plan.Set(ctx, modifiedModel)...)
 }