INTMDB-341: Fix search_index update (#964)

* Fixed casing on search_index attribute casing in update. Updated formatting on test json

* More formatting of string based tf configs

Author: evertsd

mongodbatlas/resource_mongodbatlas_search_index.go

@@ -180,7 +180,7 @@ func resourceMongoDBAtlasSearchIndexUpdate(ctx context.Context, d *schema.Resour
 	}
 
 	if d.HasChange("collection_name") {
-		searchIndex.CollectionName = d.Get("collectionName").(string)
+		searchIndex.CollectionName = d.Get("collection_name").(string)
 	}
 
 	if d.HasChange("database") {
@@ -192,7 +192,7 @@ func resourceMongoDBAtlasSearchIndexUpdate(ctx context.Context, d *schema.Resour
 	}
 
 	if d.HasChange("search_analyzer") {
-		searchIndex.SearchAnalyzer = d.Get("searchAnalyzer").(string)
+		searchIndex.SearchAnalyzer = d.Get("search_analyzer").(string)
 	}
 
 	if d.HasChange("mappings_dynamic") {

mongodbatlas/resource_mongodbatlas_search_index_test.go

@@ -162,39 +162,35 @@ func testAccMongoDBAtlasSearchIndexConfig(projectID, clusterName string) string
 			project_id   = "%[1]s"
 			name         = "%[2]s"
 			disk_size_gb = 10
-
+		
 			cluster_type = "REPLICASET"
 			replication_specs {
-			  num_shards = 1
-			  regions_config {
-				 region_name     = "US_EAST_2"
-				 electable_nodes = 3
-				 priority        = 7
-				 read_only_nodes = 0
-			   }
+				num_shards = 1
+				regions_config {
+					region_name     = "US_EAST_2"
+					electable_nodes = 3
+					priority        = 7
+					read_only_nodes = 0
+				}
 			}
-
 			backup_enabled               = false
 			auto_scaling_disk_gb_enabled = false
-
+		
 			// Provider Settings "block"
 			provider_name               = "AWS"
 			provider_instance_size_name = "M10"
-
 		}
 
 		resource "mongodbatlas_search_index" "test" {
-			project_id         = mongodbatlas_cluster.aws_conf.project_id
-			cluster_name       = mongodbatlas_cluster.aws_conf.name
-			analyzer = "lucene.simple"
-			collection_name = "collection_test"
-			database = "database_test"
+			project_id       = mongodbatlas_cluster.aws_conf.project_id
+			cluster_name     = mongodbatlas_cluster.aws_conf.name
+			analyzer         = "lucene.simple"
+			collection_name  = "collection_test"
+			database         = "database_test"
 			mappings_dynamic = "true"
-			name = "name_test"
-			search_analyzer = "lucene.standard"
+			name             = "name_test"
+			search_analyzer  = "lucene.standard"
 		}
-
-	
 	`, projectID, clusterName)
 }
 
@@ -207,13 +203,13 @@ func testAccMongoDBAtlasSearchIndexConfigAdvanced(projectID, clusterName string)
 
 			cluster_type = "REPLICASET"
 			replication_specs {
-			  num_shards = 1
-			  regions_config {
-				 region_name     = "US_EAST_2"
-				 electable_nodes = 3
-				 priority        = 7
-				 read_only_nodes = 0
-			   }
+				num_shards = 1
+				regions_config {
+					region_name     = "US_EAST_2"
+					electable_nodes = 3
+					priority        = 7
+					read_only_nodes = 0
+				}
 			}
 
 			backup_enabled               = false
@@ -226,69 +222,77 @@ func testAccMongoDBAtlasSearchIndexConfigAdvanced(projectID, clusterName string)
 		}
 
 		resource "mongodbatlas_search_index" "test" {
-			project_id         = mongodbatlas_cluster.aws_conf.project_id
-			cluster_name       = mongodbatlas_cluster.aws_conf.name
+			project_id   = mongodbatlas_cluster.aws_conf.project_id
+			cluster_name = mongodbatlas_cluster.aws_conf.name
 
-			analyzer = "lucene.simple"
-			collection_name = "collection_test"
-			database = "database_test"
+			analyzer         = "lucene.simple"
+			collection_name  = "collection_test"
+			database         = "database_test"
 			mappings_dynamic = false
-			mappings_fields = <<-EOF
-							 {
-				  "address": {
-					"type": "document",
-					"fields": {
-					  "city": {
-						"type": "string",
-						"analyzer": "lucene.simple",
-						"ignoreAbove": 255
-					  },
-					  "state": {
-						"type": "string",
-						"analyzer": "lucene.english"
-					  }
+			mappings_fields  = <<-EOF
+			{
+				"address":{
+					"type":"document",
+					"fields":{
+						"city":{
+								"type":"string",
+								"analyzer":"lucene.simple",
+								"ignoreAbove":255
+						},
+						"state":{
+								"type":"string",
+								"analyzer":"lucene.english"
+						}
 					}
-				  },
-				  "company": {
-					"type": "string",
-					"analyzer": "lucene.whitespace",
-					"multi": {
-					  "mySecondaryAnalyzer": {
-						"type": "string",
-						"analyzer": "lucene.french"
-					  }
+				},
+				"company":{
+					"type":"string",
+					"analyzer":"lucene.whitespace",
+					"multi":{
+						"mySecondaryAnalyzer":{
+							"type":"string",
+							"analyzer":"lucene.french"
+						}
 					}
-				  },
-				  "employees": {
-					"type": "string",
-					"analyzer": "lucene.standard"
-				  }
+				},
+				"employees":{
+					"type":"string",
+					"analyzer":"lucene.standard"
 				}
-   			EOF
-			name = "name_test"
-			search_analyzer = "lucene.standard"
-			analyzers = <<-EOF
-						[{
-				"name": "index_analyzer_test_name",
-				"charFilters": [{
-					"type": "mapping",
-					"mappings": {"\\" : "/"}
-				}],
-				"tokenizer": [{
-					"type": "nGram",
-					"minGram": 2,
-					"maxGram": 5
-				}],
-				"tokenFilters": [{
-				"type": "length",
-				"min": 20,
-				"max": 33
-				}]
-			}]
+			}
+			EOF
+			name             = "name_test"
+			search_analyzer  = "lucene.standard"
+			analyzers        = <<-EOF
+			[
+				{
+					"name":"index_analyzer_test_name",
+					"charFilters":[
+						 {
+								"type":"mapping",
+								"mappings":{
+									 "\\":"/"
+								}
+						 }
+					],
+					"tokenizer":[
+						 {
+								"type":"nGram",
+								"minGram":2,
+								"maxGram":5s
+						 }
+					],
+					"tokenFilters":[
+						 {
+								"type":"length",
+								"min":20,
+								"max":33
+						 }
+					]
+				}
+			]
 			EOF
 		}
-	
-	
 	`, projectID, clusterName)
 }
 
