cosmosdb_mongo_collection - support `index` & `system_index` #6426

neil-yechenwei · 2020-04-09T10:01:07Z

Fix the issue of #4460

katbyte

it looks like you're not setting the index back on read? thence why you are having to do the import ignore. We should reading these back and ignoring the system ones?

neil-yechenwei · 2020-04-11T05:01:37Z

@katbyte , after tested previously, I found some system keys can be updated and some system keys cannot be updated. So I think maybe we cannot simply ignore all system keys, right? After checked azure cli and powershell for this resource, seems they also didn't ignore system keys but expose all keys to user. So I think we can align with them. Does it make sense?

katbyte · 2020-04-12T22:46:02Z

@neil-yechenwei - however we do it, maybe separate index and a computed index_system properties, we should always reading all properties back on read.

neil-yechenwei · 2020-04-13T04:45:00Z

@katbyte , because some system indexes can be updated. So if I move them to computed index_system property, it would cause diff on index property. So seems I cannot do this. After double confirmed with service owner, seems only system indexes "_id" and "DocumentDBDefaultIndex" cannot be updated, other system indexes can be updated. So I ignore them. See my updated code.

katbyte · 2020-04-14T00:08:44Z

@neil-yechenwei, we should always be reading in the values the user can set. weather we seperate user settable and system into indexes & a computed system_indexes ot just ignore the system ones we should be ensure the user's are read back in from the API.

neil-yechenwei · 2020-04-14T00:43:48Z

@katbyte , I've updated code to move user settable indexes which include user customized index and settable system index into property "index" and move system indexes which are not settable into a computed "system_index"

katbyte

Thanks for the changes @neil-yechenwei,

Just one minor comment inline otherwise this LGTM!

katbyte · 2020-04-15T03:15:23Z

azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go

