From 5ca17fe6b275689820365d7ed2213ef31b0426fe Mon Sep 17 00:00:00 2001
From: disaster37 <linuxworkgroup@hotmail.com>
Date: Mon, 17 Jan 2022 11:26:51 +0100
Subject: [PATCH] feat: Add suport for new composable template (#9)

* feat: rename index_template to index_template_legacy. Add index_component_template resource

Signed-off-by: disaster37 <linuxworkgroup@hotmail.com>

* feat: Add support for new index template API

Signed-off-by: disaster37 <linuxworkgroup@hotmail.com>
---
 Makefile                                      |   2 +-
 docs/index.md                                 |   2 +
 .../elasticsearch_index_component_template.md |  50 +++++
 .../resources/elasticsearch_index_template.md |  21 +--
 .../elasticsearch_index_template_legacy.md    |  41 ++++
 es/diff_suppress_funcs.go                     | 164 ++++++++++++++--
 es/provider.go                                |   2 +
 ..._elasticsearch_index_component_template.go | 177 ++++++++++++++++++
 ...ticsearch_index_component_template_test.go | 161 ++++++++++++++++
 es/resource_elasticsearch_index_template.go   |  37 ++--
 ...rce_elasticsearch_index_template_legacy.go | 173 +++++++++++++++++
 ...lasticsearch_index_template_legacy_test.go | 141 ++++++++++++++
 ...ource_elasticsearch_index_template_test.go |  58 +++---
 go.mod                                        |  13 +-
 go.sum                                        |  44 ++++-
 15 files changed, 1000 insertions(+), 86 deletions(-)
 create mode 100644 docs/resources/elasticsearch_index_component_template.md
 create mode 100644 docs/resources/elasticsearch_index_template_legacy.md
 create mode 100644 es/resource_elasticsearch_index_component_template.go
 create mode 100644 es/resource_elasticsearch_index_component_template_test.go
 create mode 100644 es/resource_elasticsearch_index_template_legacy.go
 create mode 100644 es/resource_elasticsearch_index_template_legacy_test.go

diff --git a/Makefile b/Makefile
index 674f5525..83dd75ec 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ trial-license:
 	curl -XPOST -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} ${ELASTICSEARCH_URLS}/_license/start_trial?acknowledge=true
 
 start-pods: clean-pods
-	kubectl run elasticsearch --image docker.elastic.co/elasticsearch/elasticsearch:7.5.1 --port "9200" --expose --env "cluster.name=test" --env "discovery.type=single-node" --env "ELASTIC_PASSWORD=changeme" --env "xpack.security.enabled=true" --env "ES_JAVA_OPTS=-Xms512m -Xmx512m" --env "path.repo=/tmp" --limits "cpu=500m,memory=1024Mi"
+	kubectl run elasticsearch --image docker.elastic.co/elasticsearch/elasticsearch:7.16.2 --port "9200" --expose --env "cluster.name=test" --env "discovery.type=single-node" --env "ELASTIC_PASSWORD=changeme" --env "xpack.security.enabled=true" --env "ES_JAVA_OPTS=-Xms512m -Xmx512m" --env "path.repo=/tmp" --limits "cpu=500m,memory=1024Mi"
 
 clean-pods:
 	kubectl delete --ignore-not-found pod/elasticsearch
diff --git a/docs/index.md b/docs/index.md
index b6738462..8f433628 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -41,6 +41,8 @@ provider "elasticsearch" {
 
 - [elasticsearch_index_lifecycle_policy](resources/elasticsearch_index_lifecycle_policy.md)
 - [elasticsearch_index_template](resources/elasticsearch_index_template.md)
+- [elasticsearch_index_component_template](resources/elasticsearch_index_component_template.md)
+- [elasticsearch_index_template_legacy](resources/elasticsearch_index_template_legacy.md)
 - [elasticsearch_role](resources/elasticsearch_role.md)
 - [elasticsearch_role_mapping](resources/elasticsearch_role_mapping.md)
 - [elasticsearch_user](resources/elasticsearch_user.md)
diff --git a/docs/resources/elasticsearch_index_component_template.md b/docs/resources/elasticsearch_index_component_template.md
new file mode 100644
index 00000000..cb2dfef2
--- /dev/null
+++ b/docs/resources/elasticsearch_index_component_template.md
@@ -0,0 +1,50 @@
+# elasticsearch_index_component_template Resource Source
+
+This resource permit to manage the index component template in Elasticsearch.
+You can see the API documentation: https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html
+
+***Supported Elasticsearch version:***
+  - v7
+
+## Example Usage
+
+It will create index template.
+
+```tf
+resource elasticsearch_index_component_template "test" {
+  name 		= "terraform-test"
+  template 	= <<EOF
+{
+	"template": {
+		"settings": {
+			"index.refresh_interval": "3s"
+		},
+		"mappings": {
+			"_source": {
+				"enabled": false
+			},
+			"properties": {
+				"host_name": {
+					"type": "keyword"
+				},
+				"created_at": {
+					"type": "date",
+					"format": "EEE MMM dd HH:mm:ss Z yyyy"
+				}
+			}
+		}
+	}
+}
+EOF
+}
+```
+
+## Argument Reference
+
+***The following arguments are supported:***
+  - **name**: (required) Identifier for the template.
+  - **template**: (required) The template specification. It's a string as JSON object.
+
+## Attribute Reference
+
+NA
\ No newline at end of file
diff --git a/docs/resources/elasticsearch_index_template.md b/docs/resources/elasticsearch_index_template.md
index 6b567ba9..aab5f48c 100644
--- a/docs/resources/elasticsearch_index_template.md
+++ b/docs/resources/elasticsearch_index_template.md
@@ -1,10 +1,9 @@
 # elasticsearch_index_template Resource Source
 
 This resource permit to manage the index template in Elasticsearch.
-You can see the API documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html
+You can see the API documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/index-templates.html
 
 ***Supported Elasticsearch version:***
-  - v6
   - v7
 
 ## Example Usage
@@ -16,15 +15,15 @@ resource elasticsearch_index_template "test" {
   name 		= "terraform-test"
   template 	= <<EOF
 {
-  "index_patterns": [
-    "test"
-  ],
-  "settings": {
-    "index.refresh_interval": "5s",
-	"index.lifecycle.name": "policy-logstash-backup",
-    "index.lifecycle.rollover_alias": "logstash-backup-alias"
-  },
-  "order": 2
+	"index_patterns": ["test-index-template"],
+	"template": {
+		"settings": {
+			"index.refresh_interval": "5s",
+			"index.lifecycle.name": "policy-logstash-backup",
+    		"index.lifecycle.rollover_alias": "logstash-backup-alias"
+		}
+	},
+	"priority": 2
 }
 EOF
 }
diff --git a/docs/resources/elasticsearch_index_template_legacy.md b/docs/resources/elasticsearch_index_template_legacy.md
new file mode 100644
index 00000000..db6b349b
--- /dev/null
+++ b/docs/resources/elasticsearch_index_template_legacy.md
@@ -0,0 +1,41 @@
+# elasticsearch_index_template_legacy Resource Source
+
+This resource permit to manage the index template in Elasticsearch (the legacy API).
+You can see the API documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html
+
+***Supported Elasticsearch version:***
+  - v6
+  - v7
+
+## Example Usage
+
+It will create index template.
+
+```tf
+resource elasticsearch_index_template_legacy "test" {
+  name 		= "terraform-test"
+  template 	= <<EOF
+{
+  "index_patterns": [
+    "test"
+  ],
+  "settings": {
+    "index.refresh_interval": "5s",
+	"index.lifecycle.name": "policy-logstash-backup",
+    "index.lifecycle.rollover_alias": "logstash-backup-alias"
+  },
+  "order": 2
+}
+EOF
+}
+```
+
+## Argument Reference
+
+***The following arguments are supported:***
+  - **name**: (required) Identifier for the template.
+  - **template**: (required) The template specification. It's a string as JSON object.
+
+## Attribute Reference
+
+NA
\ No newline at end of file
diff --git a/es/diff_suppress_funcs.go b/es/diff_suppress_funcs.go
index badbe8b3..84e17fad 100644
--- a/es/diff_suppress_funcs.go
+++ b/es/diff_suppress_funcs.go
@@ -2,45 +2,65 @@ package es
 
 import (
 	"encoding/json"
+	"fmt"
 	"reflect"
 	"strconv"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/olivere/elastic/v7"
 	log "github.com/sirupsen/logrus"
 )
 
-// diffSuppressIndexTemplate permit to compare template in current state vs from API
-func diffSuppressIndexTemplate(k, old, new string, d *schema.ResourceData) bool {
-	var oo, no map[string]interface{}
+// diffSuppressIndexTemplateLegacy permit to compare template in current state vs from API
+func diffSuppressIndexTemplateLegacy(k, old, new string, d *schema.ResourceData) bool {
+
+	oo := &elastic.IndicesGetTemplateResponse{}
+	no := &elastic.IndicesGetTemplateResponse{}
+
 	if err := json.Unmarshal([]byte(old), &oo); err != nil {
+		fmt.Printf("[ERR] Error when converting to IndicesGetComponentTemplate: %s", err.Error())
+		log.Errorf("Error when converting to IndicesGetComponentTemplate: %s", err.Error())
 		return false
 	}
 	if err := json.Unmarshal([]byte(new), &no); err != nil {
+		fmt.Printf("[ERR] Error when converting to IndicesGetComponentTemplate: %s", err.Error())
+		log.Errorf("Error when converting to IndicesGetComponentTemplate: %s", err.Error())
 		return false
 	}
 
-	// Add default parameters on new index template if needed
-	if _, ok := no["order"]; !ok {
-		no["order"] = 0
+	// inits default values
+
+	if oo.Aliases == nil {
+		oo.Aliases = make(map[string]interface{})
 	}
-	if _, ok := no["settings"]; !ok {
-		no["settings"] = make(map[string]interface{})
+	if oo.Mappings == nil {
+		oo.Mappings = make(map[string]interface{})
+	}
+	if oo.Settings == nil {
+		oo.Settings = make(map[string]interface{})
+	}
+
+	if no.Aliases == nil {
+		no.Aliases = make(map[string]interface{})
 	}
-	if _, ok := no["mappings"]; !ok {
-		no["mappings"] = make(map[string]interface{})
+	if no.Mappings == nil {
+		no.Mappings = make(map[string]interface{})
 	}
-	if _, ok := no["aliases"]; !ok {
-		no["aliases"] = make(map[string]interface{})
+	if no.Settings == nil {
+		no.Settings = make(map[string]interface{})
 	}
 
-	ob, _ := json.Marshal(oo)
-	nb, _ := json.Marshal(parseAllDotProperties(no))
+	// force undot properties to compare the same think
+	oo.Aliases = parseAllDotProperties(oo.Aliases)
+	oo.Mappings = parseAllDotProperties(oo.Mappings)
+	oo.Settings = parseAllDotProperties(oo.Settings)
 
-	log.Debugf("Old: %s", string(ob))
-	log.Debugf("New: %s", string(nb))
+	no.Aliases = parseAllDotProperties(no.Aliases)
+	no.Mappings = parseAllDotProperties(no.Mappings)
+	no.Settings = parseAllDotProperties(no.Settings)
 
-	return reflect.DeepEqual(oo, parseAllDotProperties(no))
+	return reflect.DeepEqual(oo, no)
 }
 
 // suppressEquivalentJSON permit to compare state store as JSON string
@@ -121,3 +141,113 @@ func parseDotPropertie(key string, value interface{}, result map[string]interfac
 	}
 
 }
+
+// diffSuppressIndexComponentTemplate permit to compare index component template in current state vs from API
+func diffSuppressIndexComponentTemplate(k, old, new string, d *schema.ResourceData) bool {
+	oo := &elastic.IndicesGetComponentTemplate{}
+	no := &elastic.IndicesGetComponentTemplate{}
+
+	if err := json.Unmarshal([]byte(old), &oo); err != nil {
+		fmt.Printf("[ERR] Error when converting to IndicesGetComponentTemplate: %s", err.Error())
+		log.Errorf("Error when converting to IndicesGetComponentTemplate: %s", err.Error())
+		return false
+	}
+	if err := json.Unmarshal([]byte(new), &no); err != nil {
+		fmt.Printf("[ERR] Error when converting to IndicesGetComponentTemplate: %s", err.Error())
+		log.Errorf("Error when converting to IndicesGetComponentTemplate: %s", err.Error())
+		return false
+	}
+
+	// inits default values
+	if oo.Template != nil {
+		if oo.Template.Aliases == nil {
+			oo.Template.Aliases = make(map[string]interface{})
+		}
+		if oo.Template.Mappings == nil {
+			oo.Template.Mappings = make(map[string]interface{})
+		}
+		if oo.Template.Settings == nil {
+			oo.Template.Settings = make(map[string]interface{})
+		}
+	}
+	if no.Template != nil {
+		if no.Template.Aliases == nil {
+			no.Template.Aliases = make(map[string]interface{})
+		}
+		if no.Template.Mappings == nil {
+			no.Template.Mappings = make(map[string]interface{})
+		}
+		if no.Template.Settings == nil {
+			no.Template.Settings = make(map[string]interface{})
+		}
+	}
+
+	// force undot properties to compare the same think
+	if oo.Template != nil {
+		oo.Template.Aliases = parseAllDotProperties(oo.Template.Aliases)
+		oo.Template.Mappings = parseAllDotProperties(oo.Template.Mappings)
+		oo.Template.Settings = parseAllDotProperties(oo.Template.Settings)
+	}
+	if no.Template != nil {
+		no.Template.Aliases = parseAllDotProperties(no.Template.Aliases)
+		no.Template.Mappings = parseAllDotProperties(no.Template.Mappings)
+		no.Template.Settings = parseAllDotProperties(no.Template.Settings)
+	}
+
+	return reflect.DeepEqual(oo, no)
+}
+
+// diffSuppressIndexTemplate permit to compare index template in current state vs from API
+func diffSuppressIndexTemplate(k, old, new string, d *schema.ResourceData) bool {
+	oo := &elastic.IndicesGetIndexTemplate{}
+	no := &elastic.IndicesGetIndexTemplate{}
+
+	if err := json.Unmarshal([]byte(old), &oo); err != nil {
+		fmt.Printf("[ERR] Error when converting to IndicesGetIndexTemplate on old object: %s", err.Error())
+		log.Errorf("Error when converting to IndicesGetIndexTemplate on old object: %s\n%s", err.Error(), old)
+		return false
+	}
+	if err := json.Unmarshal([]byte(new), &no); err != nil {
+		fmt.Printf("[ERR] Error when converting to IndicesGetIndexTemplate on new object: %s", err.Error())
+		log.Errorf("Error when converting to IndicesGetIndexTemplate on new object: %s\n%s", err.Error(), new)
+		return false
+	}
+
+	// inits default values
+	if oo.Template != nil {
+		if oo.Template.Aliases == nil {
+			oo.Template.Aliases = make(map[string]interface{})
+		}
+		if oo.Template.Mappings == nil {
+			oo.Template.Mappings = make(map[string]interface{})
+		}
+		if oo.Template.Settings == nil {
+			oo.Template.Settings = make(map[string]interface{})
+		}
+	}
+	if no.Template != nil {
+		if no.Template.Aliases == nil {
+			no.Template.Aliases = make(map[string]interface{})
+		}
+		if no.Template.Mappings == nil {
+			no.Template.Mappings = make(map[string]interface{})
+		}
+		if no.Template.Settings == nil {
+			no.Template.Settings = make(map[string]interface{})
+		}
+	}
+
+	// force undot properties to compare the same think
+	if oo.Template != nil {
+		oo.Template.Aliases = parseAllDotProperties(oo.Template.Aliases)
+		oo.Template.Mappings = parseAllDotProperties(oo.Template.Mappings)
+		oo.Template.Settings = parseAllDotProperties(oo.Template.Settings)
+	}
+	if no.Template != nil {
+		no.Template.Aliases = parseAllDotProperties(no.Template.Aliases)
+		no.Template.Mappings = parseAllDotProperties(no.Template.Mappings)
+		no.Template.Settings = parseAllDotProperties(no.Template.Settings)
+	}
+
+	return reflect.DeepEqual(no, oo)
+}
diff --git a/es/provider.go b/es/provider.go
index 53f1f63f..83658e56 100644
--- a/es/provider.go
+++ b/es/provider.go
@@ -70,7 +70,9 @@ func Provider() *schema.Provider {
 
 		ResourcesMap: map[string]*schema.Resource{
 			"elasticsearch_index_lifecycle_policy":    resourceElasticsearchIndexLifecyclePolicy(),
+			"elasticsearch_index_template_legacy":     resourceElasticsearchIndexTemplateLegacy(),
 			"elasticsearch_index_template":            resourceElasticsearchIndexTemplate(),
+			"elasticsearch_index_component_template":  resourceElasticsearchIndexComponentTemplate(),
 			"elasticsearch_role":                      resourceElasticsearchSecurityRole(),
 			"elasticsearch_role_mapping":              resourceElasticsearchSecurityRoleMapping(),
 			"elasticsearch_user":                      resourceElasticsearchSecurityUser(),
diff --git a/es/resource_elasticsearch_index_component_template.go b/es/resource_elasticsearch_index_component_template.go
new file mode 100644
index 00000000..a7f11bb5
--- /dev/null
+++ b/es/resource_elasticsearch_index_component_template.go
@@ -0,0 +1,177 @@
+// Manage component template in Elasticsearch
+// API documentation:https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-component-template.html
+// Supported version:
+//  - v7
+
+package es
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"strings"
+
+	elastic "github.com/elastic/go-elasticsearch/v7"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oelastic "github.com/olivere/elastic/v7"
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+)
+
+// resourceElasticsearchIndexComponentTemplate handle the index component template API call
+func resourceElasticsearchIndexComponentTemplate() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceElasticsearchIndexComponentTemplateCreate,
+		Update: resourceElasticsearchIndexComponentTemplateUpdate,
+		Read:   resourceElasticsearchIndexComponentTemplateRead,
+		Delete: resourceElasticsearchIndexComponentTemplateDelete,
+
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Required: true,
+			},
+			"template": {
+				Type:             schema.TypeString,
+				Required:         true,
+				DiffSuppressFunc: diffSuppressIndexComponentTemplate,
+			},
+		},
+	}
+}
+
+// resourceElasticsearchIndexComponentTemplateCreate create index component template
+func resourceElasticsearchIndexComponentTemplateCreate(d *schema.ResourceData, meta interface{}) error {
+
+	err := createIndexComponentTemplate(d, meta)
+	if err != nil {
+		return err
+	}
+	d.SetId(d.Get("name").(string))
+	return resourceElasticsearchIndexComponentTemplateRead(d, meta)
+}
+
+// resourceElasticsearchIndexComponentTemplateUpdate update index component template
+func resourceElasticsearchIndexComponentTemplateUpdate(d *schema.ResourceData, meta interface{}) error {
+	err := createIndexComponentTemplate(d, meta)
+	if err != nil {
+		return err
+	}
+	return resourceElasticsearchIndexComponentTemplateRead(d, meta)
+}
+
+// resourceElasticsearchIndexComponentTemplateRead read index component template
+func resourceElasticsearchIndexComponentTemplateRead(d *schema.ResourceData, meta interface{}) error {
+	id := d.Id()
+
+	client := meta.(*elastic.Client)
+	res, err := client.API.Cluster.GetComponentTemplate(
+		client.API.Cluster.GetComponentTemplate.WithName(id),
+		client.API.Cluster.GetComponentTemplate.WithContext(context.Background()),
+		client.API.Cluster.GetComponentTemplate.WithPretty(),
+	)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	if res.IsError() {
+		if res.StatusCode == 404 {
+			fmt.Printf("[WARN] Index component template %s not found - removing from state", id)
+			log.Warnf("Index component template %s not found - removing from state", id)
+			d.SetId("")
+			return nil
+		}
+		return errors.Errorf("Error when get index component template %s: %s", id, res.String())
+
+	}
+	b, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return err
+	}
+	indexComponentTemplateResp := &oelastic.IndicesGetComponentTemplateResponse{}
+	if err := json.Unmarshal(b, indexComponentTemplateResp); err != nil {
+		return err
+	}
+
+	if len(indexComponentTemplateResp.ComponentTemplates) == 0 {
+		fmt.Printf("[WARN] Index component template %s not found - removing from state", id)
+		log.Warnf("Index component template %s not found - removing from state", id)
+		d.SetId("")
+		return nil
+	}
+
+	indexComponentTemplateJSON, err := json.Marshal(indexComponentTemplateResp.ComponentTemplates[0].ComponentTemplate)
+	if err != nil {
+		return err
+	}
+
+	log.Debugf("Get index component template %s successfully:%+v", id, string(indexComponentTemplateJSON))
+	d.Set("name", d.Id())
+	d.Set("template", string(indexComponentTemplateJSON))
+	return nil
+}
+
+// resourceElasticsearchIndexComponentTemplateDelete delete index template
+func resourceElasticsearchIndexComponentTemplateDelete(d *schema.ResourceData, meta interface{}) error {
+
+	id := d.Id()
+
+	client := meta.(*elastic.Client)
+	res, err := client.API.Cluster.DeleteComponentTemplate(
+		id,
+		client.API.Cluster.DeleteComponentTemplate.WithContext(context.Background()),
+		client.API.Cluster.DeleteComponentTemplate.WithPretty(),
+	)
+
+	if err != nil {
+		return err
+	}
+
+	defer res.Body.Close()
+
+	if res.IsError() {
+		if res.StatusCode == 404 {
+			fmt.Printf("[WARN] Index component template %s not found - removing from state", id)
+			log.Warnf("Index component template %s not found - removing from state", id)
+			d.SetId("")
+			return nil
+		}
+		return errors.Errorf("Error when delete index component template %s: %s", id, res.String())
+
+	}
+
+	d.SetId("")
+	return nil
+}
+
+// createIndexComponentTemplate create or update index component template
+func createIndexComponentTemplate(d *schema.ResourceData, meta interface{}) error {
+	name := d.Get("name").(string)
+	template := d.Get("template").(string)
+
+	client := meta.(*elastic.Client)
+	res, err := client.API.Cluster.PutComponentTemplate(
+		name,
+		strings.NewReader(template),
+		client.API.Cluster.PutComponentTemplate.WithContext(context.Background()),
+		client.API.Cluster.PutComponentTemplate.WithPretty(),
+	)
+
+	if err != nil {
+		return err
+	}
+
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return errors.Errorf("Error when add index component template %s: %s", name, res.String())
+	}
+
+	return nil
+}
diff --git a/es/resource_elasticsearch_index_component_template_test.go b/es/resource_elasticsearch_index_component_template_test.go
new file mode 100644
index 00000000..1497275c
--- /dev/null
+++ b/es/resource_elasticsearch_index_component_template_test.go
@@ -0,0 +1,161 @@
+package es
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	elastic "github.com/elastic/go-elasticsearch/v7"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/pkg/errors"
+)
+
+func TestAccElasticsearchIndexComponentTemplate(t *testing.T) {
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckElasticsearchIndexComponentTemplateDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testElasticsearchIndexComponentTemplate,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckElasticsearchIndexComponentTemplateExists("elasticsearch_index_component_template.test"),
+				),
+			},
+			{
+				Config: testElasticsearchIndexComponentTemplateUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckElasticsearchIndexComponentTemplateExists("elasticsearch_index_component_template.test"),
+				),
+			},
+			{
+				ResourceName:      "elasticsearch_index_component_template.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testCheckElasticsearchIndexComponentTemplateExists(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[name]
+		if !ok {
+			return fmt.Errorf("Not found: %s", name)
+		}
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No inde ID is set")
+		}
+
+		meta := testAccProvider.Meta()
+
+		client := meta.(*elastic.Client)
+		res, err := client.API.Cluster.GetComponentTemplate(
+			client.API.Cluster.GetComponentTemplate.WithName(rs.Primary.ID),
+			client.API.Cluster.GetComponentTemplate.WithContext(context.Background()),
+			client.API.Cluster.GetComponentTemplate.WithPretty(),
+		)
+		if err != nil {
+			return err
+		}
+		defer res.Body.Close()
+		if res.IsError() {
+			return errors.Errorf("Error when get index component template %s: %s", rs.Primary.ID, res.String())
+		}
+
+		return nil
+	}
+}
+
+func testCheckElasticsearchIndexComponentTemplateDestroy(s *terraform.State) error {
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "elasticsearch_index_component_template" {
+			continue
+		}
+
+		meta := testAccProvider.Meta()
+
+		client := meta.(*elastic.Client)
+		res, err := client.API.Cluster.DeleteComponentTemplate(
+			rs.Primary.ID,
+			client.API.Cluster.DeleteComponentTemplate.WithContext(context.Background()),
+			client.API.Cluster.DeleteComponentTemplate.WithPretty(),
+		)
+		if err != nil {
+			return err
+		}
+		defer res.Body.Close()
+		if res.IsError() {
+			if res.StatusCode == 404 {
+				return nil
+			}
+		}
+
+		return fmt.Errorf("Index component template %q still exists", rs.Primary.ID)
+	}
+
+	return nil
+}
+
+var testElasticsearchIndexComponentTemplate = `
+resource "elasticsearch_index_component_template" "test" {
+  name 		= "terraform-test"
+  template 	= <<EOF
+{
+	"template": {
+		"settings": {
+			"index.refresh_interval": "5s"
+		},
+		"mappings": {
+			"_source": {
+				"enabled": false
+			},
+			"properties": {
+				"host_name": {
+					"type": "keyword"
+				},
+				"created_at": {
+					"type": "date",
+					"format": "EEE MMM dd HH:mm:ss Z yyyy"
+				}
+			}
+		}
+	}
+}
+EOF
+}
+`
+
+var testElasticsearchIndexComponentTemplateUpdate = `
+resource "elasticsearch_index_component_template" "test" {
+  name 		= "terraform-test"
+  template 	= <<EOF
+{
+	"template": {
+		"settings": {
+			"index.refresh_interval": "3s"
+		},
+		"mappings": {
+			"_source": {
+				"enabled": false
+			},
+			"properties": {
+				"host_name": {
+					"type": "keyword"
+				},
+				"created_at": {
+					"type": "date",
+					"format": "EEE MMM dd HH:mm:ss Z yyyy"
+				}
+			}
+		}
+	}
+}
+EOF
+}
+`
diff --git a/es/resource_elasticsearch_index_template.go b/es/resource_elasticsearch_index_template.go
index 65079f6e..770ae5c7 100644
--- a/es/resource_elasticsearch_index_template.go
+++ b/es/resource_elasticsearch_index_template.go
@@ -1,7 +1,6 @@
 // Manage index template in Elasticsearch
