From f7b1d8b435444ea01f7f925c6485b48e9d35fe3f Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Sun, 28 Mar 2021 12:46:29 -0400
Subject: [PATCH] checking in some changes

---
 schema/lib/elements/resumegen.xsd | 87 +++++++++++++++++++++++++++++++
 schema/lib/elements/vaultpass.xsd | 12 ++---
 schema/lib/types/gpg.xsd          |  6 +++
 schema/lib/types/vaultpass.xsd    |  5 +-
 schema/projects/resumegen.xsd     | 37 +++++++++++++
 schema/projects/vaultpass.xsd     |  4 +-
 6 files changed, 141 insertions(+), 10 deletions(-)
 create mode 100644 schema/lib/elements/resumegen.xsd
 create mode 100644 schema/projects/resumegen.xsd

diff --git a/schema/lib/elements/resumegen.xsd b/schema/lib/elements/resumegen.xsd
new file mode 100644
index 0000000..af2cb52
--- /dev/null
+++ b/schema/lib/elements/resumegen.xsd
@@ -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>
diff --git a/schema/lib/elements/vaultpass.xsd b/schema/lib/elements/vaultpass.xsd
index 7dfa03b..99253cd 100644
--- a/schema/lib/elements/vaultpass.xsd
+++ b/schema/lib/elements/vaultpass.xsd
@@ -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>
diff --git a/schema/lib/types/gpg.xsd b/schema/lib/types/gpg.xsd
index 563f6bb..02307ef 100644
--- a/schema/lib/types/gpg.xsd
+++ b/schema/lib/types/gpg.xsd
@@ -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>
diff --git a/schema/lib/types/vaultpass.xsd b/schema/lib/types/vaultpass.xsd
index 74a3826..8f9c25e 100644
--- a/schema/lib/types/vaultpass.xsd
+++ b/schema/lib/types/vaultpass.xsd
@@ -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>
diff --git a/schema/projects/resumegen.xsd b/schema/projects/resumegen.xsd
new file mode 100644
index 0000000..7b20324
--- /dev/null
+++ b/schema/projects/resumegen.xsd
@@ -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>
diff --git a/schema/projects/vaultpass.xsd b/schema/projects/vaultpass.xsd
index d2f3a9e..b0586a3 100644
--- a/schema/projects/vaultpass.xsd
+++ b/schema/projects/vaultpass.xsd
@@ -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>