From 56db65e2a2a69872965f40985285c184826e4720 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:32:21 +0000
Subject: [PATCH 1/3] sync: fetch 2024-01-16 spec and apply patches

---
 .../metalv1/oas3.fetched/components/schemas/Device.yaml     | 6 ++----
 .../metalv1/oas3.fetched/components/schemas/Project.yaml    | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/services/metalv1/oas3.fetched/components/schemas/Device.yaml b/spec/services/metalv1/oas3.fetched/components/schemas/Device.yaml
index 8e3eb270..120e1583 100644
--- a/spec/services/metalv1/oas3.fetched/components/schemas/Device.yaml
+++ b/spec/services/metalv1/oas3.fetched/components/schemas/Device.yaml
@@ -25,7 +25,7 @@ properties:
     format: uuid
     type: string
   hardware_reservation:
-    $ref: './Href.yaml'
+    $ref: './HardwareReservation.yaml'
   hostname:
     type: string
   href:
@@ -78,9 +78,7 @@ properties:
   plan:
     $ref: './Plan.yaml'
   project:
-    allOf:
-    - $ref: './Href.yaml'
-    - description: Full version of project object when included
+    $ref: './Project.yaml'
   project_lite:
     allOf:
     - $ref: './Href.yaml'
diff --git a/spec/services/metalv1/oas3.fetched/components/schemas/Project.yaml b/spec/services/metalv1/oas3.fetched/components/schemas/Project.yaml
index 3ee880b0..de5da431 100644
--- a/spec/services/metalv1/oas3.fetched/components/schemas/Project.yaml
+++ b/spec/services/metalv1/oas3.fetched/components/schemas/Project.yaml
@@ -10,6 +10,8 @@ properties:
     items:
       $ref: './Href.yaml'
     type: array
+  href:
+    type: string
   id:
     format: uuid
     type: string

From f881e54e649621277a740c432aff848f37d0c9cd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:32:21 +0000
Subject: [PATCH 2/3] sync: patch spec with 2024-01-16 spec

---
 .../components/schemas/Device.yaml.rej        | 22 +++++++++++++++++++
 .../components/schemas/Project.yaml.rej       | 11 ++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej
 create mode 100644 spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej

diff --git a/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej b/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej
new file mode 100644
index 00000000..b6b2da8d
--- /dev/null
+++ b/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej
@@ -0,0 +1,22 @@
+--- spec/oas3.patched/components/schemas/Device.yaml
++++ spec/services/metalv1/oas3.patched/components/schemas/Device.yaml
+@@ -21,7 +21,7 @@ properties:
+   facility:
+     $ref: './Facility.yaml'
+   hardware_reservation:
+-    $ref: './Href.yaml'
++    $ref: './HardwareReservation.yaml'
+   hostname:
+     type: string
+   href:
+@@ -70,9 +70,7 @@ properties:
+   plan:
+     $ref: './Plan.yaml'
+   project:
+-    allOf:
+-    - $ref: './Href.yaml'
+-    - description: Full version of project object when included
++    $ref: './Project.yaml'
+   project_lite:
+     allOf:
+     - $ref: './Href.yaml'
diff --git a/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej b/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej
new file mode 100644
index 00000000..d5f77243
--- /dev/null
+++ b/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej
@@ -0,0 +1,11 @@
+--- spec/services/metalv1/oas3.patched/components/schemas/Project.yaml
++++ spec/services/metalv1/oas3.patched/components/schemas/Project.yaml
+@@ -10,6 +10,8 @@ properties:
+     items:
+       $ref: './Href.yaml'
+     type: array
++  href:
++    type: string
+   id:
+     format: uuid
+     type: string

From 434e101753f8ac1a99448fa7dba944ba3ffc32ec Mon Sep 17 00:00:00 2001
From: Charles Treatman <ctreatman@equinix.com>
Date: Tue, 16 Jan 2024 13:50:17 -0600
Subject: [PATCH 3/3] remove upstreamed OpenAPI spec patch

---
 .../components/schemas/Device.yaml.rej        | 22 -----------
 .../components/schemas/Project.yaml.rej       | 11 ------
 ...230224-device-models-instead-of-href.patch | 37 -------------------
 3 files changed, 70 deletions(-)
 delete mode 100644 spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej
 delete mode 100644 spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej
 delete mode 100644 spec/services/metalv1/patches/20230224-device-models-instead-of-href.patch

diff --git a/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej b/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej
deleted file mode 100644
index b6b2da8d..00000000
--- a/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml.rej
+++ /dev/null
@@ -1,22 +0,0 @@
---- spec/oas3.patched/components/schemas/Device.yaml
-+++ spec/services/metalv1/oas3.patched/components/schemas/Device.yaml
-@@ -21,7 +21,7 @@ properties:
-   facility:
-     $ref: './Facility.yaml'
-   hardware_reservation:
--    $ref: './Href.yaml'
-+    $ref: './HardwareReservation.yaml'
-   hostname:
-     type: string
-   href:
-@@ -70,9 +70,7 @@ properties:
-   plan:
-     $ref: './Plan.yaml'
-   project:
--    allOf:
--    - $ref: './Href.yaml'
--    - description: Full version of project object when included
-+    $ref: './Project.yaml'
-   project_lite:
-     allOf:
-     - $ref: './Href.yaml'
diff --git a/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej b/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej
deleted file mode 100644
index d5f77243..00000000
--- a/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- spec/services/metalv1/oas3.patched/components/schemas/Project.yaml
-+++ spec/services/metalv1/oas3.patched/components/schemas/Project.yaml
-@@ -10,6 +10,8 @@ properties:
-     items:
-       $ref: './Href.yaml'
-     type: array
-+  href:
-+    type: string
-   id:
-     format: uuid
-     type: string
diff --git a/spec/services/metalv1/patches/20230224-device-models-instead-of-href.patch b/spec/services/metalv1/patches/20230224-device-models-instead-of-href.patch
deleted file mode 100644
index d0783945..00000000
--- a/spec/services/metalv1/patches/20230224-device-models-instead-of-href.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml b/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml
-index 4e0cc1c..f6981ef 100644
---- a/spec/oas3.patched/components/schemas/Device.yaml
-+++ b/spec/services/metalv1/oas3.patched/components/schemas/Device.yaml
-@@ -21,7 +21,7 @@ properties:
-   facility:
-     $ref: './Facility.yaml'
-   hardware_reservation:
--    $ref: './Href.yaml'
-+    $ref: './HardwareReservation.yaml'
-   hostname:
-     type: string
-   href:
-@@ -70,9 +70,7 @@ properties:
-   plan:
-     $ref: './Plan.yaml'
-   project:
--    allOf:
--    - $ref: './Href.yaml'
--    - description: Full version of project object when included
-+    $ref: './Project.yaml'
-   project_lite:
-     allOf:
-     - $ref: './Href.yaml'
-diff --git a/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml b/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml
-index d61b8f6..b962756 100644
---- a/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml
-+++ b/spec/services/metalv1/oas3.patched/components/schemas/Project.yaml
-@@ -10,6 +10,8 @@ properties:
-     items:
-       $ref: './Href.yaml'
-     type: array
-+  href:
-+    type: string
-   id:
-     format: uuid
-     type: string