CDRIVER-4419 Remove unnecessary on-demand credentials in CSE unified spec tests (#1054)

eramongodb · kevinAlbs · commit 6f114e72deaf · 2022-06-29T12:00:45.000-04:00
* Update CSE and unified test format spec tests to d8be9cee
diff --git a/src/libmongoc/tests/json/client_side_encryption/unified/addKeyAltName.json b/src/libmongoc/tests/json/client_side_encryption/unified/addKeyAltName.json
@@ -22,7 +22,11 @@
           "keyVaultClient": "client0",
           "keyVaultNamespace": "keyvault.datakeys",
           "kmsProviders": {
-            "local": {}
+            "local": {
+              "key": {
+                "$$placeholder": 1
+              }
+            }
           }
         }
       }
diff --git a/src/libmongoc/tests/json/client_side_encryption/unified/createDataKey-kms_providers-invalid.json b/src/libmongoc/tests/json/client_side_encryption/unified/createDataKey-kms_providers-invalid.json
@@ -24,7 +24,14 @@
           "keyVaultClient": "client0",
           "keyVaultNamespace": "keyvault.datakeys",
           "kmsProviders": {
-            "aws": {}
+            "aws": {
+              "accessKeyId": {
+                "$$placeholder": 1
+              },
+              "secretAccessKey": {
+                "$$placeholder": 1
+              }
+            }
           }
         }
       }
diff --git a/src/libmongoc/tests/json/client_side_encryption/unified/deleteKey.json b/src/libmongoc/tests/json/client_side_encryption/unified/deleteKey.json
@@ -22,7 +22,11 @@
           "keyVaultClient": "client0",
           "keyVaultNamespace": "keyvault.datakeys",
           "kmsProviders": {
-            "local": {}
+            "local": {
+              "key": {
+                "$$placeholder": 1
+              }
+            }
           }
         }
       }
diff --git a/src/libmongoc/tests/json/client_side_encryption/unified/getKey.json b/src/libmongoc/tests/json/client_side_encryption/unified/getKey.json
@@ -22,7 +22,11 @@
           "keyVaultClient": "client0",
           "keyVaultNamespace": "keyvault.datakeys",
           "kmsProviders": {
-            "local": {}
+            "local": {
+              "key": {
+                "$$placeholder": 1
+              }
+            }
           }
         }
       }
diff --git a/src/libmongoc/tests/json/client_side_encryption/unified/getKeyByAltName.json b/src/libmongoc/tests/json/client_side_encryption/unified/getKeyByAltName.json
@@ -22,7 +22,11 @@
           "keyVaultClient": "client0",
           "keyVaultNamespace": "keyvault.datakeys",
           "kmsProviders": {
-            "local": {}
+            "local": {
+              "key": {
+                "$$placeholder": 1
+              }
+            }
           }
         }
       }
diff --git a/src/libmongoc/tests/json/client_side_encryption/unified/removeKeyAltName.json b/src/libmongoc/tests/json/client_side_encryption/unified/removeKeyAltName.json
@@ -22,7 +22,11 @@
           "keyVaultClient": "client0",
           "keyVaultNamespace": "keyvault.datakeys",
           "kmsProviders": {
-            "local": {}
+            "local": {
+              "key": {
+                "$$placeholder": 1
+              }
+            }
           }
         }
       }
diff --git a/src/libmongoc/tests/json/unified/kmsProviders-unconfigured_kms.json b/src/libmongoc/tests/json/unified/kmsProviders-unconfigured_kms.json
@@ -32,6 +32,7 @@
   "tests": [
     {
       "description": "",
+      "skipReason": "DRIVERS-2280: waiting on driver support for on-demand credentials",
       "operations": []
     }
   ]

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,11 @@`
`22`	`22`	`"keyVaultClient": "client0",`
`23`	`23`	`"keyVaultNamespace": "keyvault.datakeys",`
`24`	`24`	`"kmsProviders": {`
`25`		`- "local": {}`
	`25`	`+ "local": {`
	`26`	`+ "key": {`
	`27`	`+ "$$placeholder": 1`
	`28`	`+ }`
	`29`	`+ }`
`26`	`30`	`}`
`27`	`31`	`}`
`28`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,14 @@`
`24`	`24`	`"keyVaultClient": "client0",`
`25`	`25`	`"keyVaultNamespace": "keyvault.datakeys",`
`26`	`26`	`"kmsProviders": {`
`27`		`- "aws": {}`
	`27`	`+ "aws": {`
	`28`	`+ "accessKeyId": {`
	`29`	`+ "$$placeholder": 1`
	`30`	`+ },`
	`31`	`+ "secretAccessKey": {`
	`32`	`+ "$$placeholder": 1`
	`33`	`+ }`
	`34`	`+ }`
`28`	`35`	`}`
`29`	`36`	`}`
`30`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`"tests": [`
`33`	`33`	`{`
`34`	`34`	`"description": "",`
	`35`	`+ "skipReason": "DRIVERS-2280: waiting on driver support for on-demand credentials",`
`35`	`36`	`"operations": []`
`36`	`37`	`}`
`37`	`38`	`]`