Resolve conflict

.expeditor/verify.pipeline.yml

@@ -11,20 +11,22 @@ expeditor:
 
 steps:
 
-- label: run-specs-ruby-2.6
+- label: run-specs-ruby-2.7
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-buster
-- label: run-specs-ruby-2.7
+        image: ruby:2.7-buster
+
+- label: run-specs-ruby-3.0
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.7-buster
+        image: ruby:3.0-buster
+
 - label: run-specs-windows
   command:
     - bundle config --local path vendor/bundle
@@ -34,3 +36,4 @@ steps:
     executor:
       docker:
         host_os: windows
+        image: rubydistros/windows-2019:2.7

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "06:00"
+    timezone: America/Los_Angeles
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: activesupport
+    versions:
+    - 6.1.1
+    - 6.1.2
+    - 6.1.2.1
+    - 6.1.3

.rubocop.yml

@@ -1,79 +1,25 @@
-Layout/DefEndAlignment:
-  Exclude:
-    - 'lib/azure/custom_errors.rb'
-    - 'lib/azure/service_management/ASM_interface.rb'
-
-Layout/EndAlignment:
-  Exclude:
-    - 'lib/azure/resource_management/ARM_interface.rb'
-    - 'lib/azure/resource_management/windows_credentials.rb'
-    - 'lib/azure/service_management/role.rb'
-    - 'lib/chef/knife/azure_server_delete.rb'
-    - 'spec/unit/azure_base_spec.rb'
-
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'lib/azure/service_management/rest.rb'
-
-Lint/AmbiguousRegexpLiteral:
-  Exclude:
-    - 'lib/chef/knife/helpers/azurerm_base.rb'
-
-Lint/DuplicateMethods:
-  Exclude:
-    - 'lib/azure/service_management/storageaccount.rb'
+Naming/VariableName:
+  Enabled: false
 
+# Offense count: 2
 Lint/Loop:
   Exclude:
     - 'lib/azure/resource_management/ARM_interface.rb'
-    - 'lib/azure/service_management/certificate.rb'
-    - 'lib/chef/knife/azure_server_create.rb'
-
-Lint/ParenthesesAsGroupedExpression:
-  Exclude:
-    - 'lib/azure/resource_management/ARM_deployment_template.rb'
-    - 'lib/azure/service_management/certificate.rb'
-    - 'lib/azure/service_management/deploy.rb'
-    - 'spec/unit/ags_spec.rb'
-    - 'spec/unit/azurerm_base_spec.rb'
-    - 'spec/unit/azurerm_server_delete_spec.rb'
-    - 'spec/unit/deploys_list_spec.rb'
-    - 'spec/unit/disks_spec.rb'
-    - 'spec/unit/hosts_spec.rb'
-    - 'spec/unit/roles_list_spec.rb'
-    - 'spec/unit/storageaccount_spec.rb'
-    - 'spec/unit/vnet_spec.rb'
 
+# Offense count: 14
 Lint/UselessAssignment:
-  Enabled: false
-
-Naming/VariableName:
   Exclude:
     - 'lib/azure/resource_management/ARM_deployment_template.rb'
-    - 'lib/azure/service_management/deploy.rb'
-    - 'lib/azure/service_management/host.rb'
-    - 'lib/azure/service_management/loadbalancer.rb'
-    - 'lib/azure/service_management/role.rb'
-    - 'lib/azure/service_management/storageaccount.rb'
-    - 'spec/functional/host_test.rb'
-    - 'spec/unit/images_spec.rb'
-    - 'spec/unit/query_azure_mock.rb'
-
-Style/For:
-  Exclude:
-    - 'lib/azure/resource_management/ARM_deployment_template.rb'
-    - 'lib/azure/service_management/certificate.rb'
-    - 'lib/azure/service_management/role.rb'
-
-Style/NonNilCheck:
-  Exclude:
-    - 'lib/azure/service_management/deploy.rb'
-    - 'lib/chef/knife/azure_server_create.rb'
-    - 'lib/chef/knife/bootstrap_azure.rb'
-    - 'lib/chef/knife/helpers/azure_base.rb'
+    - 'lib/azure/resource_management/ARM_interface.rb'
+    - 'lib/azure/resource_management/windows_credentials.rb'
+    - 'lib/chef/knife/azurerm_server_create.rb'
+    - 'lib/chef/knife/azurerm_server_delete.rb'
+    - 'lib/chef/knife/helpers/azurerm_base.rb'
+    - 'spec/unit/azurerm_server_delete_spec.rb'
+    - 'spec/unit/azurerm_server_show_spec.rb'
 
+# Offense count: 1
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
-    - 'lib/azure/service_management/role.rb'
     - 'lib/chef/knife/helpers/azurerm_base.rb'

