Skip to content

Commit 23737b3

Browse files
GromNaNGromNaN
committed
Remove unecessary attributes from the XSD (default values)
1 parent f21d4ee commit 23737b3

File tree

2 files changed

+58
-60
lines changed

2 files changed

+58
-60
lines changed

‎config/schema/mongodb-1.0.xsd

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<xsd:complexType name="config">
1111
<xsd:sequence>
12-
<xsd:element name="default-commit-options" type="default-commit-options" minOccurs="0" maxOccurs="1" />
12+
<xsd:element name="default-commit-options" type="default-commit-options" minOccurs="0" />
1313
<xsd:element name="connection" type="connection" minOccurs="0" maxOccurs="unbounded" />
1414
<xsd:element name="document-manager" type="document-manager" minOccurs="0" maxOccurs="unbounded" />
1515
<xsd:element name="resolve-target-document" type="resolve_target_document" minOccurs="0" maxOccurs="unbounded" />
@@ -46,9 +46,9 @@
4646

4747
<xsd:complexType name="connection">
4848
<xsd:sequence>
49-
<xsd:element name="options" type="connection-options" minOccurs="0" maxOccurs="1" />
50-
<xsd:element name="driver-options" type="connection-driver-options" minOccurs="0" maxOccurs="1" />
51-
<xsd:element name="autoEncryption" type="auto-encryption" minOccurs="0" maxOccurs="1" />
49+
<xsd:element name="options" type="connection-options" minOccurs="0" />
50+
<xsd:element name="driver-options" type="connection-driver-options" minOccurs="0" />
51+
<xsd:element name="autoEncryption" type="auto-encryption" minOccurs="0" />
5252
</xsd:sequence>
5353
<xsd:attribute name="id" type="xsd:string" use="required" />
5454
<xsd:attribute name="server" type="xsd:string" />
@@ -125,57 +125,57 @@
125125

126126
<xsd:complexType name="auto-encryption">
127127
<xsd:sequence>
128-
<xsd:element name="kmsProvider" type="kms-provider" minOccurs="1" maxOccurs="1" />
129-
<xsd:element name="masterKey" type="master-key" minOccurs="0" maxOccurs="1" />
130-
<xsd:element name="keyVaultClient" type="xsd:string" minOccurs="0" maxOccurs="1" />
131-
<xsd:element name="keyVaultNamespace" type="xsd:string" minOccurs="0" maxOccurs="1" />
132-
<xsd:element name="tlsOptions" type="tls-options" minOccurs="0" maxOccurs="1" />
133-
<xsd:element name="encryptedFieldsMap" type="encrypted-fields-map" minOccurs="0" maxOccurs="1" />
134-
<xsd:element name="extraOptions" type="extra-options" minOccurs="0" maxOccurs="1" />
128+
<xsd:element name="kmsProvider" type="kms-provider" />
129+
<xsd:element name="masterKey" type="master-key" minOccurs="0" />
130+
<xsd:element name="keyVaultClient" type="xsd:string" minOccurs="0" />
131+
<xsd:element name="keyVaultNamespace" type="xsd:string" minOccurs="0" />
132+
<xsd:element name="tlsOptions" type="tls-options" minOccurs="0" />
133+
<xsd:element name="encryptedFieldsMap" type="encrypted-fields-map" minOccurs="0" />
134+
<xsd:element name="extraOptions" type="extra-options" minOccurs="0" />
135135
</xsd:sequence>
136-
<xsd:attribute name="bypassAutoEncryption" type="xsd:boolean" use="optional" />
137-
<xsd:attribute name="bypassQueryAnalysis" type="xsd:boolean" use="optional" />
136+
<xsd:attribute name="bypassAutoEncryption" type="xsd:boolean" />
137+
<xsd:attribute name="bypassQueryAnalysis" type="xsd:boolean" />
138138
</xsd:complexType>
139139

