knife-azure 2.0.11 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6de7af42a6cf8184a9f2b57ad1556034f129f49812c9c3573a70a22cf95c6fe
-  data.tar.gz: c1aac2ac6eb7c5e0127d8971a3de4fd5fdb085f4521a6c414c857259e20a825e
+  metadata.gz: 17210f56bc1b6b7efd7152512c8ee5c416d0eb6afed2139f757bbd96f20baaa8
+  data.tar.gz: 3cba997f30e540035c9b4495326c09e70d45a3c0d7c9f84d01377168bf73837f
 SHA512:
-  metadata.gz: 215f6a9ebf1f3339e589c48bd86ddf0c762426b26a05972b0660c541f7caedcaa695ed8f38da63fe354eff53af2a2a2caa50f3a2959d268d2e8f2e2cb75d488d
-  data.tar.gz: 3d3ee631a0e3a68fd3af1c50298ceecf7ac04978b1928be79f552e0405bff167cd92793aa4e90e9344ead46cc4518ab359a4eb391a4b1a3b45f6e5602f7c32ea
+  metadata.gz: 884f5d06b3ad5159a97a81434e508185c64c0850f135b2b71094f70076aeecc0b7670f58d83215531344b903820caefeacec85aee53f7d254cbbbe22eca21548
+  data.tar.gz: f57c4e8b5cad7a9437a4292c1c41b2ff668d9c42f32c322ef1f1ac7fe87d735b8fff7c8d2859500958f3e11616487e0606960f75d39c7948fbdc0fdb46723924

data/lib/azure/azure_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # 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 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/helpers.rb

@@ -1,6 +1,6 @@
 #
 # Author:: vasundhara.jagdale@clogeny.com
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # 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 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/resource_management/ARM_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,11 +44,11 @@ module Azure
       attr_accessor :connection
 
       def initialize(params = {})
-        if params[:azure_client_secret]
-          token_provider = MsRestAzure::ApplicationTokenProvider.new(params[:azure_tenant_id], params[:azure_client_id], params[:azure_client_secret])
-        else
-          token_provider = MsRest::StringTokenProvider.new(params[:token], params[:tokentype])
-        end
+        token_provider = if params[:azure_client_secret]
+                           MsRestAzure::ApplicationTokenProvider.new(params[:azure_tenant_id], params[:azure_client_id], params[:azure_client_secret])
+                         else
+                           MsRest::StringTokenProvider.new(params[:token], params[:tokentype])
+                         end
         @credentials = MsRest::TokenCredentials.new(token_provider)
         @azure_subscription_id = params[:azure_subscription_id]
         super
@@ -215,7 +215,7 @@ module Azure
         if e.body
           err_json = JSON.parse(e.response.body)
           if err_json["error"]["code"] == "ResourceNotFound"
-            return false
+            false
           else
             raise e
           end
@@ -229,7 +229,7 @@ module Azure
         if e.body
           err_json = JSON.parse(e.response.body)
           if err_json["error"]["code"] == "ResourceNotFound"
-            return false
+            false
           else
             raise e
           end
@@ -323,7 +323,7 @@ module Azure
         else
           ui.log("Creating ResourceGroup....\n\n")
           resource_group = create_resource_group(params)
-          Chef::Log.info("ResourceGroup creation successfull.")
+          Chef::Log.info("ResourceGroup creation successful.")
           Chef::Log.info("Resource Group name is: #{resource_group.name}")
           Chef::Log.info("Resource Group ID is: #{resource_group.id}")
         end
@@ -355,7 +355,7 @@ module Azure
 
           ui.log("Creating Virtual Machine....")
           deployment = create_virtual_machine_using_template(params)
-          ui.log("Virtual Machine creation successfull.") unless deployment.nil?
+          ui.log("Virtual Machine creation successful.") unless deployment.nil?
 
           unless deployment.nil?
             ui.log("Deployment name is: #{deployment.name}")
@@ -422,8 +422,7 @@ module Azure
         deploy_params = Deployment.new
         deploy_params.properties = deploy_prop
 