-// API documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html
+// API documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/index-templates.html
 // Supported version:
-//  - v6
 //  - v7
 
 package es
@@ -15,6 +14,7 @@ import (
 
 	elastic "github.com/elastic/go-elasticsearch/v7"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	olivere "github.com/olivere/elastic/v7"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 )
@@ -71,10 +71,10 @@ func resourceElasticsearchIndexTemplateRead(d *schema.ResourceData, meta interfa
 	id := d.Id()
 
 	client := meta.(*elastic.Client)
-	res, err := client.API.Indices.GetTemplate(
-		client.API.Indices.GetTemplate.WithName(id),
-		client.API.Indices.GetTemplate.WithContext(context.Background()),
-		client.API.Indices.GetTemplate.WithPretty(),
+	res, err := client.API.Indices.GetIndexTemplate(
+		client.API.Indices.GetIndexTemplate.WithName(id),
+		client.API.Indices.GetIndexTemplate.WithContext(context.Background()),
+		client.API.Indices.GetIndexTemplate.WithPretty(),
 	)
 	if err != nil {
 		return err
@@ -94,12 +94,19 @@ func resourceElasticsearchIndexTemplateRead(d *schema.ResourceData, meta interfa
 	if err != nil {
 		return err
 	}
-	var indexTemplate map[string]interface{}
-	if err := json.Unmarshal(b, &indexTemplate); err != nil {
+	indexTemplate := &olivere.IndicesGetIndexTemplateResponse{}
+	if err := json.Unmarshal(b, indexTemplate); err != nil {
 		return err
 	}
 
-	indexTemplateJSON, err := json.Marshal(indexTemplate[id])
+	if len(indexTemplate.IndexTemplates) == 0 {
+		fmt.Printf("[WARN] Index template %s not found - removing from state", id)
+		log.Warnf("Index template %s not found - removing from state", id)
+		d.SetId("")
+		return nil
+	}
+
+	indexTemplateJSON, err := json.Marshal(indexTemplate.IndexTemplates[0].IndexTemplate)
 	if err != nil {
 		return err
 	}
@@ -116,10 +123,10 @@ func resourceElasticsearchIndexTemplateDelete(d *schema.ResourceData, meta inter
 	id := d.Id()
 
 	client := meta.(*elastic.Client)
-	res, err := client.API.Indices.DeleteTemplate(
+	res, err := client.API.Indices.DeleteIndexTemplate(
 		id,
-		client.API.Indices.DeleteTemplate.WithContext(context.Background()),
-		client.API.Indices.DeleteTemplate.WithPretty(),
+		client.API.Indices.DeleteIndexTemplate.WithContext(context.Background()),
+		client.API.Indices.DeleteIndexTemplate.WithPretty(),
 	)
 
 	if err != nil {
@@ -149,11 +156,11 @@ func createIndexTemplate(d *schema.ResourceData, meta interface{}) error {
 	template := d.Get("template").(string)
 
 	client := meta.(*elastic.Client)
-	res, err := client.API.Indices.PutTemplate(
+	res, err := client.API.Indices.PutIndexTemplate(
 		name,
 		strings.NewReader(template),
-		client.API.Indices.PutTemplate.WithContext(context.Background()),
-		client.API.Indices.PutTemplate.WithPretty(),
+		client.API.Indices.PutIndexTemplate.WithContext(context.Background()),
+		client.API.Indices.PutIndexTemplate.WithPretty(),
 	)
 
 	if err != nil {
diff --git a/es/resource_elasticsearch_index_template_legacy.go b/es/resource_elasticsearch_index_template_legacy.go
new file mode 100644
index 00000000..738dd86c
--- /dev/null
+++ b/es/resource_elasticsearch_index_template_legacy.go
@@ -0,0 +1,173 @@
+// Manage index template in Elasticsearch
+// API documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html
+// Supported version:
+//  - v6
+//  - v7
+
+package es
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"strings"
+
+	elastic "github.com/elastic/go-elasticsearch/v7"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	olivere "github.com/olivere/elastic/v7"
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+)
+
+// resourceElasticsearchIndexTemplateLegacy handle the index template API call
+func resourceElasticsearchIndexTemplateLegacy() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceElasticsearchIndexTemplateLegacyCreate,
+		Update: resourceElasticsearchIndexTemplateLegacyUpdate,
+		Read:   resourceElasticsearchIndexTemplateLegacyRead,
+		Delete: resourceElasticsearchIndexTemplateLegacyDelete,
+
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Required: true,
+			},
+			"template": {
+				Type:             schema.TypeString,
+				Required:         true,
+				DiffSuppressFunc: diffSuppressIndexTemplateLegacy,
+			},
+		},
+	}
+}
+
+// resourceElasticsearchIndexTemplateLegacyCreate create index template
+func resourceElasticsearchIndexTemplateLegacyCreate(d *schema.ResourceData, meta interface{}) error {
+
+	err := createIndexTemplateLegacy(d, meta)
+	if err != nil {
+		return err
+	}
+	d.SetId(d.Get("name").(string))
+	return resourceElasticsearchIndexTemplateLegacyRead(d, meta)
+}
+
+// resourceElasticsearchIndexTemplateLegacyUpdate update index template
+func resourceElasticsearchIndexTemplateLegacyUpdate(d *schema.ResourceData, meta interface{}) error {
+	err := createIndexTemplateLegacy(d, meta)
+	if err != nil {
+		return err
+	}
+	return resourceElasticsearchIndexTemplateLegacyRead(d, meta)
+}
+
+// resourceElasticsearchIndexTemplateLegacyRead read index template
+func resourceElasticsearchIndexTemplateLegacyRead(d *schema.ResourceData, meta interface{}) error {
+	id := d.Id()
+
+	client := meta.(*elastic.Client)
+	res, err := client.API.Indices.GetTemplate(
+		client.API.Indices.GetTemplate.WithName(id),
+		client.API.Indices.GetTemplate.WithContext(context.Background()),
+		client.API.Indices.GetTemplate.WithPretty(),
+	)
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+	if res.IsError() {
+		if res.StatusCode == 404 {
+			fmt.Printf("[WARN] Index template %s not found - removing from state", id)
+			log.Warnf("Index template %s not found - removing from state", id)
+			d.SetId("")
+			return nil
+		}
+		return errors.Errorf("Error when get index template %s: %s", id, res.String())
+
+	}
+	b, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return err
+	}
+
+	indexTemplate := make(map[string]*olivere.IndicesGetTemplateResponse)
+	if err := json.Unmarshal(b, &indexTemplate); err != nil {
+		return err
+	}
+
+	indexTemplateJSON, err := json.Marshal(indexTemplate[id])
+	if err != nil {
+		return err
+	}
+
+	log.Debugf("Get index template %s successfully:%+v", id, string(indexTemplateJSON))
+	d.Set("name", d.Id())
+	d.Set("template", string(indexTemplateJSON))
+	return nil
+
+}
+
+// resourceElasticsearchIndexTemplateLegacyDelete delete index template
+func resourceElasticsearchIndexTemplateLegacyDelete(d *schema.ResourceData, meta interface{}) error {
+
+	id := d.Id()
+
+	client := meta.(*elastic.Client)
+	res, err := client.API.Indices.DeleteTemplate(
+		id,
+		client.API.Indices.DeleteTemplate.WithContext(context.Background()),
+		client.API.Indices.DeleteTemplate.WithPretty(),
+	)
+
+	if err != nil {
+		return err
+	}
+
+	defer res.Body.Close()
+
+	if res.IsError() {
+		if res.StatusCode == 404 {
+			fmt.Printf("[WARN] Index template %s not found - removing from state", id)
+			log.Warnf("Index template %s not found - removing from state", id)
+			d.SetId("")
+			return nil
+		}
+		return errors.Errorf("Error when delete index template %s: %s", id, res.String())
+
+	}
+
+	d.SetId("")
+	return nil
+}
+
+// createIndexTemplateLegacy create or update index template
+func createIndexTemplateLegacy(d *schema.ResourceData, meta interface{}) error {
+	name := d.Get("name").(string)
+	template := d.Get("template").(string)
+
+	client := meta.(*elastic.Client)
+	res, err := client.API.Indices.PutTemplate(
+		name,
+		strings.NewReader(template),
+		client.API.Indices.PutTemplate.WithContext(context.Background()),
+		client.API.Indices.PutTemplate.WithPretty(),
+	)
+
+	if err != nil {
+		return err
+	}
+
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return errors.Errorf("Error when add index template %s: %s", name, res.String())
+	}
+
+	return nil
+}
diff --git a/es/resource_elasticsearch_index_template_legacy_test.go b/es/resource_elasticsearch_index_template_legacy_test.go
new file mode 100644
index 00000000..e6ae9913
--- /dev/null
+++ b/es/resource_elasticsearch_index_template_legacy_test.go
@@ -0,0 +1,141 @@
+package es
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	elastic "github.com/elastic/go-elasticsearch/v7"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/pkg/errors"
+)
+
+func TestAccElasticsearchIndexTemplateLegacy(t *testing.T) {
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckElasticsearchIndexTemplateLegacyDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testElasticsearchIndexTemplateLegacy,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckElasticsearchIndexTemplateLegacyExists("elasticsearch_index_template_legacy.test"),
+				),
+			},
+			{
+				Config: testElasticsearchIndexTemplateLegacyUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckElasticsearchIndexTemplateLegacyExists("elasticsearch_index_template_legacy.test"),
+				),
+			},
+			{
+				ResourceName:      "elasticsearch_index_template_legacy.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testCheckElasticsearchIndexTemplateLegacyExists(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[name]
+		if !ok {
+			return fmt.Errorf("Not found: %s", name)
+		}
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No inde ID is set")
+		}
+
+		meta := testAccProvider.Meta()
+
+		client := meta.(*elastic.Client)
+		res, err := client.API.Indices.GetTemplate(
+			client.API.Indices.GetTemplate.WithName(rs.Primary.ID),
+			client.API.Indices.GetTemplate.WithContext(context.Background()),
+			client.API.Indices.GetTemplate.WithPretty(),
+		)
+		if err != nil {
+			return err
+		}
+		defer res.Body.Close()
+		if res.IsError() {
+			return errors.Errorf("Error when get index template %s: %s", rs.Primary.ID, res.String())
+		}
+
+		return nil
+	}
+}
+
+func testCheckElasticsearchIndexTemplateLegacyDestroy(s *terraform.State) error {
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "elasticsearch_index_template_legacy" {
+			continue
+		}
+
+		meta := testAccProvider.Meta()
+
+		client := meta.(*elastic.Client)
+		res, err := client.API.Indices.DeleteTemplate(
+			rs.Primary.ID,
+			client.API.Indices.DeleteTemplate.WithContext(context.Background()),
+			client.API.Indices.DeleteTemplate.WithPretty(),
+		)
+		if err != nil {
+			return err
+		}
+		defer res.Body.Close()
+		if res.IsError() {
+			if res.StatusCode == 404 {
+				return nil
+			}
+		}
+
+		return fmt.Errorf("Index template %q still exists", rs.Primary.ID)
+	}
+
+	return nil
+}
+
+var testElasticsearchIndexTemplateLegacy = `
+resource "elasticsearch_index_template_legacy" "test" {
+  name 		= "terraform-test"
+  template 	= <<EOF
+{
+  "index_patterns": [
+    "test"
+  ],
+  "settings": {
+    "index.refresh_interval": "5s",
+	"index.lifecycle.name": "policy-logstash-backup",
+    "index.lifecycle.rollover_alias": "logstash-backup-alias"
+  },
+  "order": 2
+}
+EOF
+}
+`
+
+var testElasticsearchIndexTemplateLegacyUpdate = `
+resource "elasticsearch_index_template_legacy" "test" {
+  name 		= "terraform-test"
+  template 	= <<EOF
+{
+  "index_patterns": [
+    "test"
+  ],
+  "settings": {
+    "index.refresh_interval": "3s",
+	"index.lifecycle.name": "policy-logstash-backup",
+    "index.lifecycle.rollover_alias": "logstash-backup-alias"
+  },
+  "order": 2
+}
+EOF
+}
+`
diff --git a/es/resource_elasticsearch_index_template_test.go b/es/resource_elasticsearch_index_template_test.go
index 7f39c27c..a66d58aa 100644
--- a/es/resource_elasticsearch_index_template_test.go
+++ b/es/resource_elasticsearch_index_template_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-func TestAccElasticsearchIndex(t *testing.T) {
+func TestAccElasticsearchIndexTemplate(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
@@ -49,16 +49,16 @@ func testCheckElasticsearchIndexTemplateExists(name string) resource.TestCheckFu
 			return fmt.Errorf("Not found: %s", name)
 		}
 		if rs.Primary.ID == "" {
-			return fmt.Errorf("No inde ID is set")
+			return fmt.Errorf("No index ID is set")
 		}
 
 		meta := testAccProvider.Meta()
 
 		client := meta.(*elastic.Client)
-		res, err := client.API.Indices.GetTemplate(
-			client.API.Indices.GetTemplate.WithName(rs.Primary.ID),
-			client.API.Indices.GetTemplate.WithContext(context.Background()),
-			client.API.Indices.GetTemplate.WithPretty(),
+		res, err := client.API.Indices.GetIndexTemplate(
+			client.API.Indices.GetIndexTemplate.WithName(rs.Primary.ID),
+			client.API.Indices.GetIndexTemplate.WithContext(context.Background()),
+			client.API.Indices.GetIndexTemplate.WithPretty(),
 		)
 		if err != nil {
 			return err
@@ -81,10 +81,10 @@ func testCheckElasticsearchIndexTemplateDestroy(s *terraform.State) error {
 		meta := testAccProvider.Meta()
 
 		client := meta.(*elastic.Client)
-		res, err := client.API.Indices.DeleteTemplate(
+		res, err := client.API.Indices.DeleteIndexTemplate(
 			rs.Primary.ID,
-			client.API.Indices.DeleteTemplate.WithContext(context.Background()),
-			client.API.Indices.DeleteTemplate.WithPretty(),
+			client.API.Indices.DeleteIndexTemplate.WithContext(context.Background()),
+			client.API.Indices.DeleteIndexTemplate.WithPretty(),
 		)
 		if err != nil {
 			return err
@@ -104,18 +104,18 @@ func testCheckElasticsearchIndexTemplateDestroy(s *terraform.State) error {
 
 var testElasticsearchIndexTemplate = `
 resource "elasticsearch_index_template" "test" {
-  name 		= "terraform-test"
+  name 		= "terraform-test-index-template"
   template 	= <<EOF
 {
-  "index_patterns": [
-    "test"
-  ],
-  "settings": {
-    "index.refresh_interval": "5s",
-	"index.lifecycle.name": "policy-logstash-backup",
-    "index.lifecycle.rollover_alias": "logstash-backup-alias"
-  },
-  "order": 2
+	"index_patterns": ["test-index-template"],
+	"template": {
+		"settings": {
+			"index.refresh_interval": "5s",
+			"index.lifecycle.name": "policy-logstash-backup",
+    		"index.lifecycle.rollover_alias": "logstash-backup-alias"
+		}
+	},
+	"priority": 2
 }
 EOF
 }
@@ -123,18 +123,18 @@ EOF
 
 var testElasticsearchIndexTemplateUpdate = `
 resource "elasticsearch_index_template" "test" {
-  name 		= "terraform-test"
+  name 		= "terraform-test-index-template"
   template 	= <<EOF
 {
-  "index_patterns": [
-    "test"
-  ],
-  "settings": {
-    "index.refresh_interval": "3s",
-	"index.lifecycle.name": "policy-logstash-backup",
-    "index.lifecycle.rollover_alias": "logstash-backup-alias"
-  },
-  "order": 2
+	"index_patterns": ["test-index-template"],
+	"template": {
+		"settings": {
+			"index.refresh_interval": "3s",
+			"index.lifecycle.name": "policy-logstash-backup",
+    		"index.lifecycle.rollover_alias": "logstash-backup-alias"
+		}
+	},
+	"priority": 2
 }
 EOF
 }
diff --git a/go.mod b/go.mod
index 5b5d4738..7edda9ab 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/elastic/go-elasticsearch/v7 v7.16.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
 	github.com/mitchellh/go-homedir v1.1.0
+	github.com/olivere/elastic/v7 v7.0.31
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
@@ -17,7 +18,7 @@ require (
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.7.0 // indirect
-	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
@@ -38,22 +39,24 @@ require (
 	github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 // indirect
 	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.10 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/zclconf/go-cty v1.9.1 // indirect
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
-	golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
 	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
-	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/text v0.3.6 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
-	google.golang.org/grpc v1.32.0 // indirect
+	google.golang.org/grpc v1.33.2 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 )
diff --git a/go.sum b/go.sum
index ab7cd999..995c50cc 100644
--- a/go.sum
+++ b/go.sum
@@ -61,8 +61,9 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkE
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
-github.com/aws/aws-sdk-go v1.25.3 h1:uM16hIw9BotjZKMZlX05SN2EFtaWfi/NonPKIARiBLQ=
 github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.42.23 h1:V0V5hqMEyVelgpu1e4gMPVCJ+KhmscdNxP/NWP1iCOA=
+github.com/aws/aws-sdk-go v1.42.23/go.mod h1:gyRszuZ/icHmHAVE4gc/r+cfCmhA1AD+vqfWbgI+eHs=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
@@ -88,6 +89,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
@@ -105,8 +108,9 @@ github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3a
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -126,8 +130,9 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -136,6 +141,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -220,8 +226,12 @@ github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c
 github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
 github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
@@ -241,6 +251,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
@@ -267,6 +279,8 @@ github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
+github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
@@ -275,6 +289,9 @@ github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k
 github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/olivere/elastic/v7 v7.0.31 h1:VJu9/zIsbeiulwlRCfGQf6Tzsr++uo+FeUgj5oj+xKk=
+github.com/olivere/elastic/v7 v7.0.31/go.mod h1:idEQxe7Es+Wr4XAuNnJdKeMZufkA9vQprOIFck061vg=
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -292,6 +309,9 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
+github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
 github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -324,8 +344,9 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -398,10 +419,12 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs=
 golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63 h1:iocB37TsdFuN6IBRZ+ry36wrkoV51/tl5vOWqkcPGvY=
+golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -447,9 +470,11 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -459,8 +484,9 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -571,8 +597,9 @@ google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -596,6 +623,7 @@ gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=