140140
<xsd:complexType name="kms-provider">
141141
<xsd:attribute name="type" type="xsd:string" use="required" />
142142
<!-- AWS -->
143-
<xsd:attribute name="accessKeyId" type="xsd:string" use="optional" />
144-
<xsd:attribute name="secretAccessKey" type="xsd:string" use="optional" />
145-
<xsd:attribute name="sessionToken" type="xsd:string" use="optional" />
143+
<xsd:attribute name="accessKeyId" type="xsd:string" />
144+
<xsd:attribute name="secretAccessKey" type="xsd:string" />
145+
<xsd:attribute name="sessionToken" type="xsd:string" />
146146
<!-- Azure -->
147-
<xsd:attribute name="tenantId" type="xsd:string" use="optional" />
148-
<xsd:attribute name="clientId" type="xsd:string" use="optional" />
149-
<xsd:attribute name="clientSecret" type="xsd:string" use="optional" />
150-
<xsd:attribute name="keyVaultEndpoint" type="xsd:string" use="optional" />
151-
<xsd:attribute name="identityPlatformEndpoint" type="xsd:string" use="optional" />
152-
<xsd:attribute name="keyName" type="xsd:string" use="optional" />
153-
<xsd:attribute name="keyVersion" type="xsd:string" use="optional" />
147+
<xsd:attribute name="tenantId" type="xsd:string" />
148+
<xsd:attribute name="clientId" type="xsd:string" />
149+
<xsd:attribute name="clientSecret" type="xsd:string" />
150+
<xsd:attribute name="keyVaultEndpoint" type="xsd:string" />
151+
<xsd:attribute name="identityPlatformEndpoint" type="xsd:string" />
152+
<xsd:attribute name="keyName" type="xsd:string" />
153+
<xsd:attribute name="keyVersion" type="xsd:string" />
154154
<!-- GCP -->
155-
<xsd:attribute name="email" type="xsd:string" use="optional" />
156-
<xsd:attribute name="privateKey" type="xsd:string" use="optional" />
157-
<xsd:attribute name="endpoint" type="xsd:string" use="optional" />
158-
<xsd:attribute name="projectId" type="xsd:string" use="optional" />
159-
<xsd:attribute name="location" type="xsd:string" use="optional" />
160-
<xsd:attribute name="keyRing" type="xsd:string" use="optional" />
155+
<xsd:attribute name="email" type="xsd:string" />
156+
<xsd:attribute name="privateKey" type="xsd:string" />
157+
<xsd:attribute name="endpoint" type="xsd:string" />
158+
<xsd:attribute name="projectId" type="xsd:string" />
159+
<xsd:attribute name="location" type="xsd:string" />
160+
<xsd:attribute name="keyRing" type="xsd:string" />
161161
<!-- Attribute already present for another KMS type -->
162-
<!-- <xsd:attribute name="keyName" type="xsd:string" use="optional" /> -->
163-
<!-- <xsd:attribute name="keyVersion" type="xsd:string" use="optional" /> -->
162+
<!-- <xsd:attribute name="keyName" type="xsd:string" /> -->
163+
<!-- <xsd:attribute name="keyVersion" type="xsd:string" /> -->
164164
<!-- KMIP -->
165-
<!-- <xsd:attribute name="endpoint" type="xsd:string" use="optional" /> -->
165+
<!-- <xsd:attribute name="endpoint" type="xsd:string" /> -->
166166
<!-- Local -->
167-
<xsd:attribute name="key" type="xsd:string" use="optional" />
167+
<xsd:attribute name="key" type="xsd:string" />
168168
</xsd:complexType>
169169

170170
<xsd:complexType name="master-key">
171171
<xsd:attribute name="key" type="xsd:string" use="required" />
172172
</xsd:complexType>
173173

174174
<xsd:complexType name="tls-options">
175-
<xsd:attribute name="tlsCAFile" type="xsd:string" use="optional" />
176-
<xsd:attribute name="tlsCertificateKeyFile" type="xsd:string" use="optional" />
177-
<xsd:attribute name="tlsCertificateKeyFilePassword" type="xsd:string" use="optional" />
178-
<xsd:attribute name="tlsDisableOCSPEndpointCheck" type="xsd:boolean" use="optional" />
175+
<xsd:attribute name="tlsCAFile" type="xsd:string" />
176+
<xsd:attribute name="tlsCertificateKeyFile" type="xsd:string" />
177+
<xsd:attribute name="tlsCertificateKeyFilePassword" type="xsd:string" />
178+
<xsd:attribute name="tlsDisableOCSPEndpointCheck" type="xsd:boolean" />
179179
</xsd:complexType>
180180

181181
<xsd:simpleType name="encrypted-fields-map">
@@ -184,27 +184,27 @@
184184

185185
<xsd:complexType name="encrypted-queries">
186186
<xsd:attribute name="queryType" type="xsd:string" use="required" />
187-
<xsd:attribute name="min" type="xsd:string" use="optional" />
188-
<xsd:attribute name="max" type="xsd:string" use="optional" />
189-
<xsd:attribute name="sparsity" type="xsd:string" use="optional" />
190-
<xsd:attribute name="trimFactor" type="xsd:string" use="optional" />
187+
<xsd:attribute name="min" type="xsd:string" />
188+
<xsd:attribute name="max" type="xsd:string" />
189+
<xsd:attribute name="sparsity" type="xsd:string" />
190+
<xsd:attribute name="trimFactor" type="xsd:string" />
191191
</xsd:complexType>
192192

193193
<xsd:complexType name="extra-options">
194-
<xsd:attribute name="mongocryptdURI" type="xsd:string" use="optional" />
195-
<xsd:attribute name="mongocryptdBypassSpawn" type="xsd:boolean" use="optional" />
196-
<xsd:attribute name="mongocryptdSpawnPath" type="xsd:string" use="optional" />
197-
<xsd:attribute name="mongocryptdSpawnArgs" type="xsd:string" use="optional" />
198-
<xsd:attribute name="cryptSharedLibPath" type="xsd:string" use="optional" />
199-
<xsd:attribute name="cryptSharedLibRequired" type="xsd:boolean" use="optional" />
194+
<xsd:attribute name="mongocryptdURI" type="xsd:string" />
195+
<xsd:attribute name="mongocryptdBypassSpawn" type="xsd:boolean" />
196+
<xsd:attribute name="mongocryptdSpawnPath" type="xsd:string" />
197+
<xsd:attribute name="mongocryptdSpawnArgs" type="xsd:string" />
198+
<xsd:attribute name="cryptSharedLibPath" type="xsd:string" />
199+
<xsd:attribute name="cryptSharedLibRequired" type="xsd:boolean" />
200200
</xsd:complexType>
201201

