Initial changes for publication, fix for vpc observability.

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 Notable changes to this project:
 
+## 1.0.29
+
+### Features
+
+- Added initial changes for implementation being published to drawio.
+
+### Fixes
+
+- Fixed incorrect check resulting in missing VPC error for Observability team.
+
 ## 1.0.28
 
 ### Features

docs/setup.md

@@ -18,12 +18,14 @@
 3. Package is installed to /Library/Frameworks/Python.framework/Versions/VERSION/pythonVERSION/site-packages/ibmdiagrams
 4. Script is installed to /Library/Frameworks/Python.framework/Versions/VERSION/bin
 
+<!--
 ## Build
 
 1. cd ibmdiagrams
 2. Update version number in pyproject.toml.
 3. python -m build
 4. Output is in dist
+-->
 
 ## License
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ibmdiagrams"
-version = "1.0.28"
+version = "1.0.29"
 description = "Generate architecture diagrams following IBM Diagram Standard"
 readme = "README.md"
 requires-python = ">=3.11.0"

src/ibmdiagrams.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ibmdiagrams
-Version: 1.0.28
+Version: 1.0.29
 Summary: Generate architecture diagrams following IBM Diagram Standard
 Author-email: Jay Warfield <[email protected]>
 Maintainer-email: Jay Warfield <[email protected]>
@@ -229,9 +229,18 @@ Requires-Dist: urllib3>=1.26.9
 
 Generate architecture diagrams following [IBM Diagram Standard](https://www.ibm.com/design/language/infographics/technical-diagrams/design).
 
-Input can be Python or Terraform.
+Input is Python or Terraform with output to drawio file.
 
-Output is a drawio file that can be opened and edited in drawio.
+Python usage example:
+- python cloud.py
+- Output to  cloud.drawio
+
+Terraform usage example:
+- ibmdiagrams -h
+- ibmdiagrams cloud.tfstate
+- Output to cloud.drawio
+
+Refer to Guides for complete details.
 
 Icons are from the [icons repo](https://github.com/IBM-Cloud/architecture-icons) for use in any drawio desktop. 
 

src/ibmdiagrams/ibmbase/build.py

@@ -266,6 +266,10 @@ def buildGroupShape(self, groupid, properties):
       if self.common.isStaticIcons() or self.common.isCatalogIcons():
          shapenode = self.shapes.buildStaticShape(groupid, properties, x, y, width, height, meta, items)
          items.append(shapenode)
+      elif self.common.isDrawioIcons():
+         shapenode = self.shapes.buildDrawioShape(groupid, properties, x, y, width, height, meta)
+         #items.append(shapenode)
+         items = items + shapenode
       else:
          shapenode = self.shapes.buildShape(groupid, properties, x, y, width, height, meta)
          items.append(shapenode)

src/ibmdiagrams/ibmbase/common.py

@@ -154,6 +154,9 @@ def setIconType(self, value):
    def isBuiltinIcons(self):
       return self.iconType == IconTypes.BUILTIN
 
+   def isDrawioIcons(self):
+      return self.iconType == IconTypes.DRAWIO
+
    def isStaticIcons(self):
       return self.iconType == IconTypes.STATIC
 

src/ibmdiagrams/ibmbase/options.py

@@ -34,6 +34,7 @@ class InputTypes(Enum):
 
 class IconTypes(Enum):
    BUILTIN = 'BUILTIN'
+   DRAWIO = 'DRAWIO'
    CATALOG = 'CATALOG'
    STATIC = 'STATIC'
 
@@ -222,6 +223,9 @@ def setIconType(self, value):
    def isBuiltinIcons(self):
       return self.iconType == IconTypes.BUILTIN
 
+   def isDrawioIcons(self):
+      return self.iconType == IconTypes.DRAWIO
+
    def isStaticIcons(self):
       return self.iconType == IconTypes.STATIC
 

src/ibmdiagrams/ibmbase/shapes.py

@@ -31,6 +31,10 @@ def buildShape(self, id, properties, x, y, width, height, meta):
       node = self.types.buildShape(id, properties, x, y, width, height, meta)
       return node
 
+   def buildDrawioShape(self, id, properties, x, y, width, height, meta):
+      node = self.types.buildDrawioShape(id, properties, x, y, width, height, meta)
+      return node
+
    def buildLink(self, id, label, source, target, startarrow, endarrow, startfill, endfill, linetype, linewidth, linecolor, fontname, fontsize, meta):
        return self.types.buildLink(id, label, source, target, startarrow, endarrow, startfill, endfill, linetype, linewidth, linecolor, fontname, fontsize, meta)
 

src/ibmdiagrams/ibmbase/terraform.py

@@ -189,10 +189,10 @@ def loadTerraform(self):
                subnets = instanceattributes["subnets"]
                # TBD Duplicate VPCs with slzvsi, one with subnets, other with empty subnets, so skip empty subnets.
                #     No duplication VPCs with slzvpc (no VSIs), so keep empty subnets.
-               if not instanceInstances.empty:
-                  if subnets == []:
-                     #instancerow = {}
-                     continue
+               #if not instanceInstances.empty:
+               #   #@TEST if subnets == []:
+               #   #@TEST   #instancerow = {}
+               #   #@TEST   continue
                instancerow = {"id": instanceid} | instanceattributes
                tempvpcs[count] = instancerow
                count += 1
@@ -756,7 +756,7 @@ def getReservedIPs(self):
       return self.reservedIPs
 
    def hasServices(self):
-      return not self.flowLogs.empty or not self.transitGateways.empty or not self.activityTrackers.empty or not self.keyManagement.empty or not self.objectBuckets.empty
+      return not self.flowLogs.empty or not self.transitGateways.empty or not self.activityTrackers.empty or not self.keyManagements.empty or not self.objectBuckets.empty
 
    def hasFlowLogs(self):
       return not self.flowLogs.empty