checking in some changes

This commit is contained in:
brent s. 2021-03-28 12:46:29 -04:00
parent 2bd6216426
commit f7b1d8b435
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
6 changed files with 141 additions and 10 deletions

View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified">

<xs:complexType name="e_resume_contact">
<xs:all>
<xs:element name="email" minOccurs="1" maxOccurs="1" type="xs:token"/>
<xs:element name="phoneNumber" minOccurs="1" maxOccurs="1" type="xs:token"/>
</xs:all>
</xs:complexType>

<xs:complexType name="e_resume_duration">
<xs:sequence minOccurs="1" maxOccurs="2">
<xs:element name="start" type="xs:gYearMonth" minOccurs="1" maxOccurs="1"/>
<xs:element name="end" type="xs:gYearMonth" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>

<xs:complexType name="e_resume_workExperience">
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element name="experience" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
<xs:element name="companyName" minOccurs="1" maxOccurs="1" type="xs:normalizedString"/>
<xs:element name="positions" minOccurs="1" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element name="position" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
<xs:element name="duration" minOccurs="0" maxOccurs="1" type="e_resume_duration"/>
<xs:element name="title" minOccurs="1" maxOccurs="1" type="xs:normalizedString"/>
<xs:element name="role" minOccurs="1" maxOccurs="1">
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element name="responsibility" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:all>
<xs:element name="desc" minOccurs="1" maxOccurs="1"/>
<xs:element name="accomplishments" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="unbounded">
<xs:element name="accomplishment" minOccurs="1" maxOccurs="unbounded"
type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="desc" minOccurs="1" maxOccurs="1" type="xs:normalizedString"/>
<xs:element name="location" minOccurs="0" maxOccurs="1" type="e_resume_location"/>
</xs:all>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>

<xs:complexType name="e_resume_location">
<xs:all>
<xs:element name="locality" minOccurs="1" maxOccurs="1" type="xs:normalizedString"/>
<xs:element name="region" minOccurs="1" maxOccurs="1" type="xs:normalizedString"/>
</xs:all>
</xs:complexType>

<xs:complexType name="e_resume_name">
<xs:all>
<xs:element minOccurs="0" maxOccurs="1" name="nameTitle" type="xs:normalizedString"/>
<xs:element minOccurs="0" maxOccurs="1" name="namePrefix" type="xs:normalizedString"/>
<xs:element minOccurs="1" maxOccurs="1" name="firstName" type="xs:normalizedString"/>
<xs:element minOccurs="0" maxOccurs="1" name="middleName" type="xs:normalizedString"/>
<xs:element minOccurs="1" maxOccurs="1" name="lastName" type="xs:normalizedString"/>
<xs:element minOccurs="0" maxOccurs="1" name="nameSuffix" type="xs:normalizedString"/>
</xs:all>
</xs:complexType>

</xs:schema>

View File

@ -5,13 +5,13 @@

<xs:include schemaLocation="../types/vaultpass.xsd"/>

<xs:element name="t_vaultpass_authselect" abstract="true"/>
<xs:element name="t_vaultpass_unsealselect" abstract="true"/>
<xs:element name="e_vaultpass_authselect" abstract="true"/>
<xs:element name="e_vaultpass_unsealselect" abstract="true"/>

<xs:element name="auth" substitutionGroup="t_vaultpass_authselect" type="t_vaultpass_auth_plain"/>
<xs:element name="authGpg" substitutionGroup="t_vaultpass_authselect" type="t_vaultpass_star_gpg"/>
<xs:element name="auth" substitutionGroup="e_vaultpass_authselect" type="t_vaultpass_auth_plain"/>
<xs:element name="authGpg" substitutionGroup="e_vaultpass_authselect" type="t_vaultpass_star_gpg"/>
<xs:element name="unseal" substitutionGroup="t_vaultpass_unsealselect" type="t_std_base64"/>
<xs:element name="unsealGpg" substitutionGroup="t_vaultpass_unsealselect" type="t_vaultpass_star_gpg"/>
<xs:element name="unseal" substitutionGroup="e_vaultpass_unsealselect" type="t_std_base64"/>
<xs:element name="unsealGpg" substitutionGroup="e_vaultpass_unsealselect" type="t_vaultpass_star_gpg"/>

</xs:schema>

View File

@ -17,6 +17,12 @@
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="t_gpg_safe_key_id">
<xs:restriction base="xs:string">
<xs:pattern value="\s*(0x)?[0-9A-Fa-f]{40}\s*"/><!-- Full key ID -->
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="t_gpg_key_id_search">
<xs:union memberTypes="t_gpg_key_id t_net_email_addr"/>
</xs:simpleType>

View File

@ -19,7 +19,7 @@
</xs:complexType>
</xs:element>
<!-- We don't support Boto3 because it requires an external session object. -->
<!-- We won't support EC2 Metadata auth unless requested because it's HELL complex. -->
<!-- We won't support EC2 Metadata auth unless requested because it's HELLA complex. -->
<!-- TODO -->
<!--
<xs:element name="aws">
@ -72,7 +72,7 @@
</xs:all>
</xs:complexType>
</xs:element>
<!-- No longer supported upstream by HashiCorp. -->
<!-- No longer supported upstream by HashiCorp. At least, not in community? And I don't have an Enterprise handy. -->
<!--
<xs:element name="mfa"/>
-->
@ -137,6 +137,7 @@
<xs:simpleContent>
<xs:extension base="t_unix_filepath">
<xs:attribute name="gpgHome" type="t_unix_filepath" use="optional"/>
<xs:attribute name="gpgKeyId" type="t_gpg_safe_key_id" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>

View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xs:schema targetNamespace="https://resume.r00t2.io/"
xmlns="https://resume.r00t2.io/"
xmlns:resume="https://resume.r00t2.io/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified">

<xs:include schemaLocation="../lib/elements/resumegen.xsd"/>

<xs:element name="portfolio">
<xs:complexType>
<xs:all>
<xs:element name="resume">
<xs:complexType>
<xs:sequence minOccurs="3">
<xs:element name="name" minOccurs="1" maxOccurs="1" type="e_resume_name"/>
<xs:element name="contact" minOccurs="1" maxOccurs="1" type="e_resume_contact"/>
<xs:element name="location" minOccurs="1" maxOccurs="1" type="e_resume_location"/>
<xs:element name="workExperience" minOccurs="0" maxOccurs="1" type="e_resume_workExperience"/>
<xs:element name="certifications" minOccurs="0" maxOccurs="1"/>
<xs:element name="education" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="cv">
<xs:complexType>
<xs:sequence minOccurs="1">

</xs:sequence>
</xs:complexType>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>

</xs:schema>

View File

@ -18,11 +18,11 @@
<xs:all>
<xs:element name="uri" type="t_std_uri" minOccurs="0" maxOccurs="1"
default="http://localhost:8200/"/>
<xs:element ref="t_vaultpass_unsealselect" minOccurs="0" maxOccurs="1"/>
<xs:element ref="e_vaultpass_unsealselect" minOccurs="0" maxOccurs="1"/>
</xs:all>
</xs:complexType>
</xs:element>
<xs:element ref="t_vaultpass_authselect" minOccurs="1" maxOccurs="1"/>
<xs:element ref="e_vaultpass_authselect" minOccurs="1" maxOccurs="1"/>
<xs:element name="mounts" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>