knife-azure 3.0.6 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a120193f05d7ce565f575ffd1937b482a84b6ba67feef7ff1cb6a6e00d3b692
-  data.tar.gz: 5f6b7262ad5d2a88ebe3f15530fe0d46c77bb22e72525963986ae9d5d9125f64
+  metadata.gz: b2b0c8e7095b9f0880e4d35af2728b7c71119ef5fd22138cc4e5f6ad37ab467b
+  data.tar.gz: a853c153d5d15328a0026c84f91c552329e72c87dc5935c32760435f10bff6f9
 SHA512:
-  metadata.gz: fe70cb6103a17b9b19360614bc22819dddd767f7b63f769074c6dd08b91c5ff93a77c03c47d75e7cb4c32f59dedb48f59a05463f838a605e53ef700f191737e9
-  data.tar.gz: f2ab1d40bad24448b0f10824a16fcc4196393b35c6396d1b9016c8cf08bbc00d72fbd80bda17d29dee049c09029062a9eeec6d3b3341f17c1690a74b9c46af2e
+  metadata.gz: 352cf2e4f22eaed979e964367e98e0e9c80a18e1b44352207f9bad659e8197a4355b4f9ff4393bd85248c5ffeceff672424902428385e17800aad36a8201600d
+  data.tar.gz: d9956696c10ce1e4c0a96d9d8d46826c8d4d8fe448778c274d1c658ac9485d136871f5843c7b952fbc92ba235ba784952a3241bc303b758ffc18af06c4d2a6fa

