Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUG/MEDIUM: edge: avoid setting state until success #221

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion provider/resource_edge_deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,15 @@ func resourceEdgeDeployment() *schema.Resource {
func createOrUpdateEdgeDeployment(d *schema.ResourceData, m interface{}) error {
pm := m.(providerMetadata)

err := pm.Client.CreateOrUpdateEdgeDeployment(pm.Corp, d.Get("site_short_name").(string))

if err != nil {
return err
}

d.SetId(d.Get("site_short_name").(string))

return pm.Client.CreateOrUpdateEdgeDeployment(pm.Corp, d.Get("site_short_name").(string))
return nil
}

func readEdgeDeployment(d *schema.ResourceData, m interface{}) error {
Expand Down
12 changes: 9 additions & 3 deletions provider/resource_edge_deployment_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,19 @@ func resourceEdgeDeploymentService() *schema.Resource {
func createOrUpdateEdgeDeploymentService(d *schema.ResourceData, m interface{}) error {
pm := m.(providerMetadata)

d.SetId(d.Get("fastly_sid").(string))

activateVersion := d.Get("activate_version").(bool)
return pm.Client.CreateOrUpdateEdgeDeploymentService(pm.Corp, d.Get("site_short_name").(string), d.Get("fastly_sid").(string), sigsci.CreateOrUpdateEdgeDeploymentServiceBody{
err := pm.Client.CreateOrUpdateEdgeDeploymentService(pm.Corp, d.Get("site_short_name").(string), d.Get("fastly_sid").(string), sigsci.CreateOrUpdateEdgeDeploymentServiceBody{
ActivateVersion: &activateVersion,
PercentEnabled: d.Get("percent_enabled").(int),
})

if err != nil {
return err
}

d.SetId(d.Get("fastly_sid").(string))

return nil
}

func readEdgeDeploymentService(d *schema.ResourceData, m interface{}) error {
Expand Down
Loading