From 4e08f2454002cdd9391183e55edb11f5a3fdee94 Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Mon, 27 Feb 2023 13:24:03 +0000 Subject: [PATCH 01/11] Add testcase for changing the mapping on an index --- es/resource_elasticsearch_index_test.go | 216 ++++++++++++++++++++++-- go.mod | 2 + go.sum | 108 ++++++++++++ 3 files changed, 316 insertions(+), 10 deletions(-) diff --git a/es/resource_elasticsearch_index_test.go b/es/resource_elasticsearch_index_test.go index 0dce8855..408d5f36 100644 --- a/es/resource_elasticsearch_index_test.go +++ b/es/resource_elasticsearch_index_test.go @@ -10,6 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gstruct" elastic7 "github.com/olivere/elastic/v7" elastic6 "gopkg.in/olivere/elastic.v6" @@ -148,6 +150,47 @@ resource "elasticsearch_index" "test_doctype" { } EOF } +` + testAccElasticsearchBasicMapping = ` +resource "elasticsearch_index" "test_mapping" { + name = "terraform-test" + number_of_replicas = "1" + include_type_name = false + mappings = < Date: Mon, 27 Feb 2023 14:25:08 +0000 Subject: [PATCH 02/11] Allow updates to mappings on live indices --- es/resource_elasticsearch_index.go | 128 ++++++++++++++++-------- es/resource_elasticsearch_index_test.go | 3 +- go.mod | 1 + go.sum | 2 + 4 files changed, 88 insertions(+), 46 deletions(-) diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go index 18869af5..25d34827 100644 --- a/es/resource_elasticsearch_index.go +++ b/es/resource_elasticsearch_index.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/nsf/jsondiff" elastic7 "github.com/olivere/elastic/v7" elastic6 "gopkg.in/olivere/elastic.v6" @@ -355,7 +356,6 @@ var ( Type: schema.TypeString, Description: "A JSON string defining how documents in the index, and the fields they contain, are stored and indexed. To avoid the complexities of field mapping updates, updates of this field are not allowed via this provider. See the upstream [Elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-put-mapping.html#updating-field-mappings) for more details.", Optional: true, - ForceNew: true, ValidateFunc: validation.StringIsJSON, }, "aliases": { @@ -670,52 +670,92 @@ func allowIndexDestroy(indexName string, d *schema.ResourceData, meta interface{ } func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{}) error { - settings := make(map[string]interface{}) - for _, key := range settingsKeys { - schemaName := strings.Replace(key, ".", "_", -1) - if d.HasChange(schemaName) { - settings[key] = d.Get(schemaName) - } - } - - // if we're not changing any settings, no-op this function - if len(settings) == 0 { - return resourceElasticsearchIndexRead(d, meta) - } - - body := map[string]interface{}{ - // Note you do not have to explicitly specify the `index` section inside - // the `settings` section - "settings": settings, - } - - var ( - name = d.Id() - ctx = context.Background() - err error - ) + var err error + settings := make(map[string]interface{}) + for _, key := range settingsKeys { + schemaName := strings.Replace(key, ".", "_", -1) + if d.HasChange(schemaName) { + settings[key] = d.Get(schemaName) + } + } + + o, n := d.GetChange("mappings") + difference, _ := jsondiff.Compare([]byte(n.(string)), []byte(o.(string)), &jsondiff.Options{}) + + // if we're not changing any settings, no-op this function + if len(settings) == 0 && difference == jsondiff.FullMatch { + return resourceElasticsearchIndexRead(d, meta) + } + + if len(settings) != 0 { + err = updateIndexSettings(d, meta, settings) + } + if err != nil { + return err + } + + if difference == jsondiff.SupersetMatch { + err = updateIndexMappings(d, meta, n.(string)) + } + if err != nil { + return err + } + + return resourceElasticsearchIndexRead(d, meta.(*ProviderConf)) +} - if alias, ok := d.GetOk("rollover_alias"); ok { - name = getWriteIndexByAlias(alias.(string), d, meta) - } +func updateIndexSettings(d *schema.ResourceData, meta interface{}, settings map[string]interface{}) error { + body := map[string]interface{}{ + // Note you do not have to explicitly specify the `index` section inside + // the `settings` section + "settings": settings, + } + + var ( + name = d.Id() + ctx = context.Background() + err error + ) + + if alias, ok := d.GetOk("rollover_alias"); ok { + name = getWriteIndexByAlias(alias.(string), d, meta) + } + + esClient, err := getClient(meta.(*ProviderConf)) + if err != nil { + return err + } + switch client := esClient.(type) { + case *elastic7.Client: + _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) + case *elastic6.Client: + _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) + default: + return errors.New("Elasticsearch version not supported") +} + return err +} - esClient, err := getClient(meta.(*ProviderConf)) - if err != nil { - return err - } - switch client := esClient.(type) { - case *elastic7.Client: - _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) - case *elastic6.Client: - _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) - default: - return errors.New("Elasticsearch version not supported") - } +func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping string) error { + var ( + name = d.Id() + ctx = context.Background() + err error + ) + esClient, err := getClient(meta.(*ProviderConf)) + if err != nil { + return err + } + switch client := esClient.(type) { + case *elastic7.Client: + _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx) + case *elastic6.Client: + _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx) + default: + return errors.New("Elasticsearch version not supported") +} - if err == nil { - return resourceElasticsearchIndexRead(d, meta.(*ProviderConf)) - } - return err + return err } func getWriteIndexByAlias(alias string, d *schema.ResourceData, meta interface{}) string { diff --git a/es/resource_elasticsearch_index_test.go b/es/resource_elasticsearch_index_test.go index 408d5f36..0843ac2b 100644 --- a/es/resource_elasticsearch_index_test.go +++ b/es/resource_elasticsearch_index_test.go @@ -505,9 +505,8 @@ func TestAccElasticsearchIndex_mapping(t *testing.T) { checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { initialUUID, err = getElasticsearchIndexUUID("elasticsearch_index.test_mapping", s) if err != nil { - return err + return fmt.Errorf("Failed to get index uuid: %w", err) } - fmt.Println(initialUUID) g.Expect(mapping).To(MatchAllKeys(Keys{ "terraform-test": MatchAllKeys(Keys{ "mappings": MatchAllKeys(Keys{ diff --git a/go.mod b/go.mod index 78be5517..ab817bec 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/katbyte/terrafmt v0.4.0 github.com/mattn/go-isatty v0.0.12 // indirect github.com/mitchellh/go-homedir v1.1.0 + github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 // indirect github.com/olivere/elastic v6.2.26+incompatible github.com/olivere/elastic/v7 v7.0.32 github.com/onsi/gomega v1.27.1 // indirect diff --git a/go.sum b/go.sum index ae8b4e8a..31fc51ed 100644 --- a/go.sum +++ b/go.sum @@ -426,6 +426,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs= +github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 h1:NHrXEjTNQY7P0Zfx1aMrNhpgxHmow66XQtm0aQLY0AE= +github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249/go.mod h1:mpRZBD8SJ55OIICQ3iWH0Yz3cjzA61JdqMLoWXeB2+8= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= From db0f50292e0e0a16ed9723711911cbaed3d7713a Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Mon, 27 Feb 2023 14:55:07 +0000 Subject: [PATCH 03/11] Allow for indices to be recreated where mappings are not strict supersets --- es/resource_elasticsearch_index.go | 24 ++++++++--------- es/resource_elasticsearch_index_test.go | 36 +++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go index 25d34827..b967d046 100644 --- a/es/resource_elasticsearch_index.go +++ b/es/resource_elasticsearch_index.go @@ -419,6 +419,7 @@ func resourceElasticsearchIndex() *schema.Resource { Update: resourceElasticsearchIndexUpdate, Delete: resourceElasticsearchIndexDelete, Schema: configSchema, + CustomizeDiff: verifyIndexMappingUpdates, Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, @@ -679,14 +680,6 @@ func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{}) } } - o, n := d.GetChange("mappings") - difference, _ := jsondiff.Compare([]byte(n.(string)), []byte(o.(string)), &jsondiff.Options{}) - - // if we're not changing any settings, no-op this function - if len(settings) == 0 && difference == jsondiff.FullMatch { - return resourceElasticsearchIndexRead(d, meta) - } - if len(settings) != 0 { err = updateIndexSettings(d, meta, settings) } @@ -694,10 +687,8 @@ func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{}) return err } - if difference == jsondiff.SupersetMatch { - err = updateIndexMappings(d, meta, n.(string)) - } - if err != nil { + mappings := d.Get("mappings") + if err = updateIndexMappings(d, meta, mappings.(string)); err != nil { return err } @@ -758,6 +749,15 @@ func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping strin return err } +func verifyIndexMappingUpdates(ctx context.Context, resourceDiff *schema.ResourceDiff, meta interface{}) error { + oldMapping, newMapping := resourceDiff.GetChange("mappings") + difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{}) + if difference == jsondiff.NoMatch { + return resourceDiff.ForceNew("mappings") + } + return nil +} + func getWriteIndexByAlias(alias string, d *schema.ResourceData, meta interface{}) string { var ( index = d.Id() diff --git a/es/resource_elasticsearch_index_test.go b/es/resource_elasticsearch_index_test.go index 0843ac2b..c94c25af 100644 --- a/es/resource_elasticsearch_index_test.go +++ b/es/resource_elasticsearch_index_test.go @@ -191,6 +191,22 @@ resource "elasticsearch_index" "test_mapping" { } EOF } +` + testAccElasticsearchRemovedMapping = ` +resource "elasticsearch_index" "test_mapping" { + name = "terraform-test" + number_of_replicas = "1" + include_type_name = false + mappings = < Date: Mon, 27 Feb 2023 15:13:37 +0000 Subject: [PATCH 04/11] Fix indentation to be consistent --- es/resource_elasticsearch_index.go | 150 ++++++------ es/resource_elasticsearch_index_test.go | 296 ++++++++++++------------ 2 files changed, 223 insertions(+), 223 deletions(-) diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go index b967d046..df7839d0 100644 --- a/es/resource_elasticsearch_index.go +++ b/es/resource_elasticsearch_index.go @@ -419,7 +419,7 @@ func resourceElasticsearchIndex() *schema.Resource { Update: resourceElasticsearchIndexUpdate, Delete: resourceElasticsearchIndexDelete, Schema: configSchema, - CustomizeDiff: verifyIndexMappingUpdates, + CustomizeDiff: verifyIndexMappingUpdates, Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, @@ -671,91 +671,91 @@ func allowIndexDestroy(indexName string, d *schema.ResourceData, meta interface{ } func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{}) error { - var err error - settings := make(map[string]interface{}) - for _, key := range settingsKeys { - schemaName := strings.Replace(key, ".", "_", -1) - if d.HasChange(schemaName) { - settings[key] = d.Get(schemaName) - } - } - - if len(settings) != 0 { - err = updateIndexSettings(d, meta, settings) - } - if err != nil { - return err - } - - mappings := d.Get("mappings") - if err = updateIndexMappings(d, meta, mappings.(string)); err != nil { - return err - } - - return resourceElasticsearchIndexRead(d, meta.(*ProviderConf)) + var err error + settings := make(map[string]interface{}) + for _, key := range settingsKeys { + schemaName := strings.Replace(key, ".", "_", -1) + if d.HasChange(schemaName) { + settings[key] = d.Get(schemaName) + } + } + + if len(settings) != 0 { + err = updateIndexSettings(d, meta, settings) + } + if err != nil { + return err + } + + mappings := d.Get("mappings") + if err = updateIndexMappings(d, meta, mappings.(string)); err != nil { + return err + } + + return resourceElasticsearchIndexRead(d, meta.(*ProviderConf)) } func updateIndexSettings(d *schema.ResourceData, meta interface{}, settings map[string]interface{}) error { - body := map[string]interface{}{ - // Note you do not have to explicitly specify the `index` section inside - // the `settings` section - "settings": settings, - } - - var ( - name = d.Id() - ctx = context.Background() - err error - ) - - if alias, ok := d.GetOk("rollover_alias"); ok { - name = getWriteIndexByAlias(alias.(string), d, meta) - } - - esClient, err := getClient(meta.(*ProviderConf)) - if err != nil { - return err - } - switch client := esClient.(type) { - case *elastic7.Client: - _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) - case *elastic6.Client: - _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) - default: - return errors.New("Elasticsearch version not supported") -} - return err + body := map[string]interface{}{ + // Note you do not have to explicitly specify the `index` section inside + // the `settings` section + "settings": settings, + } + + var ( + name = d.Id() + ctx = context.Background() + err error + ) + + if alias, ok := d.GetOk("rollover_alias"); ok { + name = getWriteIndexByAlias(alias.(string), d, meta) + } + + esClient, err := getClient(meta.(*ProviderConf)) + if err != nil { + return err + } + switch client := esClient.(type) { + case *elastic7.Client: + _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) + case *elastic6.Client: + _, err = client.IndexPutSettings(name).BodyJson(body).Do(ctx) + default: + return errors.New("Elasticsearch version not supported") + } + return err } func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping string) error { - var ( - name = d.Id() - ctx = context.Background() - err error - ) - esClient, err := getClient(meta.(*ProviderConf)) - if err != nil { - return err - } - switch client := esClient.(type) { - case *elastic7.Client: - _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx) - case *elastic6.Client: - _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx) - default: - return errors.New("Elasticsearch version not supported") + var ( + name = d.Id() + ctx = context.Background() + err error + ) + esClient, err := getClient(meta.(*ProviderConf)) + if err != nil { + return err + } + switch client := esClient.(type) { + case *elastic7.Client: + _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx) + case *elastic6.Client: + _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx) + default: + return errors.New("Elasticsearch version not supported") } - return err + return err } func verifyIndexMappingUpdates(ctx context.Context, resourceDiff *schema.ResourceDiff, meta interface{}) error { - oldMapping, newMapping := resourceDiff.GetChange("mappings") - difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{}) - if difference == jsondiff.NoMatch { - return resourceDiff.ForceNew("mappings") - } - return nil + oldMapping, newMapping := resourceDiff.GetChange("mappings") + difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{}) + if difference == jsondiff.NoMatch { + return resourceDiff.ForceNew("mappings") + } + return nil } func getWriteIndexByAlias(alias string, d *schema.ResourceData, meta interface{}) string { diff --git a/es/resource_elasticsearch_index_test.go b/es/resource_elasticsearch_index_test.go index c94c25af..82560a81 100644 --- a/es/resource_elasticsearch_index_test.go +++ b/es/resource_elasticsearch_index_test.go @@ -500,95 +500,95 @@ func TestAccElasticsearchIndex_doctype(t *testing.T) { } func TestAccElasticsearchIndex_mapping(t *testing.T) { - g := NewGomegaWithT(t) - provider := Provider() - diags := provider.Configure(context.Background(), &terraform.ResourceConfig{}) - if diags.HasError() { - t.Skipf("err: %#v", diags) - } - - var initialUUID string - var err error + g := NewGomegaWithT(t) + provider := Provider() + diags := provider.Configure(context.Background(), &terraform.ResourceConfig{}) + if diags.HasError() { + t.Skipf("err: %#v", diags) + } - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: checkElasticsearchIndexDestroy, - Steps: []resource.TestStep{ - { - Config: testAccElasticsearchBasicMapping, - Check: resource.ComposeTestCheckFunc( - checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - initialUUID, err = getElasticsearchIndexUUID("elasticsearch_index.test_mapping", s) - if err != nil { - return fmt.Errorf("Failed to get index uuid: %w", err) - } - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "age": MatchAllKeys(Keys{ - "type": Equal("integer"), - }), - "name": MatchAllKeys(Keys{ - "type": Equal("text"), - }), - }), - }), - }), - })) - return nil - }), - ), - }, - { - Config: testAccElasticsearchAddedMapping, - Check: resource.ComposeTestCheckFunc( - checkElasticsearchIndexNotRecreated("elasticsearch_index.test_mapping", &initialUUID), - checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "age": MatchAllKeys(Keys{ - "type": Equal("integer"), - }), - "name": MatchAllKeys(Keys{ - "type": Equal("text"), - }), - "surname": MatchAllKeys(Keys{ - "type": Equal("text"), - }), - }), - }), - }), - })) - return nil - }), - ), - }, - { - Config: testAccElasticsearchRemovedMapping, - Check: resource.ComposeTestCheckFunc( - checkElasticsearchIndexRecreated("elasticsearch_index.test_mapping", &initialUUID), - checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "name": MatchAllKeys(Keys{ - "type": Equal("text"), - }), - }), - }), - }), - })) - return nil - }), - ), - }, - }, - }) + var initialUUID string + var err error + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: checkElasticsearchIndexDestroy, + Steps: []resource.TestStep{ + { + Config: testAccElasticsearchBasicMapping, + Check: resource.ComposeTestCheckFunc( + checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { + initialUUID, err = getElasticsearchIndexUUID("elasticsearch_index.test_mapping", s) + if err != nil { + return fmt.Errorf("Failed to get index uuid: %w", err) + } + g.Expect(mapping).To(MatchAllKeys(Keys{ + "terraform-test": MatchAllKeys(Keys{ + "mappings": MatchAllKeys(Keys{ + "properties": MatchAllKeys(Keys{ + "age": MatchAllKeys(Keys{ + "type": Equal("integer"), + }), + "name": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + }), + }), + }), + })) + return nil + }), + ), + }, + { + Config: testAccElasticsearchAddedMapping, + Check: resource.ComposeTestCheckFunc( + checkElasticsearchIndexNotRecreated("elasticsearch_index.test_mapping", &initialUUID), + checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { + g.Expect(mapping).To(MatchAllKeys(Keys{ + "terraform-test": MatchAllKeys(Keys{ + "mappings": MatchAllKeys(Keys{ + "properties": MatchAllKeys(Keys{ + "age": MatchAllKeys(Keys{ + "type": Equal("integer"), + }), + "name": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + "surname": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + }), + }), + }), + })) + return nil + }), + ), + }, + { + Config: testAccElasticsearchRemovedMapping, + Check: resource.ComposeTestCheckFunc( + checkElasticsearchIndexRecreated("elasticsearch_index.test_mapping", &initialUUID), + checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { + g.Expect(mapping).To(MatchAllKeys(Keys{ + "terraform-test": MatchAllKeys(Keys{ + "mappings": MatchAllKeys(Keys{ + "properties": MatchAllKeys(Keys{ + "name": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + }), + }), + }), + })) + return nil + }), + ), + }, + }, + }) } func TestAccElasticsearchIndex_rolloverAliasXpack(t *testing.T) { @@ -670,41 +670,41 @@ func TestAccElasticsearchIndex_rolloverAliasOpendistro(t *testing.T) { } func getElasticsearchIndex(name string, s *terraform.State) (map[string]interface{}, error) { - rs, ok := s.RootModule().Resources[name] - if !ok { - return nil, fmt.Errorf("not found: %s", name) - } - if rs.Primary.ID == "" { - return nil, fmt.Errorf("index ID not set") - } + rs, ok := s.RootModule().Resources[name] + if !ok { + return nil, fmt.Errorf("not found: %s", name) + } + if rs.Primary.ID == "" { + return nil, fmt.Errorf("index ID not set") + } - meta := testAccProvider.Meta() - var settings map[string]interface{} + meta := testAccProvider.Meta() + var settings map[string]interface{} - var err error - esClient, err := getClient(meta.(*ProviderConf)) - if err != nil { - return nil, err - } - switch client := esClient.(type) { - case *elastic7.Client: - resp, err := client.IndexGetSettings(rs.Primary.ID).Do(context.TODO()) - if err != nil { - return nil, err - } - settings = resp[rs.Primary.ID].Settings["index"].(map[string]interface{}) + var err error + esClient, err := getClient(meta.(*ProviderConf)) + if err != nil { + return nil, err + } + switch client := esClient.(type) { + case *elastic7.Client: + resp, err := client.IndexGetSettings(rs.Primary.ID).Do(context.TODO()) + if err != nil { + return nil, err + } + settings = resp[rs.Primary.ID].Settings["index"].(map[string]interface{}) - case *elastic6.Client: - resp, err := client.IndexGetSettings(rs.Primary.ID).Do(context.TODO()) - if err != nil { - return nil, err - } - settings = resp[rs.Primary.ID].Settings["index"].(map[string]interface{}) + case *elastic6.Client: + resp, err := client.IndexGetSettings(rs.Primary.ID).Do(context.TODO()) + if err != nil { + return nil, err + } + settings = resp[rs.Primary.ID].Settings["index"].(map[string]interface{}) - default: - return nil, errors.New("Elasticsearch version not supported") - } - return settings, nil + default: + return nil, errors.New("Elasticsearch version not supported") + } + return settings, nil } func checkElasticsearchIndexExists(name string) resource.TestCheckFunc { @@ -715,37 +715,37 @@ func checkElasticsearchIndexExists(name string) resource.TestCheckFunc { } func getElasticsearchIndexUUID(name string, s *terraform.State) (string, error) { - index, err := getElasticsearchIndex(name, s) - if err != nil { - return "", fmt.Errorf("failed to get index %s: %w", name, err) - } - return index["uuid"].(string), err + index, err := getElasticsearchIndex(name, s) + if err != nil { + return "", fmt.Errorf("failed to get index %s: %w", name, err) + } + return index["uuid"].(string), err } func checkElasticsearchIndexRecreated(name string, initialIndexUUID *string) resource.TestCheckFunc { - return func(s *terraform.State) error { - newUUID, err := getElasticsearchIndexUUID(name, s) - if err != nil { - return fmt.Errorf("failed to get index UUID for %s: %w", name, err) - } - if newUUID == *initialIndexUUID { - return fmt.Errorf("index was not recreated where it was expected to: initial index UUID %s matches post-update index UUID %s", *initialIndexUUID, newUUID) - } - return nil - } + return func(s *terraform.State) error { + newUUID, err := getElasticsearchIndexUUID(name, s) + if err != nil { + return fmt.Errorf("failed to get index UUID for %s: %w", name, err) + } + if newUUID == *initialIndexUUID { + return fmt.Errorf("index was not recreated where it was expected to: initial index UUID %s matches post-update index UUID %s", *initialIndexUUID, newUUID) + } + return nil + } } func checkElasticsearchIndexNotRecreated(name string, initialIndexUUID *string) resource.TestCheckFunc { - return func(s *terraform.State) error { - newUUID, err := getElasticsearchIndexUUID(name, s) - if err != nil { - return fmt.Errorf("failed to get index UUID for %s: %w", name, err) - } - if newUUID != *initialIndexUUID { - return fmt.Errorf("index was recreated where it was not expected to: initial index UUID %s does not match post-update index UUID %s", *initialIndexUUID, newUUID) - } - return nil - } + return func(s *terraform.State) error { + newUUID, err := getElasticsearchIndexUUID(name, s) + if err != nil { + return fmt.Errorf("failed to get index UUID for %s: %w", name, err) + } + if newUUID != *initialIndexUUID { + return fmt.Errorf("index was recreated where it was not expected to: initial index UUID %s does not match post-update index UUID %s", *initialIndexUUID, newUUID) + } + return nil + } } func checkElasticsearchIndexMapping(name string, mappingChecker func(s *terraform.State, mapping map[string]interface{}) error) resource.TestCheckFunc { @@ -757,25 +757,25 @@ func checkElasticsearchIndexMapping(name string, mappingChecker func(s *terrafor if err != nil { return err } - var mapping map[string]interface{} + var mapping map[string]interface{} switch client := esClient.(type) { case *elastic7.Client: mapping, err = client.GetMapping().Index(name).Do(context.TODO()) if err != nil { - return fmt.Errorf("failed to find mapping for index %s: %w", name, err) + return fmt.Errorf("failed to find mapping for index %s: %w", name, err) } case *elastic6.Client: mapping, err = client.GetMapping().Index(name).Do(context.TODO()) if err != nil { - return fmt.Errorf("failed to find mapping for index %s: %w", name, err) + return fmt.Errorf("failed to find mapping for index %s: %w", name, err) } default: return errors.New("Elasticsearch version not supported") } - return mappingChecker(s, mapping) + return mappingChecker(s, mapping) } } From a2d05144f466798a34f02a1ba2a71d74755d599d Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Mon, 27 Feb 2023 15:15:02 +0000 Subject: [PATCH 05/11] Update docs for mapping schema fields --- es/resource_elasticsearch_index.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go index df7839d0..d274fad3 100644 --- a/es/resource_elasticsearch_index.go +++ b/es/resource_elasticsearch_index.go @@ -354,7 +354,7 @@ var ( // Other attributes "mappings": { Type: schema.TypeString, - Description: "A JSON string defining how documents in the index, and the fields they contain, are stored and indexed. To avoid the complexities of field mapping updates, updates of this field are not allowed via this provider. See the upstream [Elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-put-mapping.html#updating-field-mappings) for more details.", + Description: "A JSON string defining how documents in the index, and the fields they contain, are stored and indexed. Mappings may be updated on an existing index only if adding a new field to an existing mapping. See the upstream [Elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-put-mapping.html#updating-field-mappings) for more details.", Optional: true, ValidateFunc: validation.StringIsJSON, }, From a7501136658e635937bc2db7da3bb50b5a95f3b4 Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Mon, 27 Feb 2023 15:50:04 +0000 Subject: [PATCH 06/11] Only PUT mappings if there is actually a change --- es/resource_elasticsearch_index.go | 12 ++++++++---- go.mod | 1 + go.sum | 2 ++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go index d274fad3..6ddf4ef6 100644 --- a/es/resource_elasticsearch_index.go +++ b/es/resource_elasticsearch_index.go @@ -687,9 +687,10 @@ func resourceElasticsearchIndexUpdate(d *schema.ResourceData, meta interface{}) return err } - mappings := d.Get("mappings") - if err = updateIndexMappings(d, meta, mappings.(string)); err != nil { - return err + if d.HasChange("mappings") { + if err = updateIndexMappings(d, meta, d.Get("mappings").(string)); err != nil { + return err + } } return resourceElasticsearchIndexRead(d, meta.(*ProviderConf)) @@ -750,9 +751,12 @@ func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping strin } func verifyIndexMappingUpdates(ctx context.Context, resourceDiff *schema.ResourceDiff, meta interface{}) error { + if !resourceDiff.HasChange("mappings") { + return nil + } oldMapping, newMapping := resourceDiff.GetChange("mappings") difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{}) - if difference == jsondiff.NoMatch { + if difference > jsondiff.SupersetMatch { return resourceDiff.ForceNew("mappings") } return nil diff --git a/go.mod b/go.mod index ab817bec..416ed4b5 100644 --- a/go.mod +++ b/go.mod @@ -18,5 +18,6 @@ require ( github.com/olivere/elastic v6.2.26+incompatible github.com/olivere/elastic/v7 v7.0.32 github.com/onsi/gomega v1.27.1 // indirect + github.com/spf13/viper v1.7.0 // indirect gopkg.in/olivere/elastic.v6 v6.2.37 ) diff --git a/go.sum b/go.sum index 31fc51ed..1721947e 100644 --- a/go.sum +++ b/go.sum @@ -846,6 +846,7 @@ golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -961,6 +962,7 @@ 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 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= 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= From d1d3bdbb2cfa049437491f9101d64fa4695cf168 Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Tue, 28 Feb 2023 12:19:41 +0000 Subject: [PATCH 07/11] Add handling of empty mapping string Co-authored-by: Rahul De --- es/resource_elasticsearch_index.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go index 6ddf4ef6..e42f4281 100644 --- a/es/resource_elasticsearch_index.go +++ b/es/resource_elasticsearch_index.go @@ -754,9 +754,19 @@ func verifyIndexMappingUpdates(ctx context.Context, resourceDiff *schema.Resourc if !resourceDiff.HasChange("mappings") { return nil } + oldMapping, newMapping := resourceDiff.GetChange("mappings") - difference, _ := jsondiff.Compare([]byte(newMapping.(string)), []byte(oldMapping.(string)), &jsondiff.Options{}) - if difference > jsondiff.SupersetMatch { + oldMappingStr := oldMapping.(string) + if len(oldMappingStr) == 0 { + oldMappingStr = "{}" + } + newMappingStr := newMapping.(string) + if len(newMappingStr) == 0 { + newMappingStr = "{}" + } + difference, _ := jsondiff.Compare([]byte(newMappingStr), []byte(oldMappingStr), &jsondiff.Options{}) + // The new mapping is not a superset of the old mapping, therefore the index requires recreation + if difference == jsondiff.NoMatch { return resourceDiff.ForceNew("mappings") } return nil From 4bf689ef7af5e2c379f0e6d272f16d0987ff142b Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Wed, 1 Mar 2023 10:53:08 +0000 Subject: [PATCH 08/11] Fix gofmt non-compliance --- es/resource_elasticsearch_index.go | 14 +- es/resource_elasticsearch_index_test.go | 170 ++++++++++++------------ 2 files changed, 92 insertions(+), 92 deletions(-) diff --git a/es/resource_elasticsearch_index.go b/es/resource_elasticsearch_index.go index e42f4281..e4cb31d4 100644 --- a/es/resource_elasticsearch_index.go +++ b/es/resource_elasticsearch_index.go @@ -413,12 +413,12 @@ var ( func resourceElasticsearchIndex() *schema.Resource { return &schema.Resource{ - Description: "Provides an Elasticsearch index resource.", - Create: resourceElasticsearchIndexCreate, - Read: resourceElasticsearchIndexRead, - Update: resourceElasticsearchIndexUpdate, - Delete: resourceElasticsearchIndexDelete, - Schema: configSchema, + Description: "Provides an Elasticsearch index resource.", + Create: resourceElasticsearchIndexCreate, + Read: resourceElasticsearchIndexRead, + Update: resourceElasticsearchIndexUpdate, + Delete: resourceElasticsearchIndexDelete, + Schema: configSchema, CustomizeDiff: verifyIndexMappingUpdates, Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, @@ -745,7 +745,7 @@ func updateIndexMappings(d *schema.ResourceData, meta interface{}, mapping strin _, err = client.PutMapping().Index(name).BodyString(mapping).Do(ctx) default: return errors.New("Elasticsearch version not supported") -} + } return err } diff --git a/es/resource_elasticsearch_index_test.go b/es/resource_elasticsearch_index_test.go index 82560a81..9e53c875 100644 --- a/es/resource_elasticsearch_index_test.go +++ b/es/resource_elasticsearch_index_test.go @@ -500,95 +500,95 @@ func TestAccElasticsearchIndex_doctype(t *testing.T) { } func TestAccElasticsearchIndex_mapping(t *testing.T) { - g := NewGomegaWithT(t) - provider := Provider() - diags := provider.Configure(context.Background(), &terraform.ResourceConfig{}) - if diags.HasError() { - t.Skipf("err: %#v", diags) - } + g := NewGomegaWithT(t) + provider := Provider() + diags := provider.Configure(context.Background(), &terraform.ResourceConfig{}) + if diags.HasError() { + t.Skipf("err: %#v", diags) + } - var initialUUID string - var err error - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: checkElasticsearchIndexDestroy, - Steps: []resource.TestStep{ - { - Config: testAccElasticsearchBasicMapping, - Check: resource.ComposeTestCheckFunc( - checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - initialUUID, err = getElasticsearchIndexUUID("elasticsearch_index.test_mapping", s) - if err != nil { - return fmt.Errorf("Failed to get index uuid: %w", err) - } - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "age": MatchAllKeys(Keys{ - "type": Equal("integer"), - }), - "name": MatchAllKeys(Keys{ - "type": Equal("text"), - }), - }), - }), - }), - })) - return nil - }), - ), - }, - { - Config: testAccElasticsearchAddedMapping, - Check: resource.ComposeTestCheckFunc( - checkElasticsearchIndexNotRecreated("elasticsearch_index.test_mapping", &initialUUID), - checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "age": MatchAllKeys(Keys{ - "type": Equal("integer"), - }), - "name": MatchAllKeys(Keys{ - "type": Equal("text"), + var initialUUID string + var err error + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: checkElasticsearchIndexDestroy, + Steps: []resource.TestStep{ + { + Config: testAccElasticsearchBasicMapping, + Check: resource.ComposeTestCheckFunc( + checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { + initialUUID, err = getElasticsearchIndexUUID("elasticsearch_index.test_mapping", s) + if err != nil { + return fmt.Errorf("Failed to get index uuid: %w", err) + } + g.Expect(mapping).To(MatchAllKeys(Keys{ + "terraform-test": MatchAllKeys(Keys{ + "mappings": MatchAllKeys(Keys{ + "properties": MatchAllKeys(Keys{ + "age": MatchAllKeys(Keys{ + "type": Equal("integer"), + }), + "name": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + }), + }), + }), + })) + return nil }), - "surname": MatchAllKeys(Keys{ - "type": Equal("text"), + ), + }, + { + Config: testAccElasticsearchAddedMapping, + Check: resource.ComposeTestCheckFunc( + checkElasticsearchIndexNotRecreated("elasticsearch_index.test_mapping", &initialUUID), + checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { + g.Expect(mapping).To(MatchAllKeys(Keys{ + "terraform-test": MatchAllKeys(Keys{ + "mappings": MatchAllKeys(Keys{ + "properties": MatchAllKeys(Keys{ + "age": MatchAllKeys(Keys{ + "type": Equal("integer"), + }), + "name": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + "surname": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + }), + }), + }), + })) + return nil }), - }), - }), - }), - })) - return nil - }), - ), - }, - { - Config: testAccElasticsearchRemovedMapping, - Check: resource.ComposeTestCheckFunc( - checkElasticsearchIndexRecreated("elasticsearch_index.test_mapping", &initialUUID), - checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "name": MatchAllKeys(Keys{ - "type": Equal("text"), + ), + }, + { + Config: testAccElasticsearchRemovedMapping, + Check: resource.ComposeTestCheckFunc( + checkElasticsearchIndexRecreated("elasticsearch_index.test_mapping", &initialUUID), + checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { + g.Expect(mapping).To(MatchAllKeys(Keys{ + "terraform-test": MatchAllKeys(Keys{ + "mappings": MatchAllKeys(Keys{ + "properties": MatchAllKeys(Keys{ + "name": MatchAllKeys(Keys{ + "type": Equal("text"), + }), + }), + }), + }), + })) + return nil }), - }), - }), - }), - })) - return nil - }), - ), - }, - }, - }) + ), + }, + }, + }) } func TestAccElasticsearchIndex_rolloverAliasXpack(t *testing.T) { From fc279abc748f080e82e310fc488757d6c82176ca Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Thu, 2 Mar 2023 09:22:28 +0000 Subject: [PATCH 09/11] Go mod tidy to fix linting issues --- go.mod | 6 ++---- go.sum | 19 +++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 416ed4b5..0b5ff21b 100644 --- a/go.mod +++ b/go.mod @@ -12,12 +12,10 @@ require ( github.com/hashicorp/terraform-plugin-docs v0.4.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.0 github.com/katbyte/terrafmt v0.4.0 - github.com/mattn/go-isatty v0.0.12 // indirect github.com/mitchellh/go-homedir v1.1.0 - github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 // indirect + github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 github.com/olivere/elastic v6.2.26+incompatible github.com/olivere/elastic/v7 v7.0.32 - github.com/onsi/gomega v1.27.1 // indirect - github.com/spf13/viper v1.7.0 // indirect + github.com/onsi/gomega v1.27.1 gopkg.in/olivere/elastic.v6 v6.2.37 ) diff --git a/go.sum b/go.sum index 1721947e..84acff1f 100644 --- a/go.sum +++ b/go.sum @@ -152,6 +152,7 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -187,7 +188,6 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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/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/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= @@ -205,7 +205,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -424,7 +423,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs= github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 h1:NHrXEjTNQY7P0Zfx1aMrNhpgxHmow66XQtm0aQLY0AE= github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249/go.mod h1:mpRZBD8SJ55OIICQ3iWH0Yz3cjzA61JdqMLoWXeB2+8= @@ -439,6 +437,7 @@ github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5Bn github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= @@ -447,6 +446,7 @@ github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8Ay github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= +github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -597,7 +597,6 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= @@ -631,12 +630,12 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -681,7 +680,6 @@ golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5o golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -710,6 +708,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -760,7 +759,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -773,7 +771,6 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -788,7 +785,6 @@ 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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -839,7 +835,6 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f h1:33yHANSyO/TeglgY9rBhUpX43wtonTXoFOsMRtNB6qE= golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= @@ -850,7 +845,6 @@ golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -930,7 +924,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= @@ -960,11 +953,9 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -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= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 17245f5f17201567bca9063a9a09f62dafb75889 Mon Sep 17 00:00:00 2001 From: Connor Rogers <23215294+coro@users.noreply.github.com> Date: Wed, 22 Mar 2023 13:50:56 +0000 Subject: [PATCH 10/11] Remove dot imports to fix golangci-lint --- es/resource_elasticsearch_index_test.go | 54 ++++++++++++------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/es/resource_elasticsearch_index_test.go b/es/resource_elasticsearch_index_test.go index 9e53c875..d26ad58b 100644 --- a/es/resource_elasticsearch_index_test.go +++ b/es/resource_elasticsearch_index_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - . "github.com/onsi/gomega" - . "github.com/onsi/gomega/gstruct" + "github.com/onsi/gomega" + "github.com/onsi/gomega/gstruct" elastic7 "github.com/olivere/elastic/v7" elastic6 "gopkg.in/olivere/elastic.v6" @@ -500,7 +500,7 @@ func TestAccElasticsearchIndex_doctype(t *testing.T) { } func TestAccElasticsearchIndex_mapping(t *testing.T) { - g := NewGomegaWithT(t) + g := gomega.NewGomegaWithT(t) provider := Provider() diags := provider.Configure(context.Background(), &terraform.ResourceConfig{}) if diags.HasError() { @@ -523,15 +523,15 @@ func TestAccElasticsearchIndex_mapping(t *testing.T) { if err != nil { return fmt.Errorf("Failed to get index uuid: %w", err) } - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "age": MatchAllKeys(Keys{ - "type": Equal("integer"), + g.Expect(mapping).To(gstruct.MatchAllKeys(gstruct.Keys{ + "terraform-test": gstruct.MatchAllKeys(gstruct.Keys{ + "mappings": gstruct.MatchAllKeys(gstruct.Keys{ + "properties": gstruct.MatchAllKeys(gstruct.Keys{ + "age": gstruct.MatchAllKeys(gstruct.Keys{ + "type": gomega.Equal("integer"), }), - "name": MatchAllKeys(Keys{ - "type": Equal("text"), + "name": gstruct.MatchAllKeys(gstruct.Keys{ + "type": gomega.Equal("text"), }), }), }), @@ -546,18 +546,18 @@ func TestAccElasticsearchIndex_mapping(t *testing.T) { Check: resource.ComposeTestCheckFunc( checkElasticsearchIndexNotRecreated("elasticsearch_index.test_mapping", &initialUUID), checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "age": MatchAllKeys(Keys{ - "type": Equal("integer"), + g.Expect(mapping).To(gstruct.MatchAllKeys(gstruct.Keys{ + "terraform-test": gstruct.MatchAllKeys(gstruct.Keys{ + "mappings": gstruct.MatchAllKeys(gstruct.Keys{ + "properties": gstruct.MatchAllKeys(gstruct.Keys{ + "age": gstruct.MatchAllKeys(gstruct.Keys{ + "type": gomega.Equal("integer"), }), - "name": MatchAllKeys(Keys{ - "type": Equal("text"), + "name": gstruct.MatchAllKeys(gstruct.Keys{ + "type": gomega.Equal("text"), }), - "surname": MatchAllKeys(Keys{ - "type": Equal("text"), + "surname": gstruct.MatchAllKeys(gstruct.Keys{ + "type": gomega.Equal("text"), }), }), }), @@ -572,12 +572,12 @@ func TestAccElasticsearchIndex_mapping(t *testing.T) { Check: resource.ComposeTestCheckFunc( checkElasticsearchIndexRecreated("elasticsearch_index.test_mapping", &initialUUID), checkElasticsearchIndexMapping("terraform-test", func(s *terraform.State, mapping map[string]interface{}) error { - g.Expect(mapping).To(MatchAllKeys(Keys{ - "terraform-test": MatchAllKeys(Keys{ - "mappings": MatchAllKeys(Keys{ - "properties": MatchAllKeys(Keys{ - "name": MatchAllKeys(Keys{ - "type": Equal("text"), + g.Expect(mapping).To(gstruct.MatchAllKeys(gstruct.Keys{ + "terraform-test": gstruct.MatchAllKeys(gstruct.Keys{ + "mappings": gstruct.MatchAllKeys(gstruct.Keys{ + "properties": gstruct.MatchAllKeys(gstruct.Keys{ + "name": gstruct.MatchAllKeys(gstruct.Keys{ + "type": gomega.Equal("text"), }), }), }), From a5be4bd5e8c58319c337788c0855fd8226092dd6 Mon Sep 17 00:00:00 2001 From: Phillip Baker Date: Sat, 1 Apr 2023 14:38:09 -0400 Subject: [PATCH 11/11] require go 1.18 --- .github/workflows/test.yml | 4 +- go.mod | 101 +++++++++++++++++++++++++++++++- go.sum | 117 ++----------------------------------- 3 files changed, 104 insertions(+), 118 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 01c2e691..65069f42 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,14 +8,14 @@ jobs: name: Runs go linters runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # we depend on full git history for linters fetch-depth: 0 - name: Setup Go uses: actions/setup-go@v3 with: - go-version: '1.17' + go-version: '1.19' - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: diff --git a/go.mod b/go.mod index 0b5ff21b..388d4478 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,12 @@ module github.com/phillbaker/terraform-provider-elasticsearch -go 1.14 +go 1.18 require ( github.com/aws/aws-sdk-go v1.43.21 github.com/deoxxa/aws_signing_client v0.0.0-20161109131055-c20ee106809e github.com/hashicorp/go-hclog v1.2.0 - github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/go-version v1.4.0 - github.com/hashicorp/hc-install v0.3.2 // indirect github.com/hashicorp/terraform-plugin-docs v0.4.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.0 github.com/katbyte/terrafmt v0.4.0 @@ -19,3 +17,100 @@ require ( github.com/onsi/gomega v1.27.1 gopkg.in/olivere/elastic.v6 v6.2.37 ) + +require ( + cloud.google.com/go v0.61.0 // indirect + cloud.google.com/go/storage v1.10.0 // indirect + github.com/Masterminds/goutils v1.1.0 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/agext/levenshtein v1.2.3 // indirect + github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 // indirect + github.com/apparentlymart/go-cidr v1.0.1 // indirect + github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect + github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bgentry/speakeasy v0.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fatih/color v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/gookit/color v1.2.6 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-checkpoint v0.5.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect + github.com/hashicorp/go-getter v1.5.3 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-plugin v1.4.1 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect + github.com/hashicorp/hc-install v0.3.2 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/hcl/v2 v2.6.0 // indirect + github.com/hashicorp/logutils v1.0.0 // indirect + github.com/hashicorp/terraform-exec v0.15.0 // indirect + github.com/hashicorp/terraform-json v0.13.0 // indirect + github.com/hashicorp/terraform-plugin-go v0.5.0 // indirect + github.com/hashicorp/terraform-plugin-log v0.2.0 // indirect + 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/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect + github.com/klauspost/compress v1.11.2 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect + github.com/magiconair/properties v1.8.1 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mitchellh/cli v1.1.2 // 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.3.3 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/oklog/run v1.0.0 // indirect + github.com/pelletier/go-toml v1.8.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/posener/complete v1.1.1 // indirect + github.com/russross/blackfriday v1.6.0 // indirect + github.com/sergi/go-diff v1.2.0 // indirect + github.com/sirupsen/logrus v1.6.0 // indirect + github.com/spf13/afero v1.4.1 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/cobra v1.0.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.7.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/ulikunitz/xz v0.5.8 // indirect + github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect + github.com/zclconf/go-cty v1.9.1 // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect + golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect + golang.org/x/tools v0.1.12 // indirect + google.golang.org/api v0.29.0 // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect + google.golang.org/grpc v1.33.2 // indirect + google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/ini.v1 v1.57.0 // indirect + gopkg.in/yaml.v2 v2.3.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum index 84acff1f..b726abca 100644 --- a/go.sum +++ b/go.sum @@ -60,14 +60,12 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE= -github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFUye+ZcSR6opIgz9Co7WcDx6ZcY+RjfFHoA0I= github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= github.com/apparentlymart/go-textseg/v12 v12.0.0 h1:bNEQyAGak9tojivJNkoqWErVCQbjdL7GzRt3F8NvfJ0= github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= @@ -78,7 +76,6 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= 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 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= 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/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -123,15 +120,12 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= 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 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= 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= @@ -140,7 +134,6 @@ github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34= github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= -github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8= github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0= github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM= github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4= @@ -151,12 +144,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -204,7 +193,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -219,7 +207,6 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -316,11 +303,9 @@ github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= @@ -378,7 +363,6 @@ github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzR github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= 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 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A= 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/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -426,8 +410,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs= github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249 h1:NHrXEjTNQY7P0Zfx1aMrNhpgxHmow66XQtm0aQLY0AE= github.com/nsf/jsondiff v0.0.0-20210926074059-1e845ec5d249/go.mod h1:mpRZBD8SJ55OIICQ3iWH0Yz3cjzA61JdqMLoWXeB2+8= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -435,32 +417,9 @@ github.com/olivere/elastic v6.2.26+incompatible h1:3PjUHKyt8xKwbFQpRC5cgtEY7Qz6e github.com/olivere/elastic v6.2.26+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E= github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= -github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= -github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0= -github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= -github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= -github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= -github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= -github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= -github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM= -github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= -github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= -github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= github.com/onsi/gomega v1.27.1 h1:rfztXRbg6nv/5f+Raen9RcGoSecHIFgBBLQK3Wdj754= github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= -github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw= @@ -503,11 +462,8 @@ github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck= -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/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -533,7 +489,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -557,13 +512,9 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1: github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.5.1/go.mod h1:nHzOclRkoj++EU9ZjSrZvRG0BXIWt8c7loYc0qXAFGQ= github.com/zclconf/go-cty v1.7.1/go.mod h1:VDR4+I79ubFBGm1uJac1226K5yANQFHeauxPBoP54+o= github.com/zclconf/go-cty v1.9.1 h1:viqrgQwFl5UpSxc046qblj78wZXVDFnSOufaOTER+cc= github.com/zclconf/go-cty v1.9.1/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= @@ -576,8 +527,6 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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= -go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= -go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -596,10 +545,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -631,17 +578,12 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= -golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -668,27 +610,14 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= 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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= 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/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -705,15 +634,9 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -729,12 +652,10 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -752,43 +673,23 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w 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-20210112080510-489259a85091/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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -835,18 +736,11 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= -golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -938,14 +832,12 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/olivere/elastic.v6 v6.2.37 h1:y1SqAL8MJvKckEOo3aZ+Ie0TDIYjrItZ9WBN3VzhoRM= gopkg.in/olivere/elastic.v6 v6.2.37/go.mod h1:2cTT8Z+/LcArSWpCgvZqBgt3VOqXiy7v00w12Lz8bd4= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= 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.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -953,9 +845,8 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=