0.63.0 Release

.github/workflows/development-build-desktop-application.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Delete Release
         id: delete_release
         run: |
-          gh release delete ${{ env.BRANCH_RELEASE_TAG }} --yes
+          gh release delete ${{ env.BRANCH_RELEASE_TAG }} --yes --cleanup-tag
       # - name: Update Release
       #   id: update_release
       #   run: |

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Release Notes
 
 
+## Version 0.63.0
+**Release Date**: 31st August 2024
+### Features
+1. OKIT-Ocd: Build OKIT-Web style auto arranger. (#OKIT-299)
+2. OKIT-Ocd: Generated example connection.tfvars file during OpenTofu export. (#OKIT-297)
+3. OKIT-Ocd: Add Palette for Compute Cloud@Customer. (#OKIT-298) 
+4. OKIT-Ocd: Add Palette for PCA-X9. (#OKIT-298)
+5. OKIT-Ocd: Allow quering of cache data from specified Config Profiles and then switch. (#OKIT-296)
+
+### Bug Fixes
+1. OKIT-Web: Resolve Code Scanning Issues #688 - #712
+2. OKIT-Web: Convert Queried Network Load Balancer Listeners set to list.
+3. OKIT-Web: Revert DRG Attachment fix for PCA DRGv1+ feature
+
 ## Version 0.62.2
 **Release Date**: 22nd August 2024
 ### Features

Dockerfile

@@ -1,14 +1,14 @@
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:8
 ARG BRANCH=master
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.62.2" \
+      "version"="0.63.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, 2022, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2020, 2024, Oracle and/or its affiliates."
 # SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
@@ -51,7 +51,6 @@ RUN yum install -y \
             https://github.com/oracle/oci-designer-toolkit.git /github/oci-designer-toolkit \
  && mkdir -p /okit/{git,local,log,instance/git,instance/local,instance/templates/user,workspace,ssl} \
  && mkdir -p /root/bin \
- && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /okit/ssl/okit.key -out /okit/ssl/okit.crt -subj "/C=GB/ST=Berkshire/L=Reading/O=Oracle/OU=OKIT/CN=www.oci_okit.com" \
  && ln -sv /github/oci-designer-toolkit/config /okit/config \
  && ln -sv /github/oci-designer-toolkit/okitweb /okit/okitweb \
  && ln -sv /github/oci-designer-toolkit/visualiser /okit/visualiser \

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 

README.md

@@ -1,8 +1,9 @@
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.62.2](CHANGELOG.md#version-0.62.2)
+[![License: UPL](https://img.shields.io/badge/license-UPL-green)](https://img.shields.io/badge/license-UPL-green) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=oracle_oci-designer-toolkit&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=oracle_oci-designer-toolkit)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.63.0](CHANGELOG.md#version-0.63.0)
 
-Full Release Details Can Found [0.62.2 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.62.2).
+Full Release Details Can Found [0.63.0 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.63.0).
 
-**OKIT - Open Cloud Designer** Public Beta is now Available see [0.62.2 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.62.2) for details.
+**OKIT - Open Cloud Designer** Public Beta is now Available see [0.63.0 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.63.0) for details.
 _____
 
 OCI designer and visualisation toolKIT (OKIT) is a browser based tool that allows the user to [design](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit), 
@@ -37,7 +38,7 @@ OCI environments through a graphical web based interface.
 
 ## Changes
 
-[Changes for the current release (0.62.2) are documented here.](CHANGELOG.md#version-0.62.2)
+[Changes for the current release (0.63.0) are documented here.](CHANGELOG.md#version-0.63.0)
 
 
 ## Releases
@@ -178,7 +179,7 @@ Please consult the [security guide](./SECURITY.md) for our responsible security
 
 ## License
 
-Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 
 Released under the Universal Permissive License v1.0 as shown at
 <https://oss.oracle.com/licenses/upl/>.

RELEASE_NOTES.md

@@ -1,22 +1,25 @@
-# July 2024 Release (Version 0.62.2)
+[![License: UPL](https://img.shields.io/badge/license-UPL-green)](https://img.shields.io/badge/license-UPL-green) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=oracle_oci-designer-toolkit&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=oracle_oci-designer-toolkit)
+# August 2024 Release (Version 0.63.0)
 ____
-**Update 0.62.2**: This update addresses the following issues.
-1. OKIT-Web: Resolve Code Scanning Warnings: Issues #652-#672
-2. OKIT-Ocd: resolve Code scanning Warnings: Issues #673-#680
+**Update 0.63.0**: This update addresses the following issues.
+1. OKIT-Web: Resolve Code Scanning Issues #688 - #712
+2. OKIT-Web: Convert Queried Network Load Balancer Listeners set to list.
+3. OKIT-Web: Revert DRG Attachment fix for PCA DRGv1+ feature
 ____
-Welcome to the July 2024 release of OKIT. This release is aim primarily at the desktop OKIT OCD Beta extending the current functionality and improving 
-it's useability. We have now simplified the process of hiding/showing the palette and properties panes whilst extending the functionlity within the 
-tabular view to allow the user to choose the columns to be displayed.
+Welcome to the August 2024 release of OKIT. This release is aim primarily at the desktop OKIT OCD Beta extending the current functionality and improving 
+it's useability. We have now added a number of Auto Layout options, including OKIT-Web Style, and allow the user to specify the default Auto Layout option.
+In addition we have extended the Desktop to allow Compute Cloud@Customer and Private Cloud Appliance users to create designs and generate download cache 
+information from their machine.
 
 ## OKIT (Web) Features
 No new features
 
 ## OKIT - Open Cloud Designer
-1. OKIT-Ocd: Add the ability to create common Defined Tags that will be used across all reasorces created by OCD. (#OKIT-269)
-2. OKIT-Ocd: Add single button collapse and expand for Palette.
-3. OKIT-Ocd: Add single button collapse and expand for Properties.
-4. OKIT-Ocd: Add Freeform and Defined Tags to each resource. (#OKIT-270)
-5. OKIT-Ocd: Extend Tabular view to allow for column display selection where additional columns are specified. (#OKIT-295)
+1. OKIT-Ocd: Build OKIT-Web style auto arranger. (#OKIT-299)
+2. OKIT-Ocd: Generated example connection.tfvars file during OpenTofu export. (#OKIT-297)
+3. OKIT-Ocd: Add Palette for Compute Cloud@Customer. (#OKIT-298) 
+4. OKIT-Ocd: Add Palette for PCA-X9. (#OKIT-298)
+5. OKIT-Ocd: Allow quering of cache data from specified Config Profiles and then switch. (#OKIT-296)
 
 ### Beta Overview
 

cloudinit/nodeexporter_cloud_init.yml

@@ -1,3 +1,5 @@
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #cloud-config
 users:
   - default

cloudinit/prometheus_cloud_init.yml

@@ -1,3 +1,5 @@
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #cloud-config
 users:
   - default

config/gunicorn_http.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 bind = '0.0.0.0:80'
 workers = 4
 limit_request_line = 0

config/gunicorn_https.py

@@ -1,4 +1,7 @@
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 bind = '0.0.0.0:443'
+# To use HTTPS the certfile & key file must be created
 certfile = "/okit/ssl/okit.crt"
 keyfile = "/okit/ssl/okit.key"
 workers = 4

containers/cloud/cloud_init.yml

@@ -1,3 +1,5 @@
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #cloud-config
 write_files:
   # Add aliases to bash (Note: At time of writing the append flag does not appear to be working)

containers/docker/Dockerfile

@@ -1,13 +1,13 @@
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 FROM oraclelinux:8
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.62.2" \
+      "version"="0.63.0" \
       "description"="OKIT Web Server Container." \
-      "copyright"="Copyright (c) 2020, 2022, Oracle and/or its affiliates."
+      "copyright"="Copyright (c) 2020, 2024, Oracle and/or its affiliates."
 # SHELL ["/bin/bash", "-c"]
 ENV PYTHONIOENCODING=utf8 \
     PYTHONPATH=":/okit/visualiser:/okit/okitweb:/okit" \
@@ -44,7 +44,6 @@ RUN yum install -y \
 # Create Workspace
  && mkdir -p /okit/{config,git,instance/git,instance/local,instance/templates/user,local,log,ssl,visualiser,okitweb,workspace,skeletons} \
 #  && mkdir -p /okit/okitweb/static/okit/templates \
- && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /okit/ssl/okit.key -out /okit/ssl/okit.crt -subj "/C=GB/ST=Berkshire/L=Reading/O=Oracle/OU=OKIT/CN=www.oci_okit.com" 
 #  && ln -s /okit/templates /okit/okitweb/static/okit/templates/user \
 #  && ln -s /okit/git /okit/okitweb/static/okit/templates/git \
 #  && ln -s /okit/git /okit/okitweb/static/okit/git

containers/docker/docker-compose.yml

@@ -1,6 +1,6 @@
 ---
 # file: docker-compose
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 version: '3.8'
 services:

containers/docker/nginx.conf

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # For more information on configuration, see:

containers/docker/okit_nginx.conf

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 server {

containers/docker/run-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 echo "*******************************************************************"

containers/scripts/build-docker-image.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export ROOT_DIR=$(cd $(dirname $0)/../..; pwd)

containers/scripts/start-okit-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export ROOT_DIR=$(cd $(dirname $0)/../..; pwd)

containers/vagrant/Vagrantfile

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # Vagrantfile API/syntax version.

containers/vagrant/configure_firewall.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 

containers/vagrant/configure_software.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 export PATH=/usr/local/bin:/usr/bin:${PATH}

containers/vagrant/enable_flask_service.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc

containers/vagrant/enable_gunicorn_service.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc

containers/vagrant/enable_nginx_service.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc

containers/vagrant/nginx.conf

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # For more information on configuration, see:

containers/vagrant/run-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 source /etc/bashrc

custom/terraform/cne_simple.tf

@@ -1,3 +1,5 @@
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # Define Local CNE Types
 # If VMs are added to the design add their Private IP reference to the appropriate list.
 locals {

documentation/Development.md

@@ -67,7 +67,7 @@ INFO: Writing File: ../visualiser/facade/ociBlockStorageVolume.py
 Following generation a model file will be created in the **okitweb/static/okit/model/js/artefacts** directory as shown below.
 ```javascript
 /*
-** Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+** Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume Javascript');
@@ -159,7 +159,7 @@ any reference to it on delete. This is done by adding the deleteChildren() funct
 Following the update the model JavaScript will be modified as below:
 ```javascript
 /*
-** Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+** Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume Javascript');
@@ -258,7 +258,7 @@ OkitJson.prototype.deleteBlockStorageVolume = function(id) {
 Following generation a view file will be created in the **okitweb/static/okit/view/designer/js/artefacts** directory as shown below.
 ```javascript
 /*
-** Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+** Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume View Javascript');
@@ -366,7 +366,7 @@ Instance it is attached to) by creating the following functions:
 Following the update the model JavaScript will be modified as below:
 ```javascript
 /*
-** Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+** Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 console.info('Loaded Block Storage Volume View Javascript');
@@ -511,7 +511,7 @@ Following the update the model JavaScript will be modified as below:
 Following generation a property sheet HTML file will be created in the **okitweb/templates/okit/propertysheets** directory as shown below.
 ```jinja2
 <!--
-** Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+** Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
@@ -531,7 +531,7 @@ worked example we will need add the following fields:
 
 ```jinja2
 <!--
-** Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+** Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 {% extends "okit/propertysheets/base_property_sheet.html" %}
@@ -565,7 +565,7 @@ Following generation a Python Facade file will be created in the **visualiser/fa
 ```python
 #!/usr/bin/python
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description
@@ -627,7 +627,7 @@ to the correct name **self.client.list_volumes** which will result in the follow
 ```python
 #!/usr/bin/python
 
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 """Provide Module Description

documentation/Installation.md

@@ -548,14 +548,15 @@ sudo bash -c "yum install -y oci-utils"
 sudo bash -c "yum install -y python-oci-cli"
 # Update
 sudo bash -c "yum update -y"
-# Install Required Python Modules
+# Update Python Modules
 sudo bash -c "python3 -m pip install -U pip"
 sudo bash -c "python3 -m pip install -U setuptools"
-sudo bash -c "python3 -m pip install --no-cache-dir authlib flask gitpython git-url-parse gunicorn oci openpyxl python-magic pyyaml requests "
 # Clone OKIT
 sudo bash -c "mkdir -p /github"
 sudo bash -c "git clone -b master https://github.com/oracle/oci-designer-toolkit.git /github/oci-designer-toolkit"
 sudo bash -c "mkdir -p /okit/{git,local,log,instance/git,instance/local,instance/templates/user,workspace,ssl}"
+# Install OKIT Required python modules
+sudo bash -c "python3 -m pip install --no-cache-dir -r /github/oci-designer-toolkit/requirements.txt"
 # Link Directories
 sudo bash -c "ln -sv /github/oci-designer-toolkit/config /okit/config"
 sudo bash -c "ln -sv /github/oci-designer-toolkit/okitweb /okit/okitweb"
@@ -636,6 +637,7 @@ The OKIT configuration file is located in the directory 'instance'.
 
 ### Dynamic Group
 A Tenancy level Dynamic Group will need to be created to enable Instance Principal access for the instance.
+
 #### OKITInstanceGroup
 Create the OKITInstanceGroup Dynamic Group and add a single Rule relating to the OKIT Instance.
 ![OKIT Dynamic Group](images/DynamicGroup.png?raw=true "OKIT Dynamic Group")