-        deployment = resource_management_client.deployments.create_or_update(params[:azure_resource_group_name], "#{params[:azure_vm_name]}_deploy", deploy_params)
-        deployment
+        resource_management_client.deployments.create_or_update(params[:azure_resource_group_name], "#{params[:azure_vm_name]}_deploy", deploy_params)
       end
 
       def create_vm_extension(params)
@@ -467,8 +466,7 @@ module Azure
           params[:chef_extension]
         ).last.name
         ext_version_split_values = ext_version.split(".")
-        ext_version = ext_version_split_values[0] + "." + ext_version_split_values[1]
-        ext_version
+        ext_version_split_values[0] + "." + ext_version_split_values[1]
       end
 
       def delete_resource_group(resource_group_name)

data/lib/azure/resource_management/vnet_config.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,7 @@ module Azure::ARM
       if error.body
         err_json = JSON.parse(error.response.body)
         if err_json["error"]["code"] == "ResourceNotFound"
-          return false
+          false
         else
           raise error
         end

data/lib/azure/resource_management/windows_credentials.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nimisha Sharad (nimisha.sharad@clogeny.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -101,7 +101,7 @@ module Azure
           credential[:tokentype] = tokentype[0].split(":")[1]
           credential[:user] = user[0].split(":")[1]
           credential[:token] = access_token[0].split(":")[1]
-          # Todo: refresh_token is not complete currently
+          # TODO: refresh_token is not complete currently
           # target_name method needs to be modified for that
           credential[:refresh_token] = refresh_token[0].split(":")[1]
           credential[:clientid] = clientid[0].split(":")[1]
@@ -123,8 +123,8 @@ module Azure
       def target_name
         # cmdkey command is used for accessing windows credential manager.
         # Multiple credentials get created in windows credential manager for a single Azure account in xplat-cli
-        # One of them is for common tanent id, which can't be used
-        # Others end with --0-x,--1-x,--2-x etc, where x represents the total no. of credentails across which the token is divided
+        # One of them is for common tenant id, which can't be used
+        # Others end with --0-x,--1-x,--2-x etc, where x represents the total no. of credentials across which the token is divided
         # The one ending with --0-x has the complete accessToken in the credentialBlob.
         # Refresh Token is split across both credentials (ending with --0-x and --1-x).
         # Xplat splits the credentials based on the number of bytes of the tokens.
@@ -150,8 +150,7 @@ module Azure
 
         # If "azure login" is run for multiple users, there will be multiple credentials
         # Picking up the latest logged in user's credentials
-        latest_target = latest_credential_target target_names
-        latest_target
+        latest_credential_target target_names
       end
 
       def latest_credential_target(targets)

data/lib/azure/service_management/ASM_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/ag.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeff Mendoza (jeffmendoza@live.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/certificate.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Mukta Aphale (mukta.aphale@clogeny.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -85,7 +85,7 @@ module Azure
       ca.add_extension(ef.create_extension("keyUsage", "keyCertSign, cRLSign", true))
       ca.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false))
       ca.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false))
-      ca.sign(key, OpenSSL::Digest::SHA256.new)
+      ca.sign(key, OpenSSL::Digest.new("SHA256"))
       # Generate the SHA1 fingerprint of the der format of the X 509 certificate
       @fingerprint = OpenSSL::Digest::SHA1.new(ca.to_der)
       # Create the pfx format of the certificate
@@ -142,7 +142,7 @@ module Azure
       puts "Certificate Thumbprint: #{@thumbprint.to_s.upcase}"
       puts "*" * 70
 
-      Chef::Config[:knife][:ca_trust_file] = file_path + ".pem" if Chef::Config[:knife][:ca_trust_file].nil?
+      config[:ca_trust_file] = file_path + ".pem" if config[:ca_trust_file].nil?
       cert_data = File.read (file_path + ".b64")
       add_certificate cert_data, @winrm_cert_passphrase, "pfx", cert_params[:azure_dns_name]
       @thumbprint
