Skip to content

Commit 9b82a0c

Browse files
committed
rename functions
1 parent 7377188 commit 9b82a0c

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

internal/services/edgeservices/edge_services_backend_stage.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func ResourceEdgeServicesBackendStageCreate(ctx context.Context, d *schema.Resou
7272

7373
backendStage, err := api.CreateBackendStage(&edgeservices.CreateBackendStageRequest{
7474
ProjectID: d.Get("project_id").(string),
75-
ScalewayS3: expandEdgeServicesScalewayS3BackendConfig(d.Get("s3_backend_config")),
75+
ScalewayS3: expandS3BackendConfig(d.Get("s3_backend_config")),
7676
}, scw.WithContext(ctx))
7777
if err != nil {
7878
return diag.FromErr(err)
@@ -101,7 +101,7 @@ func ResourceEdgeServicesBackendStageRead(ctx context.Context, d *schema.Resourc
101101
_ = d.Set("created_at", types.FlattenTime(backendStage.CreatedAt))
102102
_ = d.Set("updated_at", types.FlattenTime(backendStage.UpdatedAt))
103103
_ = d.Set("project_id", backendStage.ProjectID)
104-
_ = d.Set("s3_backend_config", flattenEdgeServicesScalewayS3BackendConfig(backendStage.ScalewayS3))
104+
_ = d.Set("s3_backend_config", flattenS3BackendConfig(backendStage.ScalewayS3))
105105

106106
return nil
107107
}
@@ -116,7 +116,7 @@ func ResourceEdgeServicesBackendStageUpdate(ctx context.Context, d *schema.Resou
116116
}
117117

118118
if d.HasChange("s3_backend_config") {
119-
updateRequest.ScalewayS3 = expandEdgeServicesScalewayS3BackendConfig(d.Get("s3_backend_config"))
119+
updateRequest.ScalewayS3 = expandS3BackendConfig(d.Get("s3_backend_config"))
120120
hasChanged = true
121121
}
122122

internal/services/edgeservices/edge_services_cache_stage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func ResourceEdgeServicesCacheStageUpdate(ctx context.Context, d *schema.Resourc
154154
}
155155

156156
if d.HasChanges("purge_requests", "refresh_cache") {
157-
for _, pr := range expandEdgeServicesPurge(d.Get("purge_requests")) {
157+
for _, pr := range expandPurge(d.Get("purge_requests")) {
158158
res, err := api.CreatePurgeRequest(&edge_services.CreatePurgeRequestRequest{
159159
PipelineID: pr.PipelineID,
160160
Assets: pr.Assets,

internal/services/edgeservices/edge_services_tls_stage.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func ResourceEdgeServicesTLSStageCreate(ctx context.Context, d *schema.ResourceD
9393
BackendStageID: types.ExpandStringPtr(d.Get("backend_stage_id").(string)),
9494
CacheStageID: types.ExpandStringPtr(d.Get("cache_stage_id").(string)),
9595
ManagedCertificate: types.ExpandBoolPtr(d.Get("managed_certificate").(bool)),
96-
Secrets: expandEdgeServicesTLSSecrets(d.Get("secrets"), region),
96+
Secrets: expandTLSSecrets(d.Get("secrets"), region),
9797
}, scw.WithContext(ctx))
9898
if err != nil {
9999
return diag.FromErr(err)
@@ -122,7 +122,7 @@ func ResourceEdgeServicesTLSStageRead(ctx context.Context, d *schema.ResourceDat
122122
_ = d.Set("cache_stage_id", types.FlattenStringPtr(tlsStage.CacheStageID))
123123
_ = d.Set("pipeline_id", types.FlattenStringPtr(tlsStage.PipelineID))
124124
_ = d.Set("managed_certificate", tlsStage.ManagedCertificate)
125-
_ = d.Set("secrets", flattenEdgeServicesTLSSecrets(tlsStage.Secrets))
125+
_ = d.Set("secrets", flattenTLSSecrets(tlsStage.Secrets))
126126
_ = d.Set("certificate_expires_at", types.FlattenTime(tlsStage.CertificateExpiresAt))
127127
_ = d.Set("created_at", types.FlattenTime(tlsStage.CreatedAt))
128128
_ = d.Set("updated_at", types.FlattenTime(tlsStage.UpdatedAt))
@@ -158,7 +158,7 @@ func ResourceEdgeServicesTLSStageUpdate(ctx context.Context, d *schema.ResourceD
158158
}
159159

160160
if d.HasChange("secrets") {
161-
updateRequest.TLSSecretsConfig = wrapSecretsInConfig(expandEdgeServicesTLSSecrets(d.Get("secrets"), region))
161+
updateRequest.TLSSecretsConfig = wrapSecretsInConfig(expandTLSSecrets(d.Get("secrets"), region))
162162
hasChanged = true
163163
}
164164

internal/services/edgeservices/types.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
99
)
1010

11-
func expandEdgeServicesScalewayS3BackendConfig(raw interface{}) *edge_services.ScalewayS3BackendConfig {
11+
func expandS3BackendConfig(raw interface{}) *edge_services.ScalewayS3BackendConfig {
1212
if raw == nil || len(raw.([]interface{})) != 1 {
1313
return nil
1414
}
@@ -20,7 +20,7 @@ func expandEdgeServicesScalewayS3BackendConfig(raw interface{}) *edge_services.S
2020
}
2121
}
2222

23-
func flattenEdgeServicesScalewayS3BackendConfig(s3backend *edge_services.ScalewayS3BackendConfig) []map[string]interface{} {
23+
func flattenS3BackendConfig(s3backend *edge_services.ScalewayS3BackendConfig) []map[string]interface{} {
2424
return []map[string]interface{}{
2525
{
2626
"bucket_name": types.FlattenStringPtr(s3backend.BucketName),
@@ -30,7 +30,7 @@ func flattenEdgeServicesScalewayS3BackendConfig(s3backend *edge_services.Scalewa
3030
}
3131
}
3232

33-
func expandEdgeServicesPurge(raw interface{}) []*edge_services.PurgeRequest {
33+
func expandPurge(raw interface{}) []*edge_services.PurgeRequest {
3434
if raw == nil {
3535
return nil
3636
}
@@ -48,7 +48,7 @@ func expandEdgeServicesPurge(raw interface{}) []*edge_services.PurgeRequest {
4848
return purgeRequests
4949
}
5050

51-
func expandEdgeServicesTLSSecrets(raw interface{}, region scw.Region) []*edge_services.TLSSecret {
51+
func expandTLSSecrets(raw interface{}, region scw.Region) []*edge_services.TLSSecret {
5252
secrets := []*edge_services.TLSSecret(nil)
5353
rawSecrets := raw.([]interface{})
5454
for _, rawSecret := range rawSecrets {
@@ -62,7 +62,7 @@ func expandEdgeServicesTLSSecrets(raw interface{}, region scw.Region) []*edge_se
6262
return secrets
6363
}
6464

65-
func flattenEdgeServicesTLSSecrets(secrets []*edge_services.TLSSecret) interface{} {
65+
func flattenTLSSecrets(secrets []*edge_services.TLSSecret) interface{} {
6666
if len(secrets) == 0 || secrets == nil {
6767
return nil
6868
}

0 commit comments

Comments
 (0)