vagrant_cloud 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5244a607d8479ce4eaeb153ad92eccc4b9cbbe66f7fbfe0dc3398eb1a1e4cc
-  data.tar.gz: 490dce0ee8f6348212d130e0dfb052c46019a63c79e6a8d773bc69e413b8cfd4
+  metadata.gz: 4768031887b3a27585e8cf55091810654545e2aee475d7e2b2dbff927e8c7d6f
+  data.tar.gz: 480e6a69c2eac82185ff3cd9d90a30f00cd26e4a7d45c548ed2ba2785ecef96d
 SHA512:
-  metadata.gz: 9776f4314c684123546653b38612f6e52e5cbd364d191383ed6e56a03824b2321c55e85fba99b669621babf346602f0ff799772bbb2cd583d0a70cf5010428ec
-  data.tar.gz: 7445dee9132c3babb2425f0f4f7d418372a10f273f5ecd9e4d4706c9e0bd752147efca6c49fb7209625161df0cfa9646149504a29fc4a43484323c08fde60280
+  metadata.gz: 7343ea8f89e7e4ecb8f9f2e0f1f5478a37382e3c4de44bb61ec40fcebd18b5e65f302365cfa02aead507d28883a3ab561bf3af949f77418e46366043ee7eddea
+  data.tar.gz: 50b74d2dcf7f8671afa67bfec5d0fdeebdf40b51206a48f53a35f21b63f65674e1859bcdcaeb2f9d79e940870df50c75b4e6fc9b412b86b1c028bcac9c9f2bcd

data/lib/vagrant_cloud/account.rb

@@ -75,7 +75,7 @@ module VagrantCloud
     #
     # @return [self]
     def validate_token
-      client.request(path: "authenticate")
+      client.authentication_token_validate
       self
     end
 
@@ -104,7 +104,7 @@ module VagrantCloud
 
     def setup!
       if client.access_token
-        r = client.request(path: "authenticate")
+        r = client.authentication_token_validate
         @username = r.dig(:user, :username)
       end
     end

data/lib/vagrant_cloud/box/provider.rb

@@ -14,9 +14,9 @@ module VagrantCloud
       attr_required :name
       attr_optional :hosted, :created_at, :updated_at,
         :checksum, :checksum_type, :original_url, :download_url,
-        :url
+        :url, :architecture, :default_architecture
 
-      attr_mutable :url, :checksum, :checksum_type
+      attr_mutable :url, :checksum, :checksum_type, :architecture, :default_architecture
 
       def initialize(version:, **opts)
         if !version.is_a?(Version)
@@ -35,7 +35,8 @@ module VagrantCloud
             username: version.box.username,
             name: version.box.name,
             version: version.version,
-            provider: name
+            provider: name,
+            architecture: architecture
           )
           pv = version.providers.dup
           pv.delete(self)
@@ -87,7 +88,8 @@ module VagrantCloud
           username: version.box.username,
           name: version.box.name,
           version: version.version,
-          provider: name
+          provider: name,
+          architecture: architecture,
         }
         if direct
           r = version.box.organization.account.client.box_version_provider_upload_direct(**req_args)
@@ -161,9 +163,17 @@ module VagrantCloud
           provider: name,
           checksum: checksum,
           checksum_type: checksum_type,
+          architecture: architecture,
+          default_architecture: default_architecture,
           url: url
         }
         if exist?
+          # If the provider already exists, use the original architecture
+          # value for locating the existing record and use the current
+          # architecture for the new_architecture value so it can be updated
+          # properly
+          req_args[:architecture] = data[:architecture]
+          req_args[:new_architecture] = architecture
           result = version.box.organization.account.client.box_version_provider_update(**req_args)
         else
           result = version.box.organization.account.client.box_version_provider_create(**req_args)

data/lib/vagrant_cloud/box/version.rb

@@ -20,7 +20,7 @@ module VagrantCloud
             Provider.load(version: self, **provider)
           end
         end
-        super(opts)
+        super(**opts)
         clean!
       end
 
@@ -90,12 +90,19 @@ module VagrantCloud
       #
       # @param [String] pname Name of provider
       # @return [Provider]
