Skip to content

Commit d093a5e

Browse files
yfodilyfodil
committed
fix
1 parent c24fe03 commit d093a5e

File tree

5 files changed

+22
-31
lines changed

5 files changed

+22
-31
lines changed

‎internal/services/edgeservices/edge_services_backend_stage.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
8-
edge_services "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
8+
edgeservices "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
99
"github.com/scaleway/scaleway-sdk-go/scw"
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
@@ -70,7 +70,7 @@ func ResourceEdgeServicesBackendStage() *schema.Resource {
7070
func ResourceEdgeServicesBackendStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
7171
api := NewEdgeServicesAPI(m)
7272

73-
backendStage, err := api.CreateBackendStage(&edge_services.CreateBackendStageRequest{
73+
backendStage, err := api.CreateBackendStage(&edgeservices.CreateBackendStageRequest{
7474
ProjectID: d.Get("project_id").(string),
7575
ScalewayS3: expandEdgeServicesScalewayS3BackendConfig(d.Get("s3_backend_config")),
7676
}, scw.WithContext(ctx))
@@ -86,7 +86,7 @@ func ResourceEdgeServicesBackendStageCreate(ctx context.Context, d *schema.Resou
8686
func ResourceEdgeServicesBackendStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
8787
api := NewEdgeServicesAPI(m)
8888

89-
backendStage, err := api.GetBackendStage(&edge_services.GetBackendStageRequest{
89+
backendStage, err := api.GetBackendStage(&edgeservices.GetBackendStageRequest{
9090
BackendStageID: d.Id(),
9191
}, scw.WithContext(ctx))
9292
if err != nil {
@@ -111,7 +111,7 @@ func ResourceEdgeServicesBackendStageUpdate(ctx context.Context, d *schema.Resou
111111

112112
hasChanged := false
113113

114-
updateRequest := &edge_services.UpdateBackendStageRequest{
114+
updateRequest := &edgeservices.UpdateBackendStageRequest{
115115
BackendStageID: d.Id(),
116116
}
117117

@@ -133,7 +133,7 @@ func ResourceEdgeServicesBackendStageUpdate(ctx context.Context, d *schema.Resou
133133
func ResourceEdgeServicesBackendStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
134134
api := NewEdgeServicesAPI(m)
135135

136-
err := api.DeleteBackendStage(&edge_services.DeleteBackendStageRequest{
136+
err := api.DeleteBackendStage(&edgeservices.DeleteBackendStageRequest{
137137
BackendStageID: d.Id(),
138138
}, scw.WithContext(ctx))
139139
if err != nil && !httperrors.Is403(err) {

‎internal/services/edgeservices/edge_services_cache_stage.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,6 @@ func ResourceEdgeServicesCacheStageRead(ctx context.Context, d *schema.ResourceD
124124
_ = d.Set("backend_stage_id", types.FlattenStringPtr(cacheStage.BackendStageID))
125125
_ = d.Set("fallback_ttl", cacheStage.FallbackTTL.Seconds)
126126

127-
/* prs, err := api.ListPurgeRequests(&edge_services.ListPurgeRequestsRequest{
128-
ProjectID: scw.StringPtr(cacheStage.ProjectID),
129-
PipelineID: cacheStage.PipelineID,
130-
})
131-
if err != nil {
132-
return diag.FromErr(err)
133-
}
134-
_ = d.Set("purge", flattenEdgeServicesPurge(prs.PurgeRequests))
135-
*/
136127
return nil
137128
}
138129

‎internal/services/edgeservices/edge_services_dns_stage.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
8-
edge_services "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
8+
edgeservices "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
99
"github.com/scaleway/scaleway-sdk-go/scw"
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
@@ -78,7 +78,7 @@ func ResourceEdgeServicesDNSStage() *schema.Resource {
7878
func ResourceEdgeServicesDNSStageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
7979
api := NewEdgeServicesAPI(m)
8080

81-
dnsStage, err := api.CreateDNSStage(&edge_services.CreateDNSStageRequest{
81+
dnsStage, err := api.CreateDNSStage(&edgeservices.CreateDNSStageRequest{
8282
ProjectID: d.Get("project_id").(string),
8383
BackendStageID: types.ExpandStringPtr(d.Get("backend_stage_id").(string)),
8484
CacheStageID: types.ExpandStringPtr(d.Get("cache_stage_id").(string)),
@@ -97,7 +97,7 @@ func ResourceEdgeServicesDNSStageCreate(ctx context.Context, d *schema.ResourceD
9797
func ResourceEdgeServicesDNSStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
9898
api := NewEdgeServicesAPI(m)
9999

100-
dnsStage, err := api.GetDNSStage(&edge_services.GetDNSStageRequest{
100+
dnsStage, err := api.GetDNSStage(&edgeservices.GetDNSStageRequest{
101101
DNSStageID: d.Id(),
102102
}, scw.WithContext(ctx))
103103
if err != nil {
@@ -127,7 +127,7 @@ func ResourceEdgeServicesDNSStageRead(ctx context.Context, d *schema.ResourceDat
127127
// add all FQDNs from the API response
128128
for _, fqdn := range dnsStage.Fqdns {
129129
if oldFQDNsSet[fqdn] || len(oldFQDNs) == 0 {
130-
// Keep FQDNs that were in the old state or if there were no old FQDNs
130+
// keep FQDNs that were in the old state or if there were no old FQDNs
131131
newFQDNs = append(newFQDNs, fqdn)
132132
}
133133
}
@@ -144,7 +144,7 @@ func ResourceEdgeServicesDNSStageRead(ctx context.Context, d *schema.ResourceDat
144144
newFQDNs = append(newFQDNs, oldFQDN.(string))
145145
}
146146
}
147-
if err := d.Set("fqdns", newFQDNs); err != nil {
147+
if err = d.Set("fqdns", newFQDNs); err != nil {
148148
return diag.FromErr(err)
149149
}
150150

@@ -156,7 +156,7 @@ func ResourceEdgeServicesDNSStageUpdate(ctx context.Context, d *schema.ResourceD
156156

157157
hasChanged := false
158158

159-
updateRequest := &edge_services.UpdateDNSStageRequest{
159+
updateRequest := &edgeservices.UpdateDNSStageRequest{
160160
DNSStageID: d.Id(),
161161
}
162162

@@ -193,7 +193,7 @@ func ResourceEdgeServicesDNSStageUpdate(ctx context.Context, d *schema.ResourceD
193193
func ResourceEdgeServicesDNSStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
194194
api := NewEdgeServicesAPI(m)
195195

196-
err := api.DeleteDNSStage(&edge_services.DeleteDNSStageRequest{
196+
err := api.DeleteDNSStage(&edgeservices.DeleteDNSStageRequest{
197197
DNSStageID: d.Id(),
198198
}, scw.WithContext(ctx))
199199
if err != nil && !httperrors.Is403(err) {

‎internal/services/edgeservices/edge_services_pipeline.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
8-
edge_services "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
8+
edgeservices "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
99
"github.com/scaleway/scaleway-sdk-go/scw"
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
@@ -70,7 +70,7 @@ func ResourceEdgeServicesPipeline() *schema.Resource {
7070
func ResourceEdgeServicesPipelineCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
7171
api := NewEdgeServicesAPI(m)
7272

73-
pipeline, err := api.CreatePipeline(&edge_services.CreatePipelineRequest{
73+
pipeline, err := api.CreatePipeline(&edgeservices.CreatePipelineRequest{
7474
Description: d.Get("description").(string),
7575
ProjectID: d.Get("project_id").(string),
7676
Name: d.Get("name").(string),
@@ -88,7 +88,7 @@ func ResourceEdgeServicesPipelineCreate(ctx context.Context, d *schema.ResourceD
8888
func ResourceEdgeServicesPipelineRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
8989
api := NewEdgeServicesAPI(m)
9090

91-
pipeline, err := api.GetPipeline(&edge_services.GetPipelineRequest{
91+
pipeline, err := api.GetPipeline(&edgeservices.GetPipelineRequest{
9292
PipelineID: d.Id(),
9393
}, scw.WithContext(ctx))
9494
if err != nil {
@@ -115,7 +115,7 @@ func ResourceEdgeServicesPipelineUpdate(ctx context.Context, d *schema.ResourceD
115115

116116
hasChanged := false
117117

118-
updateRequest := &edge_services.UpdatePipelineRequest{
118+
updateRequest := &edgeservices.UpdatePipelineRequest{
119119
PipelineID: d.Id(),
120120
}
121121

@@ -147,7 +147,7 @@ func ResourceEdgeServicesPipelineUpdate(ctx context.Context, d *schema.ResourceD
147147
func ResourceEdgeServicesPipelineDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
148148
api := NewEdgeServicesAPI(m)
149149

150-
err := api.DeletePipeline(&edge_services.DeletePipelineRequest{
150+
err := api.DeletePipeline(&edgeservices.DeletePipelineRequest{
151151
PipelineID: d.Id(),
152152
}, scw.WithContext(ctx))
153153
if err != nil && !httperrors.Is404(err) {

‎internal/services/edgeservices/edge_services_tls_stage.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
8-
edge_services "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
8+
edgeservices "github.com/scaleway/scaleway-sdk-go/api/edge_services/v1alpha1"
99
"github.com/scaleway/scaleway-sdk-go/scw"
1010
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1111
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
@@ -88,7 +88,7 @@ func ResourceEdgeServicesTLSStageCreate(ctx context.Context, d *schema.ResourceD
8888
return diag.FromErr(err)
8989
}
9090

91-
tlsStage, err := api.CreateTLSStage(&edge_services.CreateTLSStageRequest{
91+
tlsStage, err := api.CreateTLSStage(&edgeservices.CreateTLSStageRequest{
9292
ProjectID: d.Get("project_id").(string),
9393
BackendStageID: types.ExpandStringPtr(d.Get("backend_stage_id").(string)),
9494
CacheStageID: types.ExpandStringPtr(d.Get("cache_stage_id").(string)),
@@ -107,7 +107,7 @@ func ResourceEdgeServicesTLSStageCreate(ctx context.Context, d *schema.ResourceD
107107
func ResourceEdgeServicesTLSStageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
108108
api := NewEdgeServicesAPI(m)
109109

110-
tlsStage, err := api.GetTLSStage(&edge_services.GetTLSStageRequest{
110+
tlsStage, err := api.GetTLSStage(&edgeservices.GetTLSStageRequest{
111111
TLSStageID: d.Id(),
112112
}, scw.WithContext(ctx))
113113
if err != nil {
@@ -138,7 +138,7 @@ func ResourceEdgeServicesTLSStageUpdate(ctx context.Context, d *schema.ResourceD
138138
}
139139
hasChanged := false
140140

141-
updateRequest := &edge_services.UpdateTLSStageRequest{
141+
updateRequest := &edgeservices.UpdateTLSStageRequest{
142142
TLSStageID: d.Id(),
143143
}
144144

@@ -175,7 +175,7 @@ func ResourceEdgeServicesTLSStageUpdate(ctx context.Context, d *schema.ResourceD
175175
func ResourceEdgeServicesTLSStageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
176176
api := NewEdgeServicesAPI(m)
177177

178-
err := api.DeleteTLSStage(&edge_services.DeleteTLSStageRequest{
178+
err := api.DeleteTLSStage(&edgeservices.DeleteTLSStageRequest{
179179
TLSStageID: d.Id(),
180180
}, scw.WithContext(ctx))
181181
if err != nil && !httperrors.Is403(err) {

0 commit comments

Comments
 (0)