@@ -298,44 +302,42 @@ func testAccMongoDBAtlasSearchIndexConfigSynonyms(projectID, clusterName string)
 			project_id   = "%[1]s"
 			name         = "%[2]s"
 			disk_size_gb = 10
-
+		
 			cluster_type = "REPLICASET"
 			replication_specs {
-			  num_shards = 1
-			  regions_config {
-				 region_name     = "US_EAST_2"
-				 electable_nodes = 3
-				 priority        = 7
-				 read_only_nodes = 0
-			   }
+				num_shards = 1
+				regions_config {
+					region_name     = "US_EAST_2"
+					electable_nodes = 3
+					priority        = 7
+					read_only_nodes = 0
+				}
 			}
-
+		
 			backup_enabled               = false
 			auto_scaling_disk_gb_enabled = false
-
+		
 			// Provider Settings "block"
 			provider_name               = "AWS"
 			provider_instance_size_name = "M10"
-
+		
 		}
-
+		
 		resource "mongodbatlas_search_index" "test" {
-			project_id         = mongodbatlas_cluster.test_cluster.project_id
-			cluster_name       = mongodbatlas_cluster.test_cluster.name
-			analyzer = "lucene.standard"
-			collection_name = "collection_test"
-			database = "database_test"
+			project_id       = mongodbatlas_cluster.test_cluster.project_id
+			cluster_name     = mongodbatlas_cluster.test_cluster.name
+			analyzer         = "lucene.standard"
+			collection_name  = "collection_test"
+			database         = "database_test"
 			mappings_dynamic = "true"
-			name = "name_test"
-			search_analyzer = "lucene.standard"
+			name             = "name_test"
+			search_analyzer  = "lucene.standard"
 			synonyms {
-				analyzer = "lucene.simple"
-				name = "synonym_test"
+				analyzer          = "lucene.simple"
+				name              = "synonym_test"
 				source_collection = "collection_test"
 			}
 		}
-	
-	
 	`, projectID, clusterName)
 }