-      def add_provider(pname)
-        if providers.any? { |p| p.name == pname }
+      def add_provider(pname, architecture=nil)
+        if providers.any? { |p|
+             p.name == pname &&
+               (architecture.nil? || p.architecture == architecture)
+           }
           raise Error::BoxError::VersionProviderExistsError,
-            "Provider #{pname} already exists for box #{box.tag} version #{version}"
+            "Provider #{pname} already exists for box #{box.tag} version #{version} (#{architecture})"
         end
-        pv = Provider.new(version: self, name: pname)
+        pv = Provider.new(
+          version: self,
+          name: pname,
+        )
+        pv.architecture = architecture if architecture
         clean(data: {providers: providers + [pv]})
         pv
       end

data/lib/vagrant_cloud/box.rb

@@ -18,7 +18,7 @@ module VagrantCloud
       @organization = organization
       @versions_loaded = false
       opts[:username] = organization.username
-      super(opts)
+      super(**opts)
       if opts[:versions] && !opts[:versions].empty?
         self.versions= Array(opts[:versions]).map do |version|
           Box::Version.load(box: self, **version)

data/lib/vagrant_cloud/client.rb

@@ -1,8 +1,12 @@
 module VagrantCloud
   class Client
     include Logger
-    # Base Vagrant Cloud API URL
-    DEFAULT_URL = 'https://vagrantcloud.com/api/v1'.freeze
+    # Path to the v1 API
+    API_V1_PATH = "/api/v1".freeze
+    # Path to the v2 API
+    API_V2_PATH = "/api/v2".freeze
+    # Default host URL
+    API_DEFAULT_URL = "https://vagrantcloud.com".freeze
     # Valid methods that can be retried
     IDEMPOTENT_METHODS = [:get, :head].freeze
     # Number or allowed retries
@@ -41,10 +45,13 @@ module VagrantCloud
     # @param [Instrumentor::Core] instrumentor Instrumentor to use
     # @return [Client]
     def initialize(access_token: nil, url_base: nil, retry_count: nil, retry_interval: nil, instrumentor: nil)
-      url_base = DEFAULT_URL if url_base.nil?
+      url_base = API_DEFAULT_URL if url_base.nil?
       remote_url = URI.parse(url_base)
       @url_base = "#{remote_url.scheme}://#{remote_url.host}"
       @path_base = remote_url.path
+      if @path_base == API_V1_PATH || @path_base == API_V2_PATH
+        @path_base = nil
+      end
       @access_token = access_token.dup.freeze if access_token
       if !@access_token && ENV["VAGRANT_CLOUD_TOKEN"]
         @access_token = ENV["VAGRANT_CLOUD_TOKEN"].dup.freeze
@@ -90,10 +97,19 @@ module VagrantCloud
     # @param [String, URI] path Path of request
     # @param [Hash] params Parameters to send with request
     # @return [Hash]
-    def request(path:, method: :get, params: {})
-      if !path.start_with?(path_base)
+    def request(path:, method: :get, params: {}, api_version: 2)
+      if path_base.nil? || !path.start_with?(path_base)
+        if !path_base.nil?
+          start_path = path_base
+        elsif api_version == 1
+          start_path = API_V1_PATH
+        elsif api_version == 2
+          start_path = API_V2_PATH
+        else
+          raise "Unsupported API version provided"
+        end
         # Build the full path for the request and clean it
-        path = [path_base, path].compact.join("/").gsub(/\/{2,}/, "/")
+        path = [start_path, path].compact.join("/").gsub(/\/{2,}/, "/")
       end
       method = method.to_s.downcase.to_sym
 
@@ -151,15 +167,17 @@ module VagrantCloud
     # Submit a search on Vagrant Cloud
     #
     # @param [String] query Search query
+    # @param [String] architecture Limit results to only this architecture
     # @param [String] provider Limit results to only this provider
     # @param [String] sort Field to sort results ("downloads", "created", or "updated")
     # @param [String] order Order to return sorted result ("desc" or "asc")
     # @param [Integer] limit Number of results to return
     # @param [Integer] page Page number of results to return
     # @return [Hash]