CHANGELOG.md

@@ -1,25 +1,24 @@
 # knife-azure Change Log
 
-<!-- latest_release 3.0.7 -->
-## [v3.0.7](https://github.com/chef/knife-azure/tree/v3.0.7) (2020-09-10)
-
-#### Merged Pull Requests
-- Update activesupport requirement from 6.0.3.1 to 6.0.3.3 [#536](https://github.com/chef/knife-azure/pull/536) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
+<!-- latest_release -->
 <!-- latest_release -->
 
-<!-- release_rollup since=3.0.6 -->
-### Changes not yet released to rubygems.org
-
-#### Merged Pull Requests
-- Update activesupport requirement from 6.0.3.1 to 6.0.3.3 [#536](https://github.com/chef/knife-azure/pull/536) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 3.0.7 -->
+<!-- release_rollup -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v4.0.0](https://github.com/chef/knife-azure/tree/v4.0.0) (2021-06-03)
+
+#### Merged Pull Requests
+- Update activesupport requirement from 6.0.3.1 to 6.0.3.3 [#536](https://github.com/chef/knife-azure/pull/536) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
+- Upgrade to GitHub-native Dependabot [#544](https://github.com/chef/knife-azure/pull/544) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
+- Remove the legacy azure commands that use the new deprecated API [#548](https://github.com/chef/knife-azure/pull/548) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
 ## [v3.0.6](https://github.com/chef/knife-azure/tree/v3.0.6) (2020-09-09)
 
 #### Merged Pull Requests
 - improve load performance by autoloading ARMInterface [#534](https://github.com/chef/knife-azure/pull/534) ([mwrock](https://github.com/mwrock))
-<!-- latest_stable_release -->
 
 ## [v3.0.5](https://github.com/chef/knife-azure/tree/v3.0.5) (2020-08-21)
 

Gemfile

@@ -2,32 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
-group :debug do
-  gem "pry"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
-end
-
 group :test do
-  # until we remove support for Ruby 2.5
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
-    gem "chef-zero", "< 15.0"
-  end
-  gem "activesupport", "6.0.3.3"
   gem "chefstyle"
-  gem "equivalent-xml", "~> 0.6.0"
-  gem "guard-rspec"
-  gem "knife-cloud", ">= 1.0.0"
-  gem "mixlib-config", ">= 3.0", "< 5"
-  gem "mixlib-shellout"
   gem "rake"
-  gem "rb-readline"
   gem "rspec", ">= 3.0"
   gem "rspec_junit_formatter"
 end
-
-group :docs do
-  gem "github-markup"
-  gem "redcarpet"
-  gem "yard"
-end

README.md

@@ -27,29 +27,21 @@ https://downloads.chef.io/chef-workstation/
 
 ## Modes
 
-`knife-azure 1.6.0` onwards supports Azure Resource Manager (preferred). You can easily switch between:
-
-- Resource manager: commands using the Azure Resource Manager API
-- Service management: commands using the Azure service management API
-
-They are not designed to work together. Commands starting with `knife azurerm` use ARM mode, while commands starting with `knife azure` use ASM mode.
+`knife-azure 4.0` onwards removes the legacy `knife azure` commands that utilized the Azure Service Management API. This API was deprecated in March 2018.
 
 ## Configuration
 
 1. [ARM Configuration](docs/configuration.md#arm-mode)
-1. [ASM Configuration](docs/configuration.md#asm-mode)
 
 ## Detailed Usage
 
 1. [ARM Mode](docs/ARM.md)
-1. [ASM Mode](docs/ASM.md)
 
-## Bootstrap existing VM to install the chef-client using chef-extension
+## Bootstrap existing VM to install the Chef Infra Client using chef-extension
 
-We have added a utility in ARM and ASM to bootstrap existing VM. This will install the chef-client using chef extension on your VM.
+We have added a utility to bootstrap existing VM. This will install the Chef Infra Client using chef extension on your VM.
 
 1. [Bootstrap Doc for ARM Mode](docs/bootstrap.md#arm-mode)
-1. [Bootstrap Doc for ASM Mode](docs/bootstrap.md#asm-mode)
 
 ## Contributing
 

Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2010-2019, Chef Software Inc.
+# Copyright:: Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,18 +57,4 @@ rescue LoadError
   puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
 end
 
-begin
-  require "yard" unless defined?(YARD)
-  YARD::Rake::YardocTask.new(:docs)
-rescue LoadError
-  puts "yard is not available. bundle install first to make sure all dependencies are installed."
-end
-
-task :console do
-  require "irb"
-  require "irb/completion"
-  ARGV.clear
-  IRB.start
-end
-
 task default: %i{style spec}

VERSION

@@ -1 +1 @@
-3.0.7
+4.0.0