+				},
+			},
+
+			"system_index": {


I think this should be system_indexes as it'll never be used as seperate blocks?

neil-yechenwei · 2020-04-15T07:54:25Z

@katbyte , thanks for your comments. I've updated code.

katbyte

Thanks @neil-yechenwei! LGTM now 👍

tombuildsstuff

hi @neil-yechenwei

Thanks for pushing those changes - I've taken a look and left some comments inline - but if we can fix those up then this otherwise LGTM

Thanks!

tombuildsstuff · 2020-04-16T08:16:09Z

azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go

@@ -264,7 +303,16 @@ func resourceArmCosmosDbMongoCollectionRead(d *schema.ResourceData, meta interfa
 		}

 		if props.Indexes != nil {


we need to ensure these fields are always set, so we can remove the if statement here, since the flatten function should handle these being nil

tombuildsstuff · 2020-04-16T08:16:38Z

azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go

-	for _, i := range *indexes {
-		if key := i.Key; key != nil {
-			var ttlInner int32
+func flattenCosmosMongoCollectionIndex(input *[]documentdb.MongoIndex) (*[]map[string]interface{}, *[]map[string]interface{}, *int32) {


this method needs to account for input being nil here

tombuildsstuff · 2020-04-16T08:17:12Z

azurerm/internal/services/cosmos/resource_arm_cosmosdb_mongo_collection.go

+		systemIndex := map[string]interface{}{}
+
+		if v.Key != nil && v.Key.Keys != nil {
+			key := (*v.Key.Keys)[0]


there's a crash here if there's 0 items in this

tombuildsstuff · 2020-04-16T08:18:48Z

website/docs/r/cosmosdb_mongo_collection.html.markdown

+
+* `keys` - The list of system keys which are not settable for each Cosmos DB Mongo Collection.
+
+* `unique` - The unique status of the index.


can we add a better description here?

neil-yechenwei · 2020-04-17T02:35:42Z

@tombuildsstuff , thanks for your comments. I've updated code.

katbyte

Thanks @neil-yechenwei! LGTM 👍

ghost · 2020-04-23T23:29:08Z

This has been released in version 2.7.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.7.0"
}
# ... other configuration ...

ghost · 2020-05-21T14:51:01Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 [email protected]. Thanks!

neil-yechenwei added 5 commits April 1, 2020 18:55

Improve code for cosmosdb

e4f7ae5

Update code

1918181

Update code

e6b747d

Update code

06efb64

Update code

c201aee

ghost added size/M documentation labels Apr 9, 2020

ArcturusZhang added enhancement service/cosmosdb labels Apr 10, 2020

katbyte requested changes Apr 10, 2020

View reviewed changes

katbyte added the waiting-response label Apr 10, 2020

ghost removed the waiting-response label Apr 11, 2020

neil-yechenwei requested a review from katbyte April 11, 2020 05:02

katbyte added the waiting-response label Apr 12, 2020

Update code

9dffb47

ghost added size/L and removed size/M labels Apr 13, 2020

ghost removed the waiting-response label Apr 13, 2020

Update code

d77aa84

ghost added size/M and removed size/L labels Apr 13, 2020

katbyte added the waiting-response label Apr 14, 2020

ghost removed the waiting-response label Apr 14, 2020

Update code

a334dd0

ghost removed the size/M label Apr 14, 2020

ghost added the size/L label Apr 14, 2020

v-cheye added 3 commits April 14, 2020 11:24

Update code

4b828a0

Update code

7571180

Update code

d41baff

katbyte changed the title ~~Support index for cosmosdb~~ cosmosdb_mongo_collection - support index & system_index Apr 15, 2020

katbyte requested changes Apr 15, 2020

View reviewed changes

katbyte added the waiting-response label Apr 15, 2020

katbyte added this to the v2.6.0 milestone Apr 15, 2020

Update code

cefe6af

ghost removed the waiting-response label Apr 15, 2020

neil-yechenwei requested a review from katbyte April 15, 2020 07:54

katbyte approved these changes Apr 15, 2020

View reviewed changes

tombuildsstuff suggested changes Apr 16, 2020

View reviewed changes

tombuildsstuff modified the milestones: v2.6.0, v2.7.0 Apr 16, 2020

neil-yechenwei added 2 commits April 17, 2020 10:04

Update code

cc4d2dd

Update code

2170312

neil-yechenwei requested review from tombuildsstuff and katbyte April 17, 2020 02:35

Merge remote-tracking branch 'upstream/master' into cosmosdb

a7cbf7a

katbyte approved these changes Apr 21, 2020

View reviewed changes

katbyte merged commit 4dc6fdd into hashicorp:master Apr 21, 2020

katbyte added a commit that referenced this pull request Apr 21, 2020

update cHANGELOG.md to include #6426

83974f7

ghost locked and limited conversation to collaborators May 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cosmosdb_mongo_collection - support `index` & `system_index` #6426

cosmosdb_mongo_collection - support `index` & `system_index` #6426

neil-yechenwei commented Apr 9, 2020 •

edited by tombuildsstuff

Loading

katbyte left a comment

neil-yechenwei commented Apr 11, 2020 •

edited

Loading

katbyte commented Apr 12, 2020 •

edited

Loading

neil-yechenwei commented Apr 13, 2020 •

edited

Loading

katbyte commented Apr 14, 2020

neil-yechenwei commented Apr 14, 2020 •

edited

Loading

katbyte left a comment

katbyte Apr 15, 2020

neil-yechenwei Apr 15, 2020

neil-yechenwei commented Apr 15, 2020

katbyte left a comment

tombuildsstuff left a comment

tombuildsstuff Apr 16, 2020

neil-yechenwei Apr 17, 2020

tombuildsstuff Apr 16, 2020

neil-yechenwei Apr 17, 2020

tombuildsstuff Apr 16, 2020

neil-yechenwei Apr 16, 2020 •

edited

Loading

tombuildsstuff Apr 16, 2020

neil-yechenwei Apr 17, 2020

neil-yechenwei commented Apr 17, 2020

katbyte left a comment

ghost commented Apr 23, 2020

ghost commented May 21, 2020

		@@ -264,7 +303,16 @@ func resourceArmCosmosDbMongoCollectionRead(d *schema.ResourceData, meta interfa
		}

		if props.Indexes != nil {


		* `keys` - The list of system keys which are not settable for each Cosmos DB Mongo Collection.

		* `unique` - The unique status of the index.

cosmosdb_mongo_collection - support index & system_index #6426

cosmosdb_mongo_collection - support index & system_index #6426

Conversation

neil-yechenwei commented Apr 9, 2020 • edited by tombuildsstuff Loading

katbyte left a comment

Choose a reason for hiding this comment

neil-yechenwei commented Apr 11, 2020 • edited Loading

katbyte commented Apr 12, 2020 • edited Loading

neil-yechenwei commented Apr 13, 2020 • edited Loading

katbyte commented Apr 14, 2020

neil-yechenwei commented Apr 14, 2020 • edited Loading

katbyte left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neil-yechenwei commented Apr 15, 2020

katbyte left a comment

Choose a reason for hiding this comment

tombuildsstuff left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neil-yechenwei Apr 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

neil-yechenwei commented Apr 17, 2020

katbyte left a comment

Choose a reason for hiding this comment

ghost commented Apr 23, 2020

ghost commented May 21, 2020

cosmosdb_mongo_collection - support `index` & `system_index` #6426

cosmosdb_mongo_collection - support `index` & `system_index` #6426

neil-yechenwei commented Apr 9, 2020 •

edited by tombuildsstuff

Loading

neil-yechenwei commented Apr 11, 2020 •

edited

Loading

katbyte commented Apr 12, 2020 •

edited

Loading

neil-yechenwei commented Apr 13, 2020 •

edited

Loading

neil-yechenwei commented Apr 14, 2020 •

edited

Loading

neil-yechenwei Apr 16, 2020 •

edited

Loading