-    def search(query: Data::Nil, provider: Data::Nil, sort: Data::Nil, order: Data::Nil, limit: Data::Nil, page: Data::Nil)
+    def search(query: Data::Nil, architecture: Data::Nil, provider: Data::Nil, sort: Data::Nil, order: Data::Nil, limit: Data::Nil, page: Data::Nil)
       params = {
         q: query,
+        architecture: architecture,
         provider: provider,
         sort: sort,
         order: order,
@@ -189,14 +207,14 @@ module VagrantCloud
           code: code
         }
       }
-      request(method: :post, path: "authenticate", params: params)
+      request(method: :post, path: "authenticate", params: params, api_version: 1)
     end
 
     # Delete the token currently in use
     #
     # @return [Hash] empty
     def authentication_token_delete
-      request(method: :delete, path: "authenticate")
+      request(method: :delete, path: "authenticate", api_version: 1)
     end
 
     # Request a 2FA code is sent
@@ -217,7 +235,7 @@ module VagrantCloud
         }
       }
 
-      request(method: :post, path: "two-factor/request-code", params: params)
+      request(method: :post, path: "two-factor/request-code", params: params, api_version: 1)
     end
 
     # Validate the current token
@@ -367,9 +385,14 @@ module VagrantCloud
     # @param [String] name Box name
     # @param [String] version Box version
     # @param [String] provider Provider name
+    # @param [String] architecture Architecture name
     # @return [Hash] box version provider information
-    def box_version_provider_get(username:, name:, version:, provider:)
-      request(method: :get, path: "/box/#{username}/#{name}/version/#{version}/provider/#{provider}")
+    def box_version_provider_get(username:, name:, version:, provider:, architecture: nil)
+      req_path = ["/box", username, name, "version", version,
+        "provider", provider, architecture].compact.join("/")
+      api_version = architecture.nil? ? 1 : 2
+
+      request(method: :get, path: req_path, api_version: api_version)
     end
 
     # Create a new box version provider
@@ -378,17 +401,35 @@ module VagrantCloud
     # @param [String] name Box name
     # @param [String] version Box version
     # @param [String] provider Provider name
+    # @param [String] architecture Architecture name
+    # @param [Boolean] default_architecture Flag architecture as default in named provider group
     # @param [String] url Remote URL for box download
     # @return [Hash] box version provider information
-    def box_version_provider_create(username:, name:, version:, provider:, url: Data::Nil, checksum: Data::Nil, checksum_type: Data::Nil)
-      request(method: :post, path: "/box/#{username}/#{name}/version/#{version}/providers", params: {
-        provider: {
-          name: provider,
-          url: url,
-          checksum: checksum,
-          checksum_type: checksum_type
-        }
-      })
+    def box_version_provider_create(username:, name:, version:, provider:, architecture: nil, default_architecture: Data::Nil, url: Data::Nil, checksum: Data::Nil, checksum_type: Data::Nil)
+      provider_params = {
+        name: provider,
+        url: url,
+        checksum: checksum,
+        checksum_type: checksum_type
+      }
+      if architecture.nil?
+        api_version = 1
+      else
+        api_version = 2
+        provider_params.merge!(
+          architecture: architecture,
+          default_architecture: default_architecture
+        )
+      end
+
+      request(
+        method: :post,
+        path: "/box/#{username}/#{name}/version/#{version}/providers",
+        params: {
+          provider: provider_params
+        },
+        api_version: api_version
+      )
     end
 
     # Update an existing box version provider
@@ -397,18 +438,31 @@ module VagrantCloud
     # @param [String] name Box name
     # @param [String] version Box version
     # @param [String] provider Provider name
+    # @param [String] architecture Current architecture name
+    # @param [String] new_architecture New architecture name to apply
     # @param [String] url Remote URL for box download
     # @return [Hash] box version provider information