data/lib/azure/azure_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2012-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/custom_errors.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2012-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,6 @@ module CustomErrors
       caller.first =~ /in \`(.+)\'/
       method_name = $1
       raise CustomErrors::InterfaceNotImplementedError.new("#{klass.class.name} needs to implement '#{method_name}' for interface #{name}!")
-   end
+    end
   end
 end

data/lib/azure/helpers.rb

@@ -1,6 +1,6 @@
 #
 # Author:: vasundhara.jagdale@clogeny.com
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2012-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/resource_management/ARM_deployment_template.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nimisha Sharad (nimisha.sharad@clogeny.com)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2012-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,7 +51,7 @@ module Azure::ARM
       # Security Rule priority can be set between 100 and 4096
       rule_no = 300
       incremental = 0
-      for port in tcp_ports
+      tcp_ports.each do |port|
         rule_no += 2
         sec_grp_json["properties"]["securityRules"].push(
           "name" => vm_name + "_rule_" + incremental.to_s,
@@ -94,8 +94,8 @@ module Azure::ARM
         vmId = "[resourceId('Microsoft.Compute/virtualMachines', concat(variables('vmName'),copyIndex()))]"
         depVm2 = "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'), copyIndex())]"
         computerName = "[concat(variables('vmName'),copyIndex())]"
-        uri = "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',concat(variables('vmName'),copyIndex()),'.vhd')]"
         netid = "[resourceId('Microsoft.Network/networkInterfaces', concat(variables('nicName'), copyIndex()))]"
+        osDiskName = "[concat(variables('OSDiskName'),copyIndex())]"
 
         # Extension Variables
         extName = "[concat(variables('vmName'),copyIndex(),'/', variables('vmExtensionName'))]"
@@ -117,8 +117,8 @@ module Azure::ARM
         vmId = "[resourceId('Microsoft.Compute/virtualMachines', variables('vmName'))]"
         depVm2 = "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
         computerName = "[variables('vmName')]"
-        uri = "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('vmName'),'.vhd')]"
         netid = "[resourceId('Microsoft.Network/networkInterfaces', variables('nicName'))]"
+        osDiskName = "[variables('OSDiskName')]"
 
         # Extension Variables
         extName = "[concat(variables('vmName'),'/', variables('vmExtensionName'))]"
@@ -252,12 +252,41 @@ module Azure::ARM
               "description" => "Optional. Path to a client.rb file for use by the bootstrapped node.",
             },
           },
+          "CHEF_LICENSE" => {
+            "type" => "string",
+            "defaultValue" => "accept-no-persist",
+            "metadata" => {
+              "description" => "Optional. Chef Infra license acceptance value read and exported as an " \
+                "environment variable by the VM extension's own bootstrap script, so it also covers " \
+                "the extension's separate chef-apply cron-setup step (which does not read client_rb).",
+            },
+          },
           "bootstrap_version" => {
             "type" => "string",
             "metadata" => {
               "description" => "Optional. The version of Chef to install.",
             },
           },
+          "chef_license_key" => {
+            # securestring keeps this out of ARM deployment history/logs and the
+            # Azure Portal's deployment "Inputs" view (same treatment as
+            # adminPassword above). Per chef-partners/azure-chef-extension#413
+            # (version 1210.15.11.1, rolled out to all regions for both
+            # ChefClient and LinuxChefClient), the VM extension's install
+            # scripts now decrypt protectedSettings for this value and prefer
+            # it over the deprecated publicSettings location, so it is
+            # forwarded via the "protectedSettings" block below instead of
+            # plain "settings" - delivered to the VM CMS/PKCS7-encrypted and
+            # decrypted locally, the same treatment already given to
+            # validation_key/chef_server_crt/encrypted_data_bag_secret.
+            "type" => "securestring",
+            "metadata" => {
+              "description" => "Optional. Chef/Progress license key, forwarded to the VM extension's " \
+                "install.sh as chef_license_key so it can download Chef Infra Client from the licensed " \
+                "endpoints. When omitted, the extension falls back to the unlicensed omnitruck.chef.io " \
+                "download host with a warning.",
+            },
+          },
           "custom_json_attr" => {
             "type" => "string",
             "metadata" => {
@@ -302,7 +331,6 @@ module Azure::ARM
           },
         },
         "variables" => {
-          "storageAccountName" => "[concat(uniquestring(resourceGroup().id), '#{params[:azure_storage_account]}')]",
           "imagePublisher" => "#{params[:azure_image_reference_publisher]}",
           "imageOffer" => "#{params[:azure_image_reference_offer]}",
           "OSDiskName" => "#{params[:azure_os_disk_name]}",
@@ -311,7 +339,6 @@ module Azure::ARM
           "storageAccountType" => "#{params[:azure_storage_account_type]}",
           "publicIPAddressName" => "#{params[:azure_vm_name]}",
           "publicIPAddressType" => "Dynamic",
-          "vmStorageAccountContainerName" => "#{params[:azure_vm_name]}",
           "vmName" => "#{params[:azure_vm_name]}",
           "vmSize" => "#{params[:vm_size]}",
           "virtualNetworkName" => "#{params[:vnet_config][:virtualNetworkName]}",
@@ -323,15 +350,12 @@ module Azure::ARM
           "sshKeyPath" => "[concat('/home/',parameters('adminUserName'),'/.ssh/authorized_keys')]",
         },
         "resources" => [
-          {
-            "type" => "Microsoft.Storage/storageAccounts",
-            "name" => "[variables('storageAccountName')]",
-            "apiVersion" => "[variables('apiVersion')]",
-            "location" => "[resourceGroup().location]",
-            "properties" => {
-              "accountType" => "[variables('storageAccountType')]",
-            },
-          },
+          # NOTE: Managed disks are used for the OS disk below, so no separate
+          # Microsoft.Storage/storageAccounts resource is created here. Existing
+          # deployments created with an unmanaged-disk storage account continue to
+          # function as-is; this only affects new VM deployments. See Azure's
+          # migration guide if you want to move existing VMs to managed disks:
+          # https://docs.microsoft.com/en-us/azure/virtual-machines/windows/convert-unmanaged-to-managed-disks
           {
             "apiVersion" => "[variables('apiVersion')]",
             "type" => "Microsoft.Network/publicIPAddresses",
@@ -391,7 +415,15 @@ module Azure::ARM
             },
           },
           {
-            "apiVersion" => "[variables('apiVersion')]",
+            # NOTE: apiVersion "2020-12-01" is required, not just for managed disk
+            # support and managed boot diagnostics (both available since
+            # "2020-06-01", using Azure's managed-storage boot diagnostics instead
+            # of the storage account this template no longer creates), but also
+            # for the StandardSSD_ZRS/Premium_ZRS managed disk SKUs accepted by
+            # --azure-storage-account-type, which older API versions reject at
+            # deployment time. Don't switch this back to an older apiVersion
+            # without re-verifying managed disk, ZRS, and boot diagnostics support.
+            "apiVersion" => "2020-12-01",
             "type" => "Microsoft.Compute/virtualMachines",
             "name" => vmName,
             "location" => "[resourceGroup().location]",
@@ -400,7 +432,6 @@ module Azure::ARM
               "count" => "[parameters('numberOfInstances')]",
             },
             "dependsOn" => [
-              "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
               depVm2,
             ],
             "properties" => {
@@ -430,12 +461,12 @@ module Azure::ARM
                   "version" => "[parameters('imageVersion')]",
                 },
                 "osDisk" => {
-                  "name" => "[variables('OSDiskName')]",
-                  "vhd" => {
-                    "uri" => uri,
-                  },
+                  "name" => osDiskName,
                   "caching" => "ReadWrite",
                   "createOption" => "FromImage",
+                  "managedDisk" => {
+                    "storageAccountType" => "[variables('storageAccountType')]",
+                  },
                 },
               },
               "networkProfile" => {
@@ -447,8 +478,11 @@ module Azure::ARM
               },
               "diagnosticsProfile" => {
                 "bootDiagnostics" => {
+                  # Managed boot diagnostics: no storageUri is provided (or needed)
+                  # since apiVersion 2020-12-01+ provisions Azure-managed storage
+                  # for boot diagnostics automatically, instead of the storage
+                  # account this template no longer creates.
                   "enabled" => "true",
-                  "storageUri" => "[concat('http://',variables('storageAccountName'),'.blob.core.windows.net')]",
                 },
               },
             },
@@ -486,11 +520,17 @@ module Azure::ARM
                 "hints" => hints_json,
                 "client_rb" => "[parameters('client_rb')]",
                 "custom_json_attr" => "[parameters('custom_json_attr')]",
+                "CHEF_LICENSE" => "[parameters('CHEF_LICENSE')]",
               },
               "protectedSettings" => {
                 "validation_key" => "[parameters('validation_key')]",
                 "chef_server_crt" => "[parameters('chef_server_crt')]",
                 "encrypted_data_bag_secret" => "[parameters('encrypted_data_bag_secret')]",
+                # Per chef-partners/azure-chef-extension#413 (version
+                # 1210.15.11.1, rolled out to all regions), the extension's
+                # install scripts decrypt this from protectedSettings and
+                # prefer it over the deprecated publicSettings location.
+                "chef_license_key" => "[parameters('chef_license_key')]",
               },
             },
           },
@@ -501,8 +541,17 @@ module Azure::ARM
         set_val = {
           "name" => "[parameters('availabilitySetName')]",
           "type" => "Microsoft.Compute/availabilitySets",
-          "apiVersion" => "[variables('apiVersion')]",
+          # NOTE: variables('apiVersion') ("2015-06-15") is intentionally not used
+          # here. That old API version (and the absence of an explicit "Aligned"
+          # sku) creates a classic (unmanaged-disk-only) availability set, which
+          # Azure rejects VMs with managed OS disks from joining. Managed-disk
+          # compatible ("Aligned") availability sets require apiVersion
+          # 2016-04-30-preview or later plus this explicit sku.
+          "apiVersion" => "2020-12-01",
           "location" => "[resourceGroup().location]",
+          "sku" => {
+            "name" => "Aligned",
+          },
           "properties" => {
             "platformFaultDomainCount" => "[parameters('availabilitySetPlatformFaultDomainCount')]",
             "platformUpdateDomainCount" => "[parameters('availabilitySetPlatformUpdateDomainCount')]",
@@ -510,7 +559,7 @@ module Azure::ARM
         }
 
         length = template["resources"].length.to_i - 1
-        for i in 0..length do
+        (0..length).each do |i|
           if template["resources"][i]["type"] == "Microsoft.Compute/virtualMachines"
             template["resources"][i]["dependsOn"] << "[concat('Microsoft.Compute/availabilitySets/', parameters('availabilitySetName'))]"
             template["resources"][i]["properties"]["availabilitySet"] = { "id" => "[resourceId('Microsoft.Compute/availabilitySets', parameters('availabilitySetName'))]" }
@@ -523,7 +572,7 @@ module Azure::ARM
         sec_grp_json = tcp_ports(params[:tcp_endpoints], params[:azure_vm_name])
         template["resources"].insert(1, sec_grp_json)
         length = template["resources"].length.to_i - 1
-        for i in 0..length do
+        (0..length).each do |i|
           if template["resources"][i]["type"] == "Microsoft.Network/virtualNetworks"
             template["resources"][i] = template["resources"][i].merge({ "dependsOn" => [sec_grp] })
           end
@@ -558,7 +607,7 @@ module Azure::ARM
       end
       if params[:server_count].to_i > 1 && params[:chef_extension_private_param][:validation_key].nil?
         template["resources"].last["properties"]["protectedSettings"]["client_pem"] = "[parameters(concat('client_pem',copyIndex()))]"
-        0.upto (params[:server_count].to_i - 1) do |count|
+        0.upto(params[:server_count].to_i - 1) do |count|
           template["parameters"]["client_pem" + count.to_s] = {
             "type" => "string",
             "metadata" => {
@@ -644,6 +693,12 @@ module Azure::ARM
         "client_rb" => {
           "value" => "#{params[:chef_extension_public_param][:client_rb]}",
         },
+        "CHEF_LICENSE" => {
+          "value" => "#{params[:chef_extension_public_param][:CHEF_LICENSE]}",
+        },
+        "chef_license_key" => {
+          "value" => "#{params[:chef_extension_private_param][:chef_license_key]}",
+        },
         "bootstrap_version" => {
           "value" => "#{params[:chef_extension_public_param][:bootstrap_options][:bootstrap_version]}",
         },
@@ -658,7 +713,7 @@ module Azure::ARM
         },
       }
       if params[:server_count].to_i > 1 && params[:chef_extension_private_param][:validation_key].nil?
-        0.upto (params[:server_count].to_i - 1) do |count|
+        0.upto(params[:server_count].to_i - 1) do |count|
           parameters["client_pem#{count}"] = {
               "value" => "#{params[:chef_extension_private_param][("client_pem" + count.to_s).to_sym]}",
             }