Kevinhillinger/v2.0.2 (#652)

* updating pyproj * updating index
microsoft · Jan 30, 2024 · 87b16ef · 87b16ef
1 parent e5c90d1
commit 87b16ef
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 54 deletions.
diff --git a/cli/README.md b/cli/README.md
@@ -1,53 +1,4 @@
 # Commercial Marketplace Offer Deployment Manager (MODM)
 
-MODM Development CLI library
-
-
-## Package building
-
-```
-# packaged using 1st party VM offer
-modm package build \
-    --name "simple terraform app" \
-    --description "Simple Terraform application template that deploys a storage account" \
-    --version v2.0.0 \
-    --main-template build/managedapp/terraform/simple/templates/main.tf \
-    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
-    --out-dir ./bin
-
-# packaged using vmi reference
-modm package build \
-    --name "simple terraform app" \
-    --description "Simple Terraform application template that deploys a storage account" \
-    --version v2.0.0 \
-    --vmi-reference true \
-    --main-template build/managedapp/terraform/simple/templates/main.tf \
-    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
-    --out-dir ./bin
-
-# packaged using vmi reference id that will be used directly
-modm package build \
-    --name "simple terraform app" \
-    --description "Simple Terraform application template that deploys a storage account" \
-    --version v2.0.0 \
-    --vmi-reference-id /subscriptions/31e9f9a0-9fd2-4294-a0a3-0101246d9700/resourceGroups/modm-dev-vmi/providers/Microsoft.Compute/galleries/modm.dev.sig/images/modm/versions/0.1.96 \
-    --main-template build/managedapp/terraform/simple/templates/main.tf \
-    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
-    --out-dir ./bin
-```
-
-## resources file
-
-```
-modm util create-resources-archive -v 2.0.0 -t ./templates -f src/Functions/Functions.csproj -o ./dist
-
-# reference the resource file directly
-modm package build \
-    --name "simple terraform app" \
-    --description "Simple Terraform application template that deploys a storage account" \
-    --resources-file ./dist/resources-v2.0.0.tar.gz \
-    --vmi-reference-id /subscriptions/31e9f9a0-9fd2-4294-a0a3-0101246d9700/resourceGroups/modm-dev-vmi/providers/Microsoft.Compute/galleries/modm.dev.sig/images/modm/versions/0.1.96 \
-    --main-template build/managedapp/terraform/simple/templates/main.tf \
-    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
-    --out-dir ./bin
-```
+This is the packaging SDK for the Microsoft Marketplace App Installer that supports Terraform and Bicep templates 
+packaged directly, without having to migrate application solution templates to ARM Templates for Azure.
diff --git a/cli/devcli/README.md b/cli/devcli/README.md
@@ -0,0 +1,50 @@
+
+
+## Package building
+
+```
+# packaged using 1st party VM offer
+modm package build \
+    --name "simple terraform app" \
+    --description "Simple Terraform application template that deploys a storage account" \
+    --version v2.0.0 \
+    --main-template build/managedapp/terraform/simple/templates/main.tf \
+    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
+    --out-dir ./bin
+
+# packaged using vmi reference
+modm package build \
+    --name "simple terraform app" \
+    --description "Simple Terraform application template that deploys a storage account" \
+    --version v2.0.0 \
+    --vmi-reference true \
+    --main-template build/managedapp/terraform/simple/templates/main.tf \
+    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
+    --out-dir ./bin
+
+# packaged using vmi reference id that will be used directly
+modm package build \
+    --name "simple terraform app" \
+    --description "Simple Terraform application template that deploys a storage account" \
+    --version v2.0.0 \
+    --vmi-reference-id /subscriptions/31e9f9a0-9fd2-4294-a0a3-0101246d9700/resourceGroups/modm-dev-vmi/providers/Microsoft.Compute/galleries/modm.dev.sig/images/modm/versions/0.1.96 \
+    --main-template build/managedapp/terraform/simple/templates/main.tf \
+    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
+    --out-dir ./bin
+```
+
+## resources file
+
+```
+modm util create-resources-archive -v 2.0.0 -t ./templates -f src/Functions/Functions.csproj -o ./dist
+
+# reference the resource file directly
+modm package build \
+    --name "simple terraform app" \
+    --description "Simple Terraform application template that deploys a storage account" \
+    --resources-file ./dist/resources-v2.0.0.tar.gz \
+    --vmi-reference-id /subscriptions/31e9f9a0-9fd2-4294-a0a3-0101246d9700/resourceGroups/modm-dev-vmi/providers/Microsoft.Compute/galleries/modm.dev.sig/images/modm/versions/0.1.96 \
+    --main-template build/managedapp/terraform/simple/templates/main.tf \
+    --create-ui-definition build/managedapp/terraform/simple/createUiDefinition.json \
+    --out-dir ./bin
+```
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "commercial-marketplace-offer-deploy"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
   { name="Kevin Hillinger", email="kevin.hillinger@outlook.com" },
 ]
-description = "A small example package"
+description = "The Microsoft commercial marketplace app installer packaging SDK"
 readme = "README.md"
 license = { file = "LICENSE" }
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 dependencies = [
   'python-hcl2 >= 4.3.2',
   'click == 8.1.7',

diff --git a/index.json b/index.json
@@ -1,5 +1,30 @@
 {
     "releases": [
+        {
+            "version": "v2.0.2",
+            "description": "Latest release that references 1st party VM offer.",
+            "reference": {
+                "offer": {
+                    "plan": {
+                        "name": "modm_base_vm",
+                        "publisher": "microsoft_commercial_marketplace_services",
+                        "product": "modm_vm"
+                    },
+                    "imageReference": {
+                        "publisher": "microsoft_commercial_marketplace_services",
+                        "offer": "modm_vm",
+                        "sku": "modm_base_vm",
+                        "version": "latest"
+                    }
+                },
+                "vmi": "/subscriptions/31e9f9a0-9fd2-4294-a0a3-0101246d9700/resourceGroups/modm-dev-vmi/providers/Microsoft.Compute/galleries/modm.dev.sig/images/modm/versions/2.0.208"
+            },
+            "resources": {
+                "downloadUrl": "https://github.com/microsoft/commercial-marketplace-offer-deploy/releases/download/v2.0.2/resources-v2.0.2.tar.gz",
+                "filename": "resources-v2.0.2.tar.gz",
+                "sha256Digest": "5bd93e70bda4566310b71aced198eedcca489d69aea24496078ae8475f8639ee"
+            }
+        },
         {
             "version": "v2.0.1",
             "description": "v2.0.1 release that references 1st party VM offer.",