PORT-4328 Fix ocean new command (#26)

* Fixed the `ocean new` command
port-labs · Jul 24, 2023 · f992cdb · f992cdb
1 parent 2d6960d
commit f992cdb
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 23 deletions.
diff --git a/changelog/PORT-4328.bugfix.md b/changelog/PORT-4328.bugfix.md
@@ -0,0 +1 @@
+Fixed `ocean new` jinja crash for the config.yaml in the scaffold
diff --git a/poetry.lock b/poetry.lock
diff --git a/port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/config.yaml b/port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/config.yaml
@@ -1,16 +1,16 @@
-# This is an example configuration file for the integration service.
-# Please copy this file to config.yaml file in the integration folder and edit it to your needs.
+{{ "# This is an example configuration file for the integration service." }}
+{{ "# Please copy this file to config.yaml file in the integration folder and edit it to your needs." }}
 
 port:
-  clientId: {{ "{{" }} from env PORT_CLIENT_ID {{ "}}" }} # Can be loaded via environment variable: PORT_CLIENT_ID
-  clientSecret: {{ "{{" }} from env PORT_CLIENT_SECRET {{ "}}" }} # Can be loaded via environment variable: PORT_CLIENT_SECRET
-# The event listener to use for the integration service.
+  clientId: {{ "{{" }} from env PORT_CLIENT_ID {{ "}}" }} {{ "# Can be loaded via environment variable: PORT_CLIENT_ID" }}
+  clientSecret: {{ "{{" }} from env PORT_CLIENT_SECRET {{ "}}" }} {{ "# Can be loaded via environment variable: PORT_CLIENT_SECRET" }}
+{{ "# The event listener to use for the integration service." }}
 eventListener:
   type: KAFKA
 integration:
-  # The identifier of this integration instance.
+  {{ "# The identifier of this integration instance." }}
   identifier: {{ "{{" }} from env INTEGRATION_IDENTIFIER {{ "}}" }}
-  # The type of the integration.
+  {{ "# The type of the integration." }}
   type: "My Integration type (Gitlab, Jira, etc.)"
   config:
     myGitToken: {{ "{{" }} from env MY_GIT_TOKEN {{ "}}" }}

diff --git a/pyproject.toml b/pyproject.toml
@@ -52,9 +52,10 @@ six = "^1.16.0"
 click = { version = "^8.1.3", optional = true }
 rich = { version = "^13.4.1", optional = true }
 cookiecutter = { version = "^2.1.1", optional = true }
+jinja2-time = {version = "^0.2.0", optional = true}
 
 [tool.poetry.extras]
-cli = ["click", "rich", "cookiecutter"]
+cli = ["click", "rich", "cookiecutter", "jinja2-time"]
 
 
 [tool.poetry.group.dev.dependencies]