kubernetes-external-secrets: Add default for property and fix hashes (#…

…44) * kubernetes-external-secrets: Add default for property and fix hashes * Refactor secret descriptor to subdirectory to ensure consistent hashing
EarnestResearch · Jan 16, 2020 · 2779e63 · 2779e63
1 parent 1e41359
commit 2779e63
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/kubernetes/kubernetes-external-secrets/ExternalSecret/Type.dhall b/kubernetes/kubernetes-external-secrets/ExternalSecret/Type.dhall
@@ -6,6 +6,6 @@ in  { apiVersion : Text
     , kind : Text
     , metadata : k8s.ObjectMeta.Type
     , secretDescriptor :
-          ../SecretDescriptor.dhall sha256:18b8c67891d7abc2ed14004239b24f39cd62748da25ceca73788d29f466c48a2
-        ? ../SecretDescriptor.dhall
+          ../SecretDescriptor/Type.dhall sha256:d617a70cb22e811f5b6669b856cf37961d9ea5fb897496a3af01f5cb019c5951
+        ? ../SecretDescriptor/Type.dhall
     }
diff --git a/kubernetes/kubernetes-external-secrets/ExternalSecret/package.dhall b/kubernetes/kubernetes-external-secrets/ExternalSecret/package.dhall
@@ -1,5 +1,5 @@
 { Type =
-      ./Type.dhall sha256:cb1579fac783a5e7c259358b622c76d2db15425e5c50dbe1332ce54cf64ef4ab
+      ./Type.dhall sha256:9aae306e00b6726e7fbbedb477e47a7e26c45047c62da3c615d5378d1dc021a8
     ? ./Type.dhall
 , default =
       ./default.dhall sha256:fb479794b0f34d01df52b6c69e684cef045061bf25eb496345dc85968563c231

diff --git a/kubernetes/kubernetes-external-secrets/SecretDescriptor.dhall b/kubernetes/kubernetes-external-secrets/SecretDescriptor.dhall
diff --git a/kubernetes/kubernetes-external-secrets/SecretDescriptor/Type.dhall b/kubernetes/kubernetes-external-secrets/SecretDescriptor/Type.dhall
@@ -0,0 +1,7 @@
+< SecretsManagerSecretDescriptor :
+      ../SecretsManagerSecretDescriptor/Type.dhall sha256:6feaa8bc2741d07fd9bf2bd1e09e57661978c2c9b720b071c2949d971552fcfd
+    ? ../SecretsManagerSecretDescriptor/Type.dhall
+| SystemManagerSecretDescriptor :
+      ../SystemManagerSecretDescriptor/Type.dhall sha256:7cd9738e468bdd65289f078162a0d4724cb62e91d7439576064d636322aedd62
+    ? ../SystemManagerSecretDescriptor/Type.dhall
+>
diff --git a/kubernetes/kubernetes-external-secrets/SecretsManagerExternalData/default.dhall b/kubernetes/kubernetes-external-secrets/SecretsManagerExternalData/default.dhall
@@ -1 +1 @@
-{=}
+{ property = None Text }
diff --git a/kubernetes/kubernetes-external-secrets/SecretsManagerExternalData/package.dhall b/kubernetes/kubernetes-external-secrets/SecretsManagerExternalData/package.dhall
@@ -2,6 +2,6 @@
       ./Type.dhall sha256:5b356dfacb979cfcb22842c1e73d2185c0f241ede4bcddc6f4614c35c1afae11
     ? ./Type.dhall
 , default =
-      ./default.dhall sha256:9bb9dcb5bf6f795291686f59383bcd01c8e79b87fc3fb63351d46dea100ac51b
+      ./default.dhall sha256:bfbbe741c3e03dbd12e8c58ea5a86892fcae5012a861d4c9b665a2cff9ed088e
     ? ./default.dhall
 }
diff --git a/kubernetes/kubernetes-external-secrets/package.dhall b/kubernetes/kubernetes-external-secrets/package.dhall
@@ -2,17 +2,17 @@
       ./BackendType/package.dhall sha256:8a611d85765bbc1962b973518fb2cc14adf28df15be2d12c9b63769d0a8cdc9a
     ? ./BackendType/package.dhall
 , ExternalSecret =
-      ./ExternalSecret/package.dhall sha256:1faeccea0701f13f5cf42dd76fa109f0a034e9c80ea9c2484cc0d8c6371c6578
+      ./ExternalSecret/package.dhall sha256:57999e85393c04a74b5432bc37448afcb09ef169fb556bfe6e94b244675df993
     ? ./ExternalSecret/package.dhall
 , SecretsManagerExternalData =
-      ./SecretsManagerExternalData/package.dhall sha256:ce6b73c2cd3abbb9ed7395fdb9fc0e5caea061312813263c230a581fe19653ce
+      ./SecretsManagerExternalData/package.dhall sha256:06e4b16d312bf0cade699e35b6204e4f72da8988751665ba9887d75c0712c457
     ? ./SecretsManagerExternalData/package.dhall
 , SystemManagerExternalData =
       ./SystemManagerExternalData/package.dhall sha256:4af8373b25d3ddaaf9d90aa0e47412f18b621b3f09473a2270dd905082d51465
     ? ./SystemManagerExternalData/package.dhall
 , SecretDescriptor =
-      ./SecretDescriptor.dhall sha256:18b8c67891d7abc2ed14004239b24f39cd62748da25ceca73788d29f466c48a2
-    ? ./SecretDescriptor.dhall
+      ./SecretDescriptor/Type.dhall sha256:d617a70cb22e811f5b6669b856cf37961d9ea5fb897496a3af01f5cb019c5951
+    ? ./SecretDescriptor/Type.dhall
 , SecretsManagerSecretDescriptor =
       ./SecretsManagerSecretDescriptor/package.dhall sha256:32f2072161a250f6797032bb26d903001ccd570301539d30b50a67431f97f44c
     ? ./SecretsManagerSecretDescriptor/package.dhall

diff --git a/kubernetes/package.dhall b/kubernetes/package.dhall
@@ -2,7 +2,7 @@
       ./cert-manager/package.dhall sha256:2f5a8a61e8259bf6d105cab504de2c7ec9a9f004c8c6e0c4a7e773595e800de3
     ? ./cert-manager/package.dhall
 , kubernetes-external-secrets =
-      ./kubernetes-external-secrets/package.dhall sha256:3b0df58d1d5dc7e8d5971ee06902d30b2eba9608c551779792ec2f3257c494cc
+      ./kubernetes-external-secrets/package.dhall sha256:4b52e6019a04f34da8819d85e6f43d5387040fbab102ba88399584fd0b845ee6
     ? ./kubernetes-external-secrets/package.dhall
 , k8s =
       ./k8s/package.dhall sha256:4b575d18387671adf3e3b1db4fe7fa6ff880c26c8c69082176b4ef84dee2e4d6

diff --git a/package.dhall b/package.dhall
@@ -1,5 +1,5 @@
 { kubernetes =
-      ./kubernetes/package.dhall sha256:7b9f076c5655f4a66536314b825cbc2902e3172fbd9b6aa834d1c01c12af7b6f
+      ./kubernetes/package.dhall sha256:0746b392cf1e06bfa299920d34cd4ad311afd5838627f237f2fcfb41e4305516
     ? ./kubernetes/package.dhall
 , Prelude =
       https://prelude.dhall-lang.org/v12.0.0/package.dhall sha256:aea6817682359ae1939f3a15926b84ad5763c24a3740103202d2eaaea4d01f4c