From dc271e1a87fea892762c03cc0f46bb0b7b96c6ca Mon Sep 17 00:00:00 2001
From: DQ <dengq@vmware.com>
Date: Wed, 1 Apr 2020 17:55:33 +0800
Subject: [PATCH] Add packaging to pipenv

Signed-off-by: DQ <dengq@vmware.com>
---
 make/photon/prepare/Pipfile              |  3 +-
 make/photon/prepare/Pipfile.lock         | 37 +++++++++++++++++++-----
 make/photon/prepare/commands/gencerts.py |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/make/photon/prepare/Pipfile b/make/photon/prepare/Pipfile
index 82f0f6473..f4ea12b12 100644
--- a/make/photon/prepare/Pipfile
+++ b/make/photon/prepare/Pipfile
@@ -5,8 +5,9 @@ name = "pypi"
 
 [packages]
 pyyaml = "==4.2b1"
-click = "*"
+click = ">=7.1.1"
 "jinja2" = ">=2.10.1"
+packaging = ">=20.3"
 
 [dev-packages]
 pylint = "*"
diff --git a/make/photon/prepare/Pipfile.lock b/make/photon/prepare/Pipfile.lock
index 21365d099..00946b59f 100644
--- a/make/photon/prepare/Pipfile.lock
+++ b/make/photon/prepare/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b165e0915808904ddcb9c552479da32f9f0611f09f462c442c2d1c9b347ced22"
+            "sha256": "bdbdb6df5de5710b36534a11a364fa109a8750f00ee83e20bc39671c55be49bb"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -70,12 +70,34 @@
             ],
             "version": "==1.1.1"
         },
+        "packaging": {
+            "hashes": [
+                "sha256:3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3",
+                "sha256:82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752"
+            ],
+            "index": "pypi",
+            "version": "==20.3"
+        },
+        "pyparsing": {
+            "hashes": [
+                "sha256:4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f",
+                "sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec"
+            ],
+            "version": "==2.4.6"
+        },
         "pyyaml": {
             "hashes": [
                 "sha256:ef3a0d5a5e950747f4a39ed7b204e036b37f9bddc7551c1a813b8727515a832e"
             ],
             "index": "pypi",
             "version": "==4.2b1"
+        },
+        "six": {
+            "hashes": [
+                "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a",
+                "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"
+            ],
+            "version": "==1.14.0"
         }
     },
     "develop": {
@@ -95,11 +117,11 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302",
-                "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b"
+                "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f",
+                "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==1.5.0"
+            "version": "==1.6.0"
         },
         "isort": {
             "hashes": [
@@ -153,6 +175,7 @@
                 "sha256:3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3",
                 "sha256:82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752"
             ],
+            "index": "pypi",
             "version": "==20.3"
         },
         "pluggy": {
@@ -228,10 +251,10 @@
         },
         "wcwidth": {
             "hashes": [
-                "sha256:8fd29383f539be45b20bd4df0dc29c20ba48654a41e661925e612311e9f3c603",
-                "sha256:f28b3e8a6483e5d49e7f8949ac1a78314e740333ae305b4ba5defd3e74fb37a8"
+                "sha256:cafe2186b3c009a04067022ce1dcd79cb38d8d65ee4f4791b8888d6599d1bbe1",
+                "sha256:ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1"
             ],
-            "version": "==0.1.8"
+            "version": "==0.1.9"
         },
         "wrapt": {
             "hashes": [
diff --git a/make/photon/prepare/commands/gencerts.py b/make/photon/prepare/commands/gencerts.py
index 117a3a174..8503ca502 100644
--- a/make/photon/prepare/commands/gencerts.py
+++ b/make/photon/prepare/commands/gencerts.py
@@ -11,7 +11,7 @@ gen_tls_script = pathlib.Path(__file__).parent.parent.joinpath('scripts/gencert.
 
 @click.command()
 @click.option('-p', '--path', required=True, type=str,help='the path to store generated cert files')
-@click.option('-d', '--days', default='365', type=int, help='the expired time for cert')
+@click.option('-d', '--days', default='365', type=str, help='the expired time for cert')
 def gencert(path, days):
     """
     gencert command will generate cert files for internal TLS