Merge pull request #201 from oracle/sprint-13

Sprint 13

.gitignore

@@ -37,4 +37,7 @@ containers/oci/*
 !containers/oci/example_config
 !containers/cloud
 
+containers/ssh/*
+!containers/ssh/example_config
+
 !okitweb/static/model

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release Notes
 
+## Version 0.15.0 
+**Release Date**: 9th December 2020
+### Features
+1. Cut / Copy / Paste / Clone functionality added.
+2. Updated Developer Guide on creating new Artefacts.
+3. Artefact Skeleton generator for developer kick start.
+
+### Bug Fixes
+1. Adding an instance and an autonomous database in the same compartment overlays them on the canvas Issue #187
+2. Resolve issue parsing TF Json.
+3. Undefined variable in ansible export Issue: #189
+
 
 ## Version 0.14.1 
 **Release Date**: 18th November 2020
@@ -8,12 +20,13 @@
 2. Fix delete issue with IPSec
 3. Fix delete issue with CPE
 
+
 ## Version 0.14.0 
 **Release Date**: 18th November 2020
 ### Features
 1. Add collapse / expand to container style artefacts Compartment / VCN / Subnet.
 2. Implement updated, Oracle Standard, Look and Feel for diagram elements.
-3. Add Preferences option to choose display label (Name / Resource / None) this will be displayed below the element on the SVG (Ehancement: #126).
+3. Add Preferences option to choose display label (Name / Resource / None) this will be displayed below the element on the SVG (Enhancement: #126).
 4. Add OKIT specific "Definition" field to all artefacts to allow a free text definition of the artefact (Enhancement: #149).
 5. Add preference to specify the type of tooltip to be displayed (Name / Definition / Summary) when hovering over elements in the diagram.
 6. Add artefact element highlighting when the properties sheet is open. Moving the cursor over the properties sheet will highlight the associated artefact. 

Dockerfile

@@ -5,7 +5,7 @@
 FROM oraclelinux:7-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.14.1" \
+      "version"="0.15.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
@@ -42,11 +42,12 @@ RUN yum install -y \
 # Install required python modules
  && pip3 install --no-cache-dir \
         flask==1.1.1 \
+        gitpython==3.1.11 \
         gunicorn==20.0.4 \
         oci==2.22.0 \
         pandas==1.1.2 \
         python-magic==0.4.18 \
-        pyyaml==5.2 \
+        pyyaml==5.3.1 \
         requests==2.24.0 \
         xlsxwriter==1.3.6 \
 # Create Workspace

README.md

@@ -1,4 +1,4 @@
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.14.1](CHANGELOG.md#version-0.14.1)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.15.0](CHANGELOG.md#version-0.15.0)
 
 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), 
 [deploy](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit) and visualise ([introspect/query](https://www.ateam-oracle.com/the-oci-designer-toolkit-query-feature)) 

containers/cloud/cloud_init.yml

@@ -12,7 +12,7 @@ runcmd:
   # Install Required Packages because the packages section may not complete before the runcmd
   - sudo bash -c "yum install -y git python-oci-cli oci-utils"
   # Install Required Python Modules
-  - sudo bash -c "pip3 install --no-cache-dir flask==1.1.1 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6"
+  - sudo bash -c "pip3 install --no-cache-dir flask==1.1.1 gitpython==3.1.11 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6"
   # Clone OKIT
   - sudo bash -c "git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit"
   - sudo bash -c "mkdir /okit/{log,workspace}"

containers/cloud/okit-ws.json

@@ -51,7 +51,7 @@
       },
       "metadata": {
         "ssh_authorized_keys": "",
-        "user_data": "#cloud-config\nwrite_files:\n  # Add aliases to bash (Note: At time of writing the append flag does not appear to be working)\n  - path: /etc/.bashrc\n    append: true\n    content: |\n      alias lh='ls -lash'\n      alias lt='ls -last'\n      alias env='/usr/bin/env | sort'\n\nruncmd:\n  # Install Required Packages because the packages section may not complete before the runcmd\n  - sudo bash -c \"yum install -y git python-oci-cli oci-utils\"\n  # Install Required Python Modules\n  - sudo bash -c \"pip3 install --no-cache-dir flask==1.1.1 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6\"\n  # Clone OKIT\n  - sudo bash -c \"git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit\"\n  - sudo bash -c \"mkdir /okit/{log,workspace}\"\n  # Add additional environment information because append does not appear to work in write_file\n  - sudo bash -c \"echo 'source /etc/.bashrc' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OCI_CLI_AUTH=instance_principal' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OKIT_VM_COMPARTMENT=`oci-metadata -g \"compartmentID\" --value-only`' >> /etc/bashrc\"\n  # Copy GUnicorn Service File\n  - sudo bash -c 'sed \"s/{COMPARTMENT_OCID}/`oci-metadata -g compartmentID --value-only`/\" /okit/containers/services/gunicorn.service > /etc/systemd/system/gunicorn.service'\n  # Enable Gunicorn Service\n  - sudo systemctl enable gunicorn.service\n  - sudo systemctl start gunicorn.service\n\nfinal_message: \"**** The system is finally up, after $UPTIME seconds ****\"\n"
+        "user_data": "#cloud-config\nwrite_files:\n  # Add aliases to bash (Note: At time of writing the append flag does not appear to be working)\n  - path: /etc/.bashrc\n    append: true\n    content: |\n      alias lh='ls -lash'\n      alias lt='ls -last'\n      alias env='/usr/bin/env | sort'\n\nruncmd:\n  # Install Required Packages because the packages section may not complete before the runcmd\n  - sudo bash -c \"yum install -y git python-oci-cli oci-utils\"\n  # Install Required Python Modules\n  - sudo bash -c \"pip3 install --no-cache-dir flask==1.1.1 gitpython==3.1.11 gunicorn==20.0.4 oci==2.22.0 oci-cli==2.14.1 pandas==1.1.2 python-magic==0.4.18 pyyaml==5.3.1 requests==2.24.0 xlsxwriter==1.3.6\"\n  # Clone OKIT\n  - sudo bash -c \"git clone -b master --depth 1 https://github.com/oracle/oci-designer-toolkit.git /okit\"\n  - sudo bash -c \"mkdir /okit/{log,workspace}\"\n  # Add additional environment information because append does not appear to work in write_file\n  - sudo bash -c \"echo 'source /etc/.bashrc' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OCI_CLI_AUTH=instance_principal' >> /etc/bashrc\"\n  - sudo bash -c \"echo 'export OKIT_VM_COMPARTMENT=`oci-metadata -g \"compartmentID\" --value-only`' >> /etc/bashrc\"\n  # Copy GUnicorn Service File\n  - sudo bash -c 'sed \"s/{COMPARTMENT_OCID}/`oci-metadata -g compartmentID --value-only`/\" /okit/containers/services/gunicorn.service > /etc/systemd/system/gunicorn.service'\n  # Enable Gunicorn Service\n  - sudo systemctl enable gunicorn.service\n  - sudo systemctl start gunicorn.service\n\nfinal_message: \"**** The system is finally up, after $UPTIME seconds ****\"\n"
       },
       "block_storage_volume_ids": [],
       "object_storage_bucket_ids": [],

containers/docker/8-slim/Dockerfile

@@ -5,7 +5,7 @@
 FROM oraclelinux:8-slim
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.13.0" \
+      "version"="0.15.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
@@ -27,6 +27,7 @@ RUN microdnf install -y \
  && microdnf update -y \
 # Install additional packages
  && microdnf install -y \
+        git \
         python36 \
         python3-pip \
 #        python36-pyyaml \
@@ -37,10 +38,14 @@ RUN microdnf install -y \
 # Install required python modules
  && pip3 install --no-cache-dir \
         flask==1.1.1 \
+        gitpython==3.1.11 \
         gunicorn==20.0.4 \
-        oci==2.6.0 \
+        oci==2.22.0 \
+        pandas==1.1.2 \
         python-magic==0.4.18 \
         pyyaml==5.3.1 \
+        requests==2.24.0 \
+        xlsxwriter==1.3.6 \
 # Create Workspace
  && mkdir -p /okit/{config,log,visualiser,okitweb,workspace,templates} \
  && mkdir -p /okit/okitweb/static/okit/templates \

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.14.1" \
+      "version"="0.15.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, Oracle and/or its affiliates."
 SHELL ["/bin/bash", "-c"]
@@ -30,8 +30,10 @@ RUN yum install -y \
  && yum update -y \
 # Install additional packages
  && yum install -y \
+        git \
         python36 \
         python3-pip \
+        git \
 #        python36-pyyaml \
 #        python36-oci-sdk \
 #        rh-nginx114 \
@@ -41,6 +43,7 @@ RUN yum install -y \
 # Install required python modules
  && pip3 install --no-cache-dir \
         flask==1.1.1 \
+        gitpython==3.1.11 \
         gunicorn==20.0.4 \
         oci==2.22.0 \
         pandas==1.1.2 \
@@ -49,13 +52,17 @@ RUN yum install -y \
         requests==2.24.0 \
         xlsxwriter==1.3.6 \
 # Create Workspace
- && mkdir -p /okit/{config,log,visualiser,okitweb,workspace,templates} \
+ && mkdir -p /okit/{config,log,visualiser,okitweb,workspace,templates,skeletons} \
  && mkdir -p /okit/okitweb/static/okit/templates \
  && ln -s /okit/templates /okit/okitweb/static/okit/templates/user
 # Copy source code
 COPY okitweb /okit/okitweb
 COPY visualiser /okit/visualiser
+COPY skeletons /okit/skeletons
 COPY containers/oci/* /root/.oci/
+COPY containers/ssh/* /root/.ssh/
+RUN chmod 600 /root/.ssh/*
+
 # Add entrypoint to automatically start webserver
 ENTRYPOINT ["gunicorn"]
 CMD ["--workers=4", "--limit-request-line", "0", "--timeout", "120", "--bind=0.0.0.0:80", "okitweb.wsgi:app"]

containers/oci/example_settings

@@ -0,0 +1,7 @@
+[LABEL1]
+branch = master
+url = git@url1.git
+
+[LABEL2]
+branch = BRANCHNAME
+url = git@url2.git

containers/ssh/example_config

@@ -0,0 +1,3 @@
+Host <Git Url>
+    StrictHostKeyChecking no
+    IdentityFile ~/.ssh/<Key File>

containers/vagrant/configure_software.sh

@@ -13,6 +13,7 @@ yum install -y \
 yum update -y
 # Install additional packages
 yum install -y \
+    git \
     python36 \
     python3-pip
 # Clean Yum
@@ -38,6 +39,7 @@ python3 -m pip install --upgrade pip==20.0.2
 # Install required python modules
 pip3 install --no-cache-dir \
       flask==1.1.1 \
+      gitpython==3.1.11 \
       gunicorn==20.0.4 \
       oci==2.22.0 \
       pandas==1.1.2 \