[opendistro ism] Add support for opensearch.

Author: phillbaker

es/resource_elasticsearch_opendistro_ism_policy_mapping.go

@@ -127,6 +127,8 @@ func resourceElasticsearchOpendistroPolicyIndices(indexPattern string, policyID
 		p, ok := parameters.(map[string]interface{})
 		if ok && p["index.opendistro.index_state_management.policy_id"] == policyID {
 			mappedIndexes = append(mappedIndexes, indexName)
+		} else if ok && p["index.plugins.index_state_management.policy_id"] == policyID {
+			mappedIndexes = append(mappedIndexes, indexName)
 		}
 	}
 
@@ -239,7 +241,7 @@ func resourceElasticsearchPostOpendistroPolicyMapping(d *schema.ResourceData, m
 			Body:   requestBody,
 		})
 		if err != nil {
-			return response, fmt.Errorf("error posting policy attachement: %+v : %+v : %+v", path, requestBody, err)
+			return response, fmt.Errorf("error posting policy attachment: %+v : %+v : %+v", path, requestBody, err)
 		}
 		body = &res.Body
 	default:
@@ -279,7 +281,7 @@ func resourceElasticsearchGetOpendistroPolicyMapping(indexPattern string, m inte
 			Path:   path,
 		})
 		if err != nil {
-			return *response, fmt.Errorf("error getting policy attachement: %+v : %+v", path, err)
+			return *response, fmt.Errorf("error getting policy attachment: %+v, %w", path, err)
 		}
 		body = &res.Body
 	default:

es/resource_elasticsearch_opendistro_ism_policy_mapping_test.go

@@ -2,6 +2,7 @@ package es
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"testing"
 
@@ -113,6 +114,8 @@ func indicesMappedToPolicy(policy string) ([]string, error) {
 		p, ok := parameters.(map[string]interface{})
 		if ok && p["index.opendistro.index_state_management.policy_id"] == policy {
 			mappedIndices = append(mappedIndices, indexName)
+		} else if ok && p["index.plugins.index_state_management.policy_id"] == policy {
+			mappedIndices = append(mappedIndices, indexName)
 		}
 	}
 	return mappedIndices, nil
@@ -126,6 +129,14 @@ func testCheckElasticsearchOpenDistroISMPolicyMappingDestroy(s *terraform.State)
 
 		mappedIndices, err := indicesMappedToPolicy(rs.Primary.ID)
 
+		// if the underlying index is deleted, it triggers a cascading delete for
+		// the mapping and the mapping explain endpoint returns a 400, so we know
+		// it's been cleaned up
+		var e *elastic7.Error
+		if err != nil && errors.As(err, &e) && e.Status == 400 {
+			return nil
+		}
+
 		if err != nil {
 			return err
 		}