202202
<xsd:complexType name="document-manager">
203203
<xsd:choice maxOccurs="unbounded">
204204
<xsd:element name="filter" type="filter" minOccurs="0" maxOccurs="unbounded" />
205205
<xsd:element name="mapping" type="mapping" minOccurs="0" maxOccurs="unbounded" />
206-
<xsd:element name="metadata-cache-driver" type="metadata-cache-driver" minOccurs="0" maxOccurs="1" />
207-
<xsd:element name="profiler" type="profiler" minOccurs="0" maxOccurs="1" />
206+
<xsd:element name="metadata-cache-driver" type="metadata-cache-driver" minOccurs="0" />
207+
<xsd:element name="profiler" type="profiler" minOccurs="0" />
208208
</xsd:choice>
209209
<xsd:attribute name="id" type="xsd:string" use="required" />
210210
<xsd:attribute name="auto-mapping" type="xsd:boolean" />
@@ -247,10 +247,10 @@
247247

248248
<xsd:complexType name="metadata-cache-driver">
249249
<xsd:all>
250-
<xsd:element name="class" type="xsd:string" minOccurs="0" maxOccurs="1" />
251-
<xsd:element name="host" type="xsd:string" minOccurs="0" maxOccurs="1" />
252-
<xsd:element name="instance-class" type="xsd:string" minOccurs="0" maxOccurs="1" />
253-
<xsd:element name="port" type="xsd:integer" minOccurs="0" maxOccurs="1" />
250+
<xsd:element name="class" type="xsd:string" minOccurs="0" />
251+
<xsd:element name="host" type="xsd:string" minOccurs="0" />
252+
<xsd:element name="instance-class" type="xsd:string" minOccurs="0" />
253+
<xsd:element name="port" type="xsd:integer" minOccurs="0" />
254254
</xsd:all>
255255
<xsd:attribute name="id" type="xsd:string" />
256256
<xsd:attribute name="type" type="xsd:string" />

‎docs/encryption.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ If the driver is not able to find the library, you can specify its path using th
204204
TLS Options
205205
-----------
206206

207-
If you are not specifying a custom ``keyVaultClient`` service, you can configure TLS settings for the internal key vault client using the ``tlsOptions`` key:
207+
If you are not specifying a custom ``keyVaultClient`` service, you can configure
208+
TLS settings for the internal key vault client using the ``tlsOptions`` key:
208209

209210
.. tabs::
210211

@@ -220,8 +221,7 @@ If you are not specifying a custom ``keyVaultClient`` service, you can configure
220221
tlsCAFile: "/path/to/key-vault-ca.pem"
221222
tlsCertificateKeyFile: "/path/to/key-vault-client.pem"
222223
tlsCertificateKeyFilePassword: "keyvaultclientpassword"
223-
tlsAllowInvalidCertificates: false
224-
tlsAllowInvalidHostnames: false
224+
tlsDisableOCSPEndpointCheck: false
225225
226226
.. group-tab:: XML
227227

@@ -233,8 +233,7 @@ If you are not specifying a custom ``keyVaultClient`` service, you can configure
233233
<doctrine:tlsCAFile>/path/to/key-vault-ca.pem</doctrine:tlsCAFile>
234234
<doctrine:tlsCertificateKeyFile>/path/to/key-vault-client.pem</doctrine:tlsCertificateKeyFile>
235235
<doctrine:tlsCertificateKeyFilePassword>keyvaultclientpassword</doctrine:tlsCertificateKeyFilePassword>
236-
<doctrine:tlsAllowInvalidCertificates>false</doctrine:tlsAllowInvalidCertificates>
237-
<doctrine:tlsAllowInvalidHostnames>false</doctrine:tlsAllowInvalidHostnames>
236+
<doctrine:tlsDisableOCSPEndpointCheck>false</doctrine:tlsAllowInvalidCertificates>
238237
</doctrine:tlsOptions>
239238
</doctrine:autoEncryption>
240239
</doctrine:connection>
@@ -252,8 +251,7 @@ If you are not specifying a custom ``keyVaultClient`` service, you can configure
252251
'tlsCAFile' => '/path/to/key-vault-ca.pem',
253252
'tlsCertificateKeyFile' => '/path/to/key-vault-client.pem',
254253
'tlsCertificateKeyFilePassword' => 'keyvaultclientpassword',
255-
'tlsAllowInvalidCertificates' => false,
256-
'tlsAllowInvalidHostnames' => false,
254+
'tlsDisableOCSPEndpointCheck' => false,
257255
],
258256
]);
259257
};

0 commit comments

Comments
 (0)