Fix error handling in case of state file out of sync (#430)

* Add 404 handler on read operations * Add 404 handler on read operations
cyralinc · Aug 3, 2023 · 68fb1eb · 68fb1eb
1 parent a8b3951
commit 68fb1eb
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 11 deletions.
diff --git a/cyral/error_handlers.go b/cyral/error_handlers.go
@@ -25,3 +25,21 @@ func (h *DeleteIgnoreHttpNotFound) HandleError(
 	log.Printf("[DEBUG] %s not found. Skipping deletion.", h.resName)
 	return nil
 }
+
+type ReadIgnoreHttpNotFound struct {
+	resName string
+}
+
+func (h *ReadIgnoreHttpNotFound) HandleError(
+	r *schema.ResourceData,
+	_ *client.Client,
+	err error,
+) error {
+	httpError, ok := err.(*client.HttpError)
+	if !ok || httpError.StatusCode != http.StatusNotFound {
+		return err
+	}
+	r.SetId("")
+	log.Printf("[DEBUG] %s not found. Marking resource for recreation.", h.resName)
+	return nil
+}
diff --git a/cyral/resource_cyral_integration_datadog.go b/cyral/resource_cyral_integration_datadog.go
@@ -33,7 +33,8 @@ var ReadDatadogConfig = ResourceOperationConfig{
 	CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 		return fmt.Sprintf("https://%s/v1/integrations/datadog/%s", c.ControlPlane, d.Id())
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &DatadogIntegration{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &DatadogIntegration{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Integration datadog"},
 }
 
 func resourceIntegrationDatadog() *schema.Resource {

diff --git a/cyral/resource_cyral_integration_elk.go b/cyral/resource_cyral_integration_elk.go
@@ -36,7 +36,8 @@ var ReadELKConfig = ResourceOperationConfig{
 	CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 		return fmt.Sprintf("https://%s/v1/integrations/elk/%s", c.ControlPlane, d.Id())
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &ELKIntegration{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &ELKIntegration{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Integration elk"},
 }
 
 func resourceIntegrationELK() *schema.Resource {

diff --git a/cyral/resource_cyral_integration_hcvault.go b/cyral/resource_cyral_integration_hcvault.go
@@ -32,7 +32,8 @@ var ReadHCVaultIntegrationConfig = ResourceOperationConfig{
 	CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 		return fmt.Sprintf("https://%s/v1/integrations/secretProviders/hcvault/%s", c.ControlPlane, d.Id())
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &HCVaultIntegration{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &HCVaultIntegration{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Integration hcvault"},
 }
 
 func resourceIntegrationHCVault() *schema.Resource {

diff --git a/cyral/resource_cyral_integration_idp_saml.go b/cyral/resource_cyral_integration_idp_saml.go
@@ -86,7 +86,8 @@ func ReadGenericSAMLConfig() ResourceOperationConfig {
 		CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 			return fmt.Sprintf("https://%s/v1/integrations/generic-saml/sso/%s", c.ControlPlane, d.Id())
 		},
-		NewResponseData: func(_ *schema.ResourceData) ResponseData { return &ReadGenericSAMLResponse{} },
+		NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &ReadGenericSAMLResponse{} },
+		RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Generic SAML"},
 	}
 }
 

diff --git a/cyral/resource_cyral_integration_logging.go b/cyral/resource_cyral_integration_logging.go
@@ -186,7 +186,8 @@ var ReadLoggingIntegration = ResourceOperationConfig{
 	CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 		return fmt.Sprintf(loggingApiUrl, c.ControlPlane, d.Id())
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &LoggingIntegration{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &LoggingIntegration{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Integration logging"},
 }
 
 func UpdateLoggingIntegration() ResourceOperationConfig {

diff --git a/cyral/resource_cyral_integration_slack_alerts.go b/cyral/resource_cyral_integration_slack_alerts.go
@@ -31,7 +31,8 @@ var ReadSlackAlertsConfig = ResourceOperationConfig{
 	CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 		return fmt.Sprintf("https://%s/v1/integrations/notifications/slack/%s", c.ControlPlane, d.Id())
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &SlackAlertsIntegration{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &SlackAlertsIntegration{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Integration Slack"},
 }
 
 func resourceIntegrationSlackAlerts() *schema.Resource {

diff --git a/cyral/resource_cyral_integration_teams.go b/cyral/resource_cyral_integration_teams.go
@@ -31,7 +31,8 @@ var ReadMsTeamsConfig = ResourceOperationConfig{
 	CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 		return fmt.Sprintf("https://%s/v1/integrations/notifications/teams/%s", c.ControlPlane, d.Id())
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &MsTeamsIntegration{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &MsTeamsIntegration{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Integration Teams"},
 }
 
 func resourceIntegrationMsTeams() *schema.Resource {

diff --git a/cyral/resource_cyral_repository.go b/cyral/resource_cyral_repository.go
@@ -281,6 +281,7 @@ var ReadRepositoryConfig = ResourceOperationConfig{
 	NewResponseData: func(_ *schema.ResourceData) ResponseData {
 		return &GetRepoByIDResponse{}
 	},
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Repository"},
 }
 
 func resourceRepository() *schema.Resource {

diff --git a/cyral/resource_cyral_repository_access_gateway.go b/cyral/resource_cyral_repository_access_gateway.go
@@ -46,6 +46,7 @@ var ReadRepositoryAccessGatewayConfig = ResourceOperationConfig{
 	NewResponseData: func(_ *schema.ResourceData) ResponseData {
 		return &GetOrUpdateAccessGateway{}
 	},
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Repository access gateway"},
 }
 
 func resourceRepositoryAccessGateway() *schema.Resource {

diff --git a/cyral/resource_cyral_repository_access_rules.go b/cyral/resource_cyral_repository_access_rules.go
@@ -139,6 +139,7 @@ var ReadRepositoryAccessRulesConfig = ResourceOperationConfig{
 	NewResponseData: func(_ *schema.ResourceData) ResponseData {
 		return &AccessRulesResponse{}
 	},
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Repository access rule"},
 }
 
 func resourceRepositoryAccessRules() *schema.Resource {

diff --git a/cyral/resource_cyral_repository_binding.go b/cyral/resource_cyral_repository_binding.go
@@ -117,6 +117,7 @@ var ReadRepositoryBindingConfig = ResourceOperationConfig{
 	NewResponseData: func(_ *schema.ResourceData) ResponseData {
 		return &GetBindingResponse{}
 	},
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Repository binding"},
 }
 
 func resourceRepositoryBinding() *schema.Resource {

diff --git a/cyral/resource_cyral_repository_conf_auth.go b/cyral/resource_cyral_repository_conf_auth.go
@@ -143,7 +143,8 @@ func ReadConfAuthConfig() ResourceOperationConfig {
 		CreateURL: func(d *schema.ResourceData, c *client.Client) string {
 			return fmt.Sprintf(repositoryConfAuthURLFormat, c.ControlPlane, d.Get("repository_id"))
 		},
-		NewResponseData: func(_ *schema.ResourceData) ResponseData { return &ReadRepositoryConfAuthResponse{} },
+		NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &ReadRepositoryConfAuthResponse{} },
+		RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Repository conf auth"},
 	}
 }
 

diff --git a/cyral/resource_cyral_repository_network_access_policy.go b/cyral/resource_cyral_repository_network_access_policy.go
@@ -117,7 +117,8 @@ func readRepositoryNetworkAccessPolicy() ResourceOperationConfig {
 			return fmt.Sprintf(repositoryNetworkAccessPolicyURLFormat,
 				c.ControlPlane, d.Get("repository_id"))
 		},
-		NewResponseData: func(_ *schema.ResourceData) ResponseData { return &NetworkAccessPolicy{} },
+		NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &NetworkAccessPolicy{} },
+		RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Repository network access policy"},
 	}
 }
 

diff --git a/cyral/resource_cyral_repository_user_account.go b/cyral/resource_cyral_repository_user_account.go
@@ -318,6 +318,7 @@ var ReadRepositoryUserAccountConfig = ResourceOperationConfig{
 	NewResponseData: func(_ *schema.ResourceData) ResponseData {
 		return &UserAccountResource{}
 	},
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "User account"},
 }
 
 func resourceRepositoryUserAccount() *schema.Resource {

diff --git a/cyral/resource_cyral_role_sso_groups.go b/cyral/resource_cyral_role_sso_groups.go
@@ -138,7 +138,8 @@ var readRoleSSOGroupsConfig = ResourceOperationConfig{
 		return fmt.Sprintf("https://%s/v1/users/groups/%s/mappings", c.ControlPlane,
 			d.Get("role_id").(string))
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &RoleSSOGroupsReadResponse{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &RoleSSOGroupsReadResponse{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Role SSO groups"},
 }
 
 var deleteRoleSSOGroupsConfig = ResourceOperationConfig{

diff --git a/cyral/resource_cyral_sidecar_listener.go b/cyral/resource_cyral_sidecar_listener.go
@@ -58,7 +58,8 @@ var ReadSidecarListenersConfig = ResourceOperationConfig{
 			d.Get(SidecarIDKey).(string),
 			d.Get(ListenerIDKey).(string))
 	},
-	NewResponseData: func(_ *schema.ResourceData) ResponseData { return &ReadSidecarListenerAPIResponse{} },
+	NewResponseData:     func(_ *schema.ResourceData) ResponseData { return &ReadSidecarListenerAPIResponse{} },
+	RequestErrorHandler: &ReadIgnoreHttpNotFound{resName: "Sidecar listener"},
 }
 
 type ReadSidecarListenerAPIResponse struct {