Merge branch 'main' into dependabot/bundler/mmv1/addressable-2.8.1

inspec · Nov 26, 2024 · 157d6d1 · 157d6d1
2 parents d5b8ba8 + 2954a05
commit 157d6d1
Show file tree

Hide file tree

Showing 358 changed files with 48,560 additions and 804 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ to help you get it set up.
 
 To get started, you'll need:
 
-* Ruby 2.6.0
+* Ruby 3.1.0
   * You can use `rbenv` to manage your Ruby version(s)
 * [`Bundler`](https://github.com/bundler/bundler)
   * This can be installed with `gem install bundler`
@@ -59,7 +59,7 @@ that directory.
 To get started right away, use the bootstrap script with:
 
 ```bash
-./tools/bootstrap
+./scripts/bootstrap
 ```
 
 ---
@@ -90,7 +90,7 @@ bundle install
 Now, you can verify you're ready with:
 
 ```bash
-./tools/doctor
+./scripts/doctor
 ```
 
 ### Generating the Terraform Providers

diff --git a/mmv1/.ruby-version b/mmv1/.ruby-version
@@ -1 +1 @@
-2.6.0
+3.1.0
diff --git a/mmv1/Gemfile.lock b/mmv1/Gemfile.lock
@@ -1,7 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -39,9 +41,10 @@ GEM
     faraday-retry (1.0.3)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
     metaclass (0.0.4)
-    minitest (5.14.1)
+    minitest (5.20.0)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
     multipart-post (2.3.0)
@@ -61,16 +64,20 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.77.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.58.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
@@ -79,10 +86,9 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
-
 PLATFORMS
   ruby
 
@@ -96,5 +102,4 @@ DEPENDENCIES
   rubocop (>= 0.77.0)
 
 BUNDLED WITH
-   1.17.2
-
+   2.4.13
diff --git a/mmv1/api/resource.rb b/mmv1/api/resource.rb
@@ -174,7 +174,6 @@ def validate
 
       set_variables(@parameters, :__resource)
       set_variables(@properties, :__resource)
-
       check :properties, type: Array, item_type: Api::Type, required: true unless @exclude
       check :parameters, type: Array, item_type: Api::Type unless @exclude
 

diff --git a/mmv1/compiler.rb b/mmv1/compiler.rb
@@ -23,6 +23,7 @@
 # generation.
 ENV['TZ'] = 'UTC'
 
+require 'active_support'
 require 'active_support/inflector'
 require 'active_support/core_ext/array/conversions'
 require 'api/compiler'

diff --git a/mmv1/google/yaml_validator.rb b/mmv1/google/yaml_validator.rb
@@ -22,7 +22,7 @@ def parse(content)
         # TODO(nelsonjr): Allow specifying which symbols to restrict it further.
         # But it requires inspecting all configuration files for symbol sources,
         # such as Enum values. Leaving it as a nice-to-have for the future.
-        YAML.safe_load(content, allowed_classes)
+        YAML.safe_load(content, permitted_classes: allowed_classes)
       end
 
       def allowed_classes