Merge pull request #84 from EventStore/agadelshin/fix-recreation

If response is not OK, return an error
EventStore · May 31, 2023 · 63704ce · 63704ce
2 parents 48e0abb + 9e31824
commit 63704ce
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 36 deletions.
diff --git a/esc/resource_integration.go b/esc/resource_integration.go
@@ -136,9 +136,12 @@ func resourceIntegrationRead(ctx context.Context, d *schema.ResourceData, meta i
 	integrationId := d.Id()
 
 	resp, err := c.client.GetIntegration(ctx, c.organizationId, projectId, integrationId)
-	if err != nil || resp.Integration.Status == client.StateDeleted {
+	if err != nil {
+		return diag.Errorf("Internal Server Error, try again later")
+	}
+	if resp.Integration.Status == client.StateDeleted {
 		d.SetId("")
-		return diags
+		return nil
 	}
 
 	if err := d.Set("description", resp.Integration.Description); err != nil {

diff --git a/esc/resource_integration_awscloudwatch_logs.go b/esc/resource_integration_awscloudwatch_logs.go
@@ -146,9 +146,13 @@ func resourceIntegrationAwsCloudWatchLogsRead(ctx context.Context, d *schema.Res
 	integrationId := d.Id()
 
 	resp, err := c.client.GetIntegration(ctx, c.organizationId, projectId, integrationId)
-	if err != nil || resp.Integration.Status == client.StateDeleted {
+	if err != nil {
+		return diag.Errorf("Internal Server Error, try again later")
+	}
+
+	if resp.Integration.Status == client.StateDeleted {
 		d.SetId("")
-		return diags
+		return nil
 	}
 
 	if err := d.Set("description", resp.Integration.Description); err != nil {
@@ -180,8 +184,6 @@ func resourceIntegrationAwsCloudWatchLogsRead(ctx context.Context, d *schema.Res
 func resourceIntegrationAwsCloudWatchLogsDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	c := meta.(*providerContext)
 
-	var diags diag.Diagnostics
-
 	projectId := d.Get("project_id").(string)
 	integrationId := d.Id()
 
@@ -200,7 +202,7 @@ func resourceIntegrationAwsCloudWatchLogsDelete(ctx context.Context, d *schema.R
 			return diag.Errorf("integration %q (%q) does not seem to be deleting", integrationId, d.Get("description"))
 		}
 		if resp.Integration.Status == "deleted" {
-			return diags
+			return nil
 		}
 		time.Sleep(1.0)
 	}

diff --git a/esc/resource_integration_awscloudwatch_metrics.go b/esc/resource_integration_awscloudwatch_metrics.go
@@ -137,9 +137,13 @@ func resourceIntegrationAwsCloudWatchMetricsRead(ctx context.Context, d *schema.
 	integrationId := d.Id()
 
 	resp, err := c.client.GetIntegration(ctx, c.organizationId, projectId, integrationId)
-	if err != nil || resp.Integration.Status == client.StateDeleted {
+	if err != nil {
+		return diag.Errorf("Internal Server Error, try again later")
+	}
+
+	if resp.Integration.Status == client.StateDeleted {
 		d.SetId("")
-		return diags
+		return nil
 	}
 
 	if err := d.Set("description", resp.Integration.Description); err != nil {

diff --git a/esc/resource_managed_cluster.go b/esc/resource_managed_cluster.go
@@ -188,56 +188,59 @@ func resourceManagedClusterRead(ctx context.Context, d *schema.ResourceData, met
 	}
 
 	resp, err := c.client.ManagedClusterGet(ctx, request)
-	if err != nil || resp.ManagedCluster.Status == client.StateDeleted {
+	if err != nil {
+		return diag.Errorf("Internal Server Error, try again later")
+	}
+
+	if resp.ManagedCluster.Status == client.StateDeleted {
 		d.SetId("")
-		return diags
+		return nil
 	}
 
 	if err := d.Set("project_id", resp.ManagedCluster.ProjectID); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("network_id", resp.ManagedCluster.NetworkID); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("name", resp.ManagedCluster.Name); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("topology", resp.ManagedCluster.Topology); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("instance_type", resp.ManagedCluster.InstanceType); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("disk_size", int(resp.ManagedCluster.DiskSizeGB)); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("disk_type", resp.ManagedCluster.DiskType); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("disk_iops", resp.ManagedCluster.DiskIops); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("disk_throughput", resp.ManagedCluster.DiskThroughput); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("server_version", resp.ManagedCluster.ServerVersion); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("projection_level", resp.ManagedCluster.ProjectionLevel); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
-
 	if err := d.Set("resource_provider", resp.ManagedCluster.Provider); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("region", resp.ManagedCluster.Region); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 	if err := d.Set("dns_name", fmt.Sprintf("%s.mesdb.eventstore.cloud", resp.ManagedCluster.ClusterID)); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 
-	return nil
+	return diags
 }
 
 func resourceManagedClusterUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

diff --git a/esc/resource_network.go b/esc/resource_network.go
@@ -135,9 +135,12 @@ func resourceNetworkRead(ctx context.Context, d *schema.ResourceData, meta inter
 	}
 
 	resp, err := c.client.NetworkGet(ctx, request)
-	if err != nil || resp.Network.Status == client.StateDeleted {
+	if err != nil {
+		return diag.Errorf("Internal Server Error, try again later")
+	}
+	if resp.Network.Status == client.StateDeleted {
 		d.SetId("")
-		return diags
+		return nil
 	}
 
 	if err := d.Set("project_id", resp.Network.ProjectID); err != nil {

diff --git a/esc/resource_peering.go b/esc/resource_peering.go
@@ -258,9 +258,12 @@ func resourcePeeringReadWithCheck(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	resp, err := c.client.PeeringGet(ctx, request)
-	if err != nil || resp.Peering.Status == client.StateDeleted {
+	if err != nil {
+		return diag.Errorf("Internal Server Error, try again later")
+	}
+	if resp.Peering.Status == client.StateDeleted {
 		d.SetId("")
-		return diags
+		return nil
 	}
 
 	if errorOnDefunct && resp.Peering.Status == client.StateDefunct {

diff --git a/esc/resource_project.go b/esc/resource_project.go
@@ -62,12 +62,11 @@ func resourceProjectRead(ctx context.Context, d *schema.ResourceData, meta inter
 
 	resp, err := c.client.ProjectGet(ctx, request)
 	if err != nil {
-		d.SetId("")
-		return diags
+		return diag.Errorf("Internal Server Error, try again later")
 	}
 
 	if err := d.Set("name", resp.Project.Name); err != nil {
-		return diag.FromErr(err)
+		diags = append(diags, diag.FromErr(err)...)
 	}
 
 	return diags

diff --git a/esc/resource_scheduled_backup.go b/esc/resource_scheduled_backup.go
@@ -98,9 +98,13 @@ func resourceScheduledBackupRead(ctx context.Context, d *schema.ResourceData, me
 	var diags diag.Diagnostics
 
 	resp, err := c.client.GetJob(ctx, c.organizationId, projectId, jobId)
-	if err != nil || resp.Job.Status == client.StateDeleted {
+	if err != nil {
+		return diag.Errorf("Internal Server Error, try again later")
+	}
+
+	if resp.Job.Status == client.StateDeleted {
 		d.SetId("")
-		return diags
+		return nil
 	}
 	if err := d.Set("description", resp.Job.Description); err != nil {
 		diags = append(diags, diag.FromErr(err)...)