-    def box_version_provider_update(username:, name:, version:, provider:, url: Data::Nil, checksum: Data::Nil, checksum_type: Data::Nil)
-      params = {
-        provider: {
-          name: provider,
-          url: url,
-          checksum: checksum,
-          checksum_type: checksum_type
-        }
+    def box_version_provider_update(username:, name:, version:, provider:, architecture: nil, new_architecture: Data::Nil, default_architecture: Data::Nil, url: Data::Nil, checksum: Data::Nil, checksum_type: Data::Nil)
+      provider_params = {
+        name: provider,
+        url: url,
+        checksum: checksum,
+        checksum_type: checksum_type
       }
-      request(method: :put, path: "/box/#{username}/#{name}/version/#{version}/provider/#{provider}", params: params)
+      if architecture.nil?
+        api_version = 1
+      else
+        api_version = 2
+        provider_params.merge!(
+          architecture: new_architecture,
+          default_architecture: default_architecture
+        )
+      end
+
+      req_path = ["/box", username, name, "version", version,
+        "provider", provider, architecture].compact.join("/")
+
+      request(method: :put, path: req_path, params: {provider: provider_params}, api_version: api_version)
     end
 
     # Delete an existing box version provider
@@ -417,9 +471,14 @@ module VagrantCloud
     # @param [String] name Box name
     # @param [String] version Box version
     # @param [String] provider Provider name
+    # @param [String] architecture Architecture name
     # @return [Hash] box version provider information
-    def box_version_provider_delete(username:, name:, version:, provider:)
-      request(method: :delete, path: "/box/#{username}/#{name}/version/#{version}/provider/#{provider}")
+    def box_version_provider_delete(username:, name:, version:, provider:, architecture: nil)
+      req_path = ["/box", username, name, "version", version,
+        "provider", provider, architecture].compact.join("/")
+      api_version = architecture.nil? ? 1 : 2
+
+      request(method: :delete, path: req_path, api_version: api_version)
     end
 
     # Upload a box asset for an existing box version provider
@@ -428,9 +487,14 @@ module VagrantCloud
     # @param [String] name Box name
     # @param [String] version Box version
     # @param [String] provider Provider name
+    # @param [String] architecture Architecture name
     # @return [Hash] box version provider upload information (contains upload_path entry)
-    def box_version_provider_upload(username:, name:, version:, provider:)
-      request(method: :get, path: "/box/#{username}/#{name}/version/#{version}/provider/#{provider}/upload")
+    def box_version_provider_upload(username:, name:, version:, provider:, architecture: nil)
+      req_path = ["/box", username, name, "version", version,
+        "provider", provider, architecture, "upload"].compact.join("/")
+      api_version = architecture.nil? ? 1 : 2
+
+      request(method: :get, path: req_path, api_version: api_version)
     end
 
     # Upload a box asset directly to the backend storage for an existing box version provider
@@ -439,9 +503,14 @@ module VagrantCloud
     # @param [String] name Box name
     # @param [String] version Box version
     # @param [String] provider Provider name
+    # @param [String] architecture Architecture name
     # @return [Hash] box version provider upload information (contains upload_path and callback entries)
-    def box_version_provider_upload_direct(username:, name:, version:, provider:)
-      request(method: :get, path: "/box/#{username}/#{name}/version/#{version}/provider/#{provider}/upload/direct")
+    def box_version_provider_upload_direct(username:, name:, version:, provider:, architecture: nil)
+      req_path = ["/box", username, name, "version", version,
+        "provider", provider, architecture, "upload/direct"].compact.join("/")
+      api_version = architecture.nil? ? 1 : 2
+
+      request(method: :get, path: req_path, api_version: api_version)
     end
 
     protected

data/lib/vagrant_cloud/search.rb

@@ -43,10 +43,11 @@ module VagrantCloud
     # @param [String] limit
     # @param [String] page
     # @return [Response::Search]
-    def search(query: Data::Nil, provider: Data::Nil, sort: Data::Nil, order: Data::Nil, limit: Data::Nil, page: Data::Nil)
+    def search(query: Data::Nil, architecture: Data::Nil, provider: Data::Nil, sort: Data::Nil, order: Data::Nil, limit: Data::Nil, page: Data::Nil)
       @lock.synchronize do
         @params = {
           query: query,
+          architecture: architecture,
           provider: provider,
           sort: sort,
           order: order,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_cloud
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - HashiCorp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Vagrant Cloud API Library