@@ -216,7 +216,7 @@ module Azure
       cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false))
       cert.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false))
       cert.add_extension(ef.create_extension("extendedKeyUsage", "1.3.6.1.5.5.7.3.1", false))
-      cert.sign(rsa_key, OpenSSL::Digest::SHA1.new)
+      cert.sign(rsa_key, OpenSSL::Digest.new("SHA1"))
       @thumbprint = OpenSSL::Digest::SHA1.new(cert.to_der)
       cert
     end

data/lib/azure/service_management/connection.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/deploy.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/disk.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/host.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/image.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/loadbalancer.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aiman Alsari (aiman.alsari@gmail.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/rest.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/role.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/storageaccount.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/utility.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/azure/service_management/vnet.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeff Mendoza (jeffmendoza@live.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/azure_ag_create.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeff Mendoza (jeffmendoza@live.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "azure_base"
+require_relative "helpers/azure_base"
 
 class Chef
   class Knife
@@ -50,9 +50,9 @@ class Chef
           :azure_service_location)
 
         params = {
-          azure_ag_name: locate_config_value(:azure_affinity_group),
-          azure_ag_desc: locate_config_value(:azure_ag_desc),
-          azure_location: locate_config_value(:azure_service_location),
+          azure_ag_name: config[:azure_affinity_group],
+          azure_ag_desc: config[:azure_ag_desc],
+          azure_location: config[:azure_service_location],
         }
 
         rsp = service.create_affinity_group(params)

data/lib/chef/knife/azure_ag_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeff Mendoza (jeffmendoza@live.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "azure_base"
+require_relative "helpers/azure_base"
 
 class Chef
   class Knife

data/lib/chef/knife/azure_image_list.rb

@@ -2,7 +2,7 @@
 # Author:: Barry Davis (barryd@jetstreamsoftware.com)
 # Author:: Seth Chisamore (<schisamo@chef.io>)
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require_relative "azure_base"
+require_relative "helpers/azure_base"
 
 class Chef
   class Knife
@@ -40,7 +40,7 @@ class Chef
         validate_asm_keys!
         items = service.list_images
 
-        image_labels = !locate_config_value(:show_all_fields) ? %w{Name OS Location} : %w{Name Category Label OS Location}
+        image_labels = !config[:show_all_fields] ? %w{Name OS Location} : %w{Name Category Label OS Location}
         image_list =  image_labels.map { |label| ui.color(label, :bold) }
 
         image_items = image_labels.map(&:downcase)
@@ -49,7 +49,7 @@ class Chef
         end
 
         puts "\n"
-        puts ui.list(image_list, :uneven_columns_across, !locate_config_value(:show_all_fields) ? 3 : 5)
+        puts ui.list(image_list, :uneven_columns_across, !config[:show_all_fields] ? 3 : 5)
       end
     end
   end

data/lib/chef/knife/azure_internal-lb_create.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aiman Alsari (aiman.alsari@gmail.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "azure_base"
+require_relative "helpers/azure_base"
 
 class Chef
   class Knife
@@ -50,10 +50,10 @@ class Chef
         validate_asm_keys!(:azure_load_balancer)
 
         params = {
-          azure_load_balancer: locate_config_value(:azure_load_balancer),
-          azure_lb_static_vip: locate_config_value(:azure_lb_static_vip),
-          azure_subnet_name: locate_config_value(:azure_subnet_name),
-          azure_dns_name: locate_config_value(:azure_dns_name),
+          azure_load_balancer: config[:azure_load_balancer],
+          azure_lb_static_vip: config[:azure_lb_static_vip],
+          azure_subnet_name: config[:azure_subnet_name],
+          azure_dns_name: config[:azure_dns_name],
         }
 
         rsp = service.create_internal_lb(params)

data/lib/chef/knife/azure_internal-lb_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aiman Alsari (aiman.alsari@gmail.com)
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "azure_base"
+require_relative "helpers/azure_base"
 
 class Chef
   class Knife