Merge branch 'master' into sprint-8

oracle · Aug 26, 2020 · 7017d80 · 7017d80
2 parents e8e85b2 + 5c6212c
commit 7017d80
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 281 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,18 @@
 3. Internet Gateways could only be created on the first subnet in a vcn (Issue: #71).
 
 
+## Version 0.9.2 
+**Release Date**: 7th August 2020
+### Bug Fixes
+1. Unable to drop gateways on second or subsequent VCNs (Issue #73).
+
+
+## Version 0.9.1 
+**Release Date**: 6th August 2020
+### Bug Fixes
+1. Config file warning being displayed when only [DEFAULT] section defined (OKIT-110).
+
+
 ## Version 0.9.0 
 **Release Date**: 5th August 2020
 ### Features

diff --git a/containers/docker/Dockerfile b/containers/docker/Dockerfile
@@ -5,7 +5,7 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.9.0" \
+      "version"="0.9.2" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]

diff --git a/okitweb/okitWebDesigner.py b/okitweb/okitWebDesigner.py
@@ -77,7 +77,7 @@ def validateConfigFile(config_file='~/.oci/config'):
     config = configparser.ConfigParser()
     config.read(abs_config_file)
     results = []
-    if len(config.sections()) == 0:
+    if len(config.sections()) == 0 and 'DEFAULT' not in config:
         results.append('OCI Connect Config file is either missing or empty.')
     else:
         for section in config:

diff --git a/okitweb/static/okit/js/okit_template_artifact.js b/okitweb/static/okit/js/okit_template_artifact.js