Skip to content

Commit

Permalink
Merge pull request #69 from oracle/toxophilist/sprint-7/validationfix
Browse files Browse the repository at this point in the history
Modify config file check to succeed if their is a single DEFAULT entry
  • Loading branch information
toxophilist authored Aug 6, 2020
2 parents 5956171 + e1a36d1 commit a236371
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 12 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Release Notes


## 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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OCI Designer Toolkit [0.9.0](CHANGELOG.md#version-0.9.0)
# OCI Designer Toolkit [0.9.1](CHANGELOG.md#version-0.9.1)

OCI designer toolKIT (OKIT) is a set of tools for enabling design, deploy and visualise OCI environments
through a graphical web based interface.
Expand Down
2 changes: 1 addition & 1 deletion containers/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1" \
"description"="OKIT Web Server Container." \
"copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
SHELL ["/bin/bash", "-c"]
Expand Down
10 changes: 5 additions & 5 deletions documentation/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ python modules are installed and in addition provide a simple flask server that
## Clone Repository
Before the building either the Docker or Vagrant Images the project will nee to be cloned from the Git Repository (or downloaded)
and it is recommended that the latest Stable Release be cloned. The latest stable version number if shown in the README
and the associated Release tag is in the format vX.Y.Z hence for the version 0.9.0 the Release tag will be
**v0.9.0**. The command shows how this can be cloned to the local machine.
and the associated Release tag is in the format vX.Y.Z hence for the version 0.9.1 the Release tag will be
**v0.9.1**. The command shows how this can be cloned to the local machine.

```bash
git clone -b v0.9.0 --depth 1 git@github.com:oracle/oci-designer-toolkit.git
git clone -b v0.9.1 --depth 1 git@github.com:oracle/oci-designer-toolkit.git
```

or

```bash
git clone -b v0.9.0 --depth 1 https://github.com/oracle/oci-designer-toolkit.git
git clone -b v0.9.1 --depth 1 https://github.com/oracle/oci-designer-toolkit.git
```

### Download
If you do not have git installed locally the current release of OKIT can be retrieved by downloading it as a zip file from
https://github.com/oracle/oci-designer-toolkit/archive/v0.9.0.zip
https://github.com/oracle/oci-designer-toolkit/archive/v0.9.1.zip


## OCI Config File
Expand Down
2 changes: 1 addition & 1 deletion okitweb/okitWebDesigner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions okitweb/static/okit/js/okit_console.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/
console.info('Loaded Console Javascript');

const okitVersion = '0.9.0';
const okitReleaseDate = '5th August 2020';
const okitVersion = '0.9.1';
const okitReleaseDate = '6th August 2020';
// Validation
const validate_error_colour = "#ff4d4d";
const validate_warning_colour = "#ffd633";
Expand Down
4 changes: 2 additions & 2 deletions okitweb/static/okit/json/release.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"release": "0.9.0",
"tag": "v0.9.0"
"release": "0.9.1",
"tag": "v0.9.1"
}

0 comments on commit a236371

Please sign in to comment.