From b1113a9b59ae7d91332617212331f5d0685c5a7f Mon Sep 17 00:00:00 2001
From: Felipe Monteiro <felipe.monteiro@att.com>
Date: Wed, 11 Jul 2018 21:35:22 -0400
Subject: [PATCH] Fix failing integration uwsgi job

This patchset fixes failing integration uwsgi jobs due to
recent schema changes here: [0]. Basically, some of the
YAMLs that are used for the integration tests are missing
storagePolicy or layeringDefinition properties; this
patch set corrects the issues to get the job passing
again.

[0] https://review.openstack.org/#/c/579023/6

Change-Id: I4fb48bb770aaa31539231046b3f0bd11af25f927
---
 .../tests/integration/gabbits/document-crud-secret.yaml  | 3 +++
 .../gabbits/document-render-secret-edge-cases.yaml       | 2 ++
 .../gabbits/document-substitution-secret-generic.yaml    | 4 ++++
 .../gabbits/document-substitution-secret.yaml            | 9 +++++++++
 4 files changed, 18 insertions(+)

diff --git a/deckhand/tests/integration/gabbits/document-crud-secret.yaml b/deckhand/tests/integration/gabbits/document-crud-secret.yaml
index 369f4b0c..331f9700 100644
--- a/deckhand/tests/integration/gabbits/document-crud-secret.yaml
+++ b/deckhand/tests/integration/gabbits/document-crud-secret.yaml
@@ -29,6 +29,9 @@ tests:
       metadata:
         schema: metadata/Document/v1
         name: my-passphrase
+        layeringDefinition:
+          abstract: false
+          layer: noop
         storagePolicy: encrypted
       data: not-a-real-password
       ...
diff --git a/deckhand/tests/integration/gabbits/document-render-secret-edge-cases.yaml b/deckhand/tests/integration/gabbits/document-render-secret-edge-cases.yaml
index 35a80b86..72bff7ff 100644
--- a/deckhand/tests/integration/gabbits/document-render-secret-edge-cases.yaml
+++ b/deckhand/tests/integration/gabbits/document-render-secret-edge-cases.yaml
@@ -41,6 +41,7 @@ tests:
         name: my-passphrase
         storagePolicy: encrypted
         layeringDefinition:
+          abstract: false
           layer: site
       data: ''
       ...
@@ -97,6 +98,7 @@ tests:
         name: armada-doc
         storagePolicy: encrypted
         layeringDefinition:
+          abstract: false
           layer: site
       data:
         # This will be an object in memory requiring base64 encoding.
diff --git a/deckhand/tests/integration/gabbits/document-substitution-secret-generic.yaml b/deckhand/tests/integration/gabbits/document-substitution-secret-generic.yaml
index 8c53bdb2..6bbf23e8 100644
--- a/deckhand/tests/integration/gabbits/document-substitution-secret-generic.yaml
+++ b/deckhand/tests/integration/gabbits/document-substitution-secret-generic.yaml
@@ -44,6 +44,7 @@ tests:
         name: example-armada-cert
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: ARMADA CERTIFICATE DATA
@@ -52,7 +53,10 @@ tests:
       metadata:
         schema: metadata/Document/v1
         name: armada-chart-01
+        # We don't need to encrypt the destination document.
+        storagePolicy: cleartext
         layeringDefinition:
+          abstract: false
           layer: site
         substitutions:
           - dest:
diff --git a/deckhand/tests/integration/gabbits/document-substitution-secret.yaml b/deckhand/tests/integration/gabbits/document-substitution-secret.yaml
index 55b773b3..82e95fd6 100644
--- a/deckhand/tests/integration/gabbits/document-substitution-secret.yaml
+++ b/deckhand/tests/integration/gabbits/document-substitution-secret.yaml
@@ -41,6 +41,7 @@ tests:
         name: example-cert
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: CERTIFICATE DATA
@@ -50,6 +51,7 @@ tests:
         name: example-ca
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: CA DATA
@@ -59,6 +61,7 @@ tests:
         name: example-ca-key
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: CA KEY DATA
@@ -68,6 +71,7 @@ tests:
         name: example-cert-key
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: CERTIFICATE KEY DATA
@@ -77,6 +81,7 @@ tests:
         name: example-passphrase
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: PASSPHRASE DATA
@@ -86,6 +91,7 @@ tests:
         name: example-private-key
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: PRIVATE KEY DATA
@@ -95,6 +101,7 @@ tests:
         name: example-public-key
         schema: metadata/Document/v1
         layeringDefinition:
+          abstract: false
           layer: site
         storagePolicy: encrypted
       data: PUBLIC KEY DATA
@@ -103,6 +110,8 @@ tests:
       metadata:
         schema: metadata/Document/v1
         name: armada-chart-01
+        # We don't need to encrypt the destination document.
+        storagePolicy: cleartext
         layeringDefinition:
           layer: site
         substitutions: