CosmosDB Mongo RBAC fix MongoRoleDefinitionType (#23190)

ashwinisingh01 · web-flow · commit 898ced285d47 · 2023-05-04T16:55:59.000+08:00
* initial fix

* address review comments

* fix release version s

* address gates failure

* address gate check failure
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json
@@ -38,7 +38,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongoDbRoleDefinitionId",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/examples/CosmosDBMongoDBRoleDefinitionGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/examples/CosmosDBMongoDBRoleDefinitionGet.json
@@ -15,7 +15,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/examples/CosmosDBMongoDBRoleDefinitionList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/examples/CosmosDBMongoDBRoleDefinitionList.json
@@ -15,7 +15,7 @@
             "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
             "properties": {
               "roleName": "myRoleName",
-              "type": "CustomRole",
+              "type": 1,
               "databaseName": "sales",
               "privileges": [
                 {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/mongorbac.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-08-15-preview/mongorbac.json
@@ -406,15 +406,28 @@
           "description": "A user-friendly name for the Role Definition. Must be unique for the database account."
         },
         "type": {
-          "type": "string",
+          "type": "integer",
+          "format": "int64",
           "enum": [
-            "BuiltInRole",
-            "CustomRole"
+            0,
+            1
           ],
           "description": "Indicates whether the Role Definition was built-in or user created.",
           "x-ms-enum": {
             "name": "MongoRoleDefinitionType",
-            "modelAsString": false
+            "modelAsString": false,
+            "values": [
+              {
+                "value": 0,
+                "description": "The BuiltInRole",
+                "name": "BuiltInRole"
+              },
+              {
+                "value": 1,
+                "description": "The CustomRole",
+                "name": "CustomRole"
+              }
+            ]
           }
         },
         "databaseName": {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json
@@ -38,7 +38,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongoDbRoleDefinitionId",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBMongoDBRoleDefinitionGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBMongoDBRoleDefinitionGet.json
@@ -15,7 +15,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBMongoDBRoleDefinitionList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBMongoDBRoleDefinitionList.json
@@ -15,7 +15,7 @@
             "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
             "properties": {
               "roleName": "myRoleName",
-              "type": "CustomRole",
+              "type": 1,
               "databaseName": "sales",
               "privileges": [
                 {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/mongorbac.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/mongorbac.json
@@ -406,15 +406,28 @@
           "description": "A user-friendly name for the Role Definition. Must be unique for the database account."
         },
         "type": {
-          "type": "string",
+          "type": "integer",
+          "format": "int64",
           "enum": [
-            "BuiltInRole",
-            "CustomRole"
+            0,
+            1
           ],
           "description": "Indicates whether the Role Definition was built-in or user created.",
           "x-ms-enum": {
             "name": "MongoRoleDefinitionType",
-            "modelAsString": false
+            "modelAsString": false,
+            "values": [
+              {
+                "value": 0,
+                "description": "The BuiltInRole",
+                "name": "BuiltInRole"
+              },
+              {
+                "value": 1,
+                "description": "The CustomRole",
+                "name": "CustomRole"
+              }
+            ]
           }
         },
         "databaseName": {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json
@@ -38,7 +38,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongoDbRoleDefinitionId",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/examples/CosmosDBMongoDBRoleDefinitionGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/examples/CosmosDBMongoDBRoleDefinitionGet.json
@@ -15,7 +15,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/examples/CosmosDBMongoDBRoleDefinitionList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/examples/CosmosDBMongoDBRoleDefinitionList.json
@@ -15,7 +15,7 @@
             "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
             "properties": {
               "roleName": "myRoleName",
-              "type": "CustomRole",
+              "type": 1,
               "databaseName": "sales",
               "privileges": [
                 {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/mongorbac.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2023-03-01-preview/mongorbac.json
@@ -406,15 +406,28 @@
           "description": "A user-friendly name for the Role Definition. Must be unique for the database account."
         },
         "type": {
-          "type": "string",
+          "type": "integer",
+          "format": "int64",
           "enum": [
-            "BuiltInRole",
-            "CustomRole"
+            0,
+            1
           ],
           "description": "Indicates whether the Role Definition was built-in or user created.",
           "x-ms-enum": {
             "name": "MongoRoleDefinitionType",
-            "modelAsString": false
+            "modelAsString": false,
+            "values": [
+              {
+                "value": 0,
+                "description": "The BuiltInRole",
+                "name": "BuiltInRole"
+              },
+              {
+                "value": 1,
+                "description": "The CustomRole",
+                "name": "CustomRole"
+              }
+            ]
           }
         },
         "databaseName": {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json
@@ -38,7 +38,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongoDbRoleDefinitionId",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/examples/CosmosDBMongoDBRoleDefinitionGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/examples/CosmosDBMongoDBRoleDefinitionGet.json
@@ -15,7 +15,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/examples/CosmosDBMongoDBRoleDefinitionList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/examples/CosmosDBMongoDBRoleDefinitionList.json
@@ -15,7 +15,7 @@
             "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
             "properties": {
               "roleName": "myRoleName",
-              "type": "CustomRole",
+              "type": 1,
               "databaseName": "sales",
               "privileges": [
                 {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/mongorbac.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-08-15/mongorbac.json
@@ -406,15 +406,28 @@
           "description": "A user-friendly name for the Role Definition. Must be unique for the database account."
         },
         "type": {
-          "type": "string",
+          "type": "integer",
+          "format": "int64",
           "enum": [
-            "BuiltInRole",
-            "CustomRole"
+            0,
+            1
           ],
           "description": "Indicates whether the Role Definition was built-in or user created.",
           "x-ms-enum": {
             "name": "MongoRoleDefinitionType",
-            "modelAsString": false
+            "modelAsString": false,
+            "values": [
+              {
+                "value": 0,
+                "description": "The BuiltInRole",
+                "name": "BuiltInRole"
+              },
+              {
+                "value": 1,
+                "description": "The CustomRole",
+                "name": "CustomRole"
+              }
+            ]
           }
         },
         "databaseName": {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/examples/CosmosDBMongoDBRoleDefinitionCreateUpdate.json
@@ -38,7 +38,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongoDbRoleDefinitionId",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/examples/CosmosDBMongoDBRoleDefinitionGet.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/examples/CosmosDBMongoDBRoleDefinitionGet.json
@@ -15,7 +15,7 @@
         "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
         "properties": {
           "roleName": "myRoleName",
-          "type": "CustomRole",
+          "type": 1,
           "databaseName": "sales",
           "privileges": [
             {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/examples/CosmosDBMongoDBRoleDefinitionList.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/examples/CosmosDBMongoDBRoleDefinitionList.json
@@ -15,7 +15,7 @@
             "type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",
             "properties": {
               "roleName": "myRoleName",
-              "type": "CustomRole",
+              "type": 1,
               "databaseName": "sales",
               "privileges": [
                 {
diff --git a/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/mongorbac.json b/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2022-11-15/mongorbac.json
@@ -406,15 +406,28 @@
           "description": "A user-friendly name for the Role Definition. Must be unique for the database account."
         },
         "type": {
-          "type": "string",
+          "type": "integer",
+          "format": "int64",
           "enum": [
-            "BuiltInRole",
-            "CustomRole"
+            0,
+            1
           ],
           "description": "Indicates whether the Role Definition was built-in or user created.",
           "x-ms-enum": {
             "name": "MongoRoleDefinitionType",
-            "modelAsString": false
+            "modelAsString": false,
+            "values": [
+              {
+                "value": 0,
+                "description": "The BuiltInRole",
+                "name": "BuiltInRole"
+              },
+              {
+                "value": 1,
+                "description": "The CustomRole",
+                "name": "CustomRole"
+              }
+            ]
           }
         },
         "databaseName": {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`"type": "Microsoft.DocumentDB/databaseAccounts/mongoDbRoleDefinitionId",`
`39`	`39`	`"properties": {`
`40`	`40`	`"roleName": "myRoleName",`
`41`		`- "type": "CustomRole",`
	`41`	`+ "type": 1,`
`42`	`42`	`"databaseName": "sales",`
`43`	`43`	`"privileges": [`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"type": "Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions",`
`16`	`16`	`"properties": {`
`17`	`17`	`"roleName": "myRoleName",`
`18`		`- "type": "CustomRole",`
	`18`	`+ "type": 1,`
`19`	`19`	`"databaseName": "sales",`
`20`	`20`	`"privileges": [`
`21`	`21`	`{`