azure-armrest 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d9a379dcf879754655b90dd12e7d23a83d6d2b4
-  data.tar.gz: 8fd56da390cae4df7264a8c28508641df46168e0
+  metadata.gz: 5eafec5e5c9b51f1e01cd36f55872192579cf838
+  data.tar.gz: 80dfaca5f2bec22dcdea5567295248e3a12b254f
 SHA512:
-  metadata.gz: 40bd7ac94d641b8b3d618be616dc09c440e98abd56741ee6983f36c04b802acddcffa00eba196df684e1daa90040372266bc0f1b2641f9d8a44ee51d96026848
-  data.tar.gz: 34d2d1e7708543084de37152c4cdf9a0bf5ce348e722bd87160f3f722404ebc4660e10cd6ff2dd9f73eb612da8d9c40dbc53c5acbeb4059ddfb4c2615518cacc
+  metadata.gz: 1f4dcb334ccb37db304d216ffeae044944724f1b517e317a1ea3d4393840203af5b665640806e07f8a5564fa723d66a0c4b3eb7bb802d66de1b6a85d2f0cefa8
+  data.tar.gz: d0d956239b40e8ca6e59cecfa47650c1334c3b79dae481bef71d8a0485d9e14ada0cce04dba882ad045ef9acc3ddbbc9e8e10d6f52d3b04bb9f6dd721431592d

data/CHANGES

@@ -1,3 +1,10 @@
+= 0.7.5 - 27-Jun-2017
+* Added the ContainerService service class.
+* Added the StorageAccount#access_key accessor. If set, this is now used as
+  the default since "properties.key1" is no longer supported by Azure.
+* Added predefined Environment's for China and Germany.
+* The nokogiri dependency was updated to 1.7.2.
+
 = 0.7.4 - 9-Jun-2017
 * Added the BaseModel#subscription_id method.
 * Improved the underlying regex for BaseModel#resource_group.

data/azure-armrest.gemspec

@@ -24,7 +24,7 @@ behind the scenes.
   spec.add_dependency 'memoist', '~> 0.15.0'
   spec.add_dependency 'azure-signature', '~> 0.2.3'
   spec.add_dependency 'activesupport', '>= 4.2.2'
-  spec.add_dependency 'nokogiri', '~> 1.7.1'
+  spec.add_dependency 'nokogiri', '~> 1.7.2'
   spec.add_dependency 'addressable', '~> 2.4.0'
   spec.add_dependency 'parallel', '~> 1.9.0'
 

data/lib/azure/armrest.rb

@@ -14,6 +14,7 @@ module Azure
   end
 end
 
+# Load these first
 require 'azure/armrest/version'
 require 'azure/armrest/configuration'
 require 'azure/armrest/environment'
@@ -23,8 +24,11 @@ require 'azure/armrest/armrest_service'
 require 'azure/armrest/subscription_service'
 require 'azure/armrest/resource_group_based_service'
 require 'azure/armrest/resource_group_based_subservice'
-require 'azure/armrest/storage_account_service'
+
+# Then these
 require 'azure/armrest/availability_set_service'
+require 'azure/armrest/container_service'
+require 'azure/armrest/storage_account_service'
 require 'azure/armrest/storage/disk_service'
 require 'azure/armrest/storage/snapshot_service'
 require 'azure/armrest/storage/image_service'

data/lib/azure/armrest/container_service.rb

@@ -0,0 +1,12 @@
+# Azure namespace
+module Azure
+  # Armrest namespace
+  module Armrest
+    # Base class for managing containers.
+    class ContainerService < ResourceGroupBasedService
+      def initialize(configuration, options = {})
+        super(configuration, 'containerServices', 'Microsoft.ContainerService', options)
+      end
+    end
+  end
+end

data/lib/azure/armrest/environment.rb

@@ -86,7 +86,7 @@ module Azure
 
       # Pre-generated environments
 
-      Public = self.new(
+      Public = new(
         :name                          => 'Public',
         :active_directory_authority    => 'https://login.microsoftonline.com/',
         :active_directory_resource_id  => 'https://management.core.windows.net/',
@@ -103,7 +103,7 @@ module Azure
         :traffic_manager_dns_suffix    => 'trafficmanager.net',
       )
 
-      USGovernment = self.new(
+      USGovernment = new(
         :name                          => 'US Government',
         :active_directory_authority    => 'https://login-us.microsoftonline.com/',
         :active_directory_resource_id  => 'https://management.core.usgovcloudapi.net/',
@@ -119,6 +119,40 @@ module Azure
         :storage_suffix                => 'core.usgovcloudapi.net',
         :traffic_manager_dns_suffix    => 'usgovtrafficmanager.net',
       )
+
+      Germany = new(
+        :name                          => 'Germany',
+        :active_directory_authority    => 'https://login.microsoftonline.de/',
+        :active_directory_resource_id  => 'https://management.core.cloudapi.de/',
+        :gallery_url                   => 'https://gallery.cloudapi.de/',
+        :graph_url                     => 'https://graph.cloudapi.de/',
+        :graph_api_version             => '1.6',
+        :key_vault_dns_suffix          => 'vault.microsoftazure.de',
+        :key_vault_service_resource_id => 'https://vault.microsoftazure.de',
+        :publish_settings_file_url     => 'https://manage.microsoftazure.de/publishsettings/index',
+        :resource_manager_url          => 'https://management.microsoftazure.de/',
+        :service_management_url        => 'https://management.core.cloudapi.de/',
+        :sql_database_dns_suffix       => 'database.cloudapi.de',
+        :storage_suffix                => 'core.cloudapi.de',
+        :traffic_manager_dns_suffix    => 'azuretrafficmanager.de'
+      )
+
+      China = new(
+        :name                          => 'China',
+        :active_directory_authority    => 'https://login.chinacloudapi.cn',
+        :active_directory_resource_id  => 'https://management.core.chinacloudapi.cn/',
+        :gallery_url                   => 'https://gallery.chinacloudapi.cn/',
+        :graph_url                     => 'https://graph.chinacloudapi.cn/',
+        :graph_api_version             => '1.6',
+        :key_vault_dns_suffix          => 'vault.azure.cn',
+        :key_vault_service_resource_id => 'https://vault.azure.cn',
+        :publish_settings_file_url     => 'http://go.microsoft.com/fwlink/?LinkID=301776',
+        :resource_manager_url          => 'https://management.chinacloudapi.cn/',
+        :service_management_url        => 'https://management.core.chinacloudapi.cn/',
+        :sql_database_dns_suffix       => 'database.chinacloudapi.cn',
+        :storage_suffix                => 'core.chinacloudapi.cn',
+        :traffic_manager_dns_suffix    => 'trafficmanager.cn'
+      )
     end
   end
 end

data/lib/azure/armrest/model/base_model.rb

@@ -188,6 +188,7 @@ module Azure
     # Initial class definitions. Reopen these classes as needed.
 
     class AvailabilitySet < BaseModel; end
+    class Container < BaseModel; end
     class Event < BaseModel; end
     class ImageVersion < BaseModel; end
     class Offer < BaseModel; end

data/lib/azure/armrest/model/storage_account.rb

@@ -33,6 +33,9 @@ module Azure
       # The SSL verification method used for each request. The default is VERIFY_PEER.
       attr_accessor :ssl_verify
 
+      # The default access key used when creating a signature for internal http requests.
+      attr_accessor :access_key
+
       def initialize(json)
         super
         @storage_api_version = '2016-05-31'
@@ -44,8 +47,8 @@ module Azure
       # Returns a list of tables for the given storage account +key+. Note
       # that full metadata is returned.
       #
-      def tables(key = nil)
-        key ||= properties.key1
+      def tables(key = access_key)
+        raise ArgumentError, "No access key specified" unless key
         response = table_response(key, nil, "Tables")
         JSON.parse(response.body)['value'].map{ |t| Table.new(t) }
       end
@@ -54,8 +57,8 @@ module Azure
       # account +key+. If you are looking for the entities within the
       # table, use the table_data method instead.
       #
-      def table_info(table, key = nil)
-        key ||= properties.key1
+      def table_info(table, key = access_key)
+        raise ArgumentError, "No access key specified" unless key
         response = table_response(key, nil, "Tables('#{table}')")
         Table.new(response.body)
       end
@@ -95,8 +98,8 @@ module Azure
       #     more_results = storage_account.table_data(table, key, options)
       #   end
       #
-      def table_data(name, key = nil, options = {})
-        key ||= properties.key1
+      def table_data(name, key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         query = build_query(options)
         response = table_response(key, query, name)
@@ -118,7 +121,7 @@ module Azure
 
       # Return a list of container names for the given storage account +key+.
       # If no key is provided, it is assumed that the StorageAccount object
-      # includes the key1 property.
+      # includes the access_key property.
       #
       # # The following options are supported:
       #
@@ -148,8 +151,8 @@ module Azure
       # another call will automatically be made with the marker value included
       # in the URL so that you don't have to perform such a step manually.
       #
-      def containers(key = nil, options = {})
-        key ||= properties.key1
+      def containers(key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         query = "comp=list"
         options.each { |okey, ovalue| query += "&#{okey}=#{[ovalue].flatten.join(',')}" }
@@ -166,11 +169,9 @@ module Azure
       end
 
       # Returns the properties for the given container +name+ using account +key+.
-      # If no key is provided, it is assumed that the StorageAccount object
-      # includes the key1 property.
       #
-      def container_properties(name, key = nil)
-        key ||= properties.key1
+      def container_properties(name, key = access_key)
+        raise ArgumentError, "No access key specified" unless key
 
         response = blob_response(key, "restype=container", name)
 
@@ -178,15 +179,13 @@ module Azure
       end
 
       # Returns the properties for the given container +name+ using account +key+.
-      # If no key is provided, it is assumed that the StorageAccount object
-      # includes the key1 property.
       #
       # If the returned object does not contain x_ms_blob_public_access then
       # the container is private to the account owner. You can also use the
       # :private? method to determine if the account is public or private.
       #
-      def container_acl(name, key = nil)
-        key ||= properties.key1
+      def container_acl(name, key = access_key)
+        raise ArgumentError, "No access key specified" unless key
 
         response = blob_response(key, "restype=container&comp=acl", name)
         response.headers[:private?] = response.headers.include?(:x_ms_blob_public_access) ? false : true
@@ -197,8 +196,8 @@ module Azure
       # Return the blob properties for the given +blob+ found in +container+. You may
       # optionally provide a date to get information for a snapshot.
       #
-      def blob_properties(container, blob, key = nil, options = {})
-        key ||= properties.key1
+      def blob_properties(container, blob, key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         url = File.join(properties.primary_endpoints.blob, container, blob)
         url += "?snapshot=" + options[:date] if options[:date]
@@ -233,8 +232,8 @@ module Azure
       # The content_length option is only value for page blobs, and is used
       # to resize the blob.
       #
-      def update_blob_properties(container, blob, key = nil, options = {})
-        key ||= properties.key1
+      def update_blob_properties(container, blob, key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         url = File.join(properties.primary_endpoints.blob, container, blob) + "?comp=properties"
 
@@ -259,7 +258,7 @@ module Azure
       end
 
       # Return a list of blobs for the given +container+ using the given +key+
-      # or the key1 property of the StorageAccount object.
+      # or the access_key property of the StorageAccount object.
       #
       # The following options are supported:
       #
@@ -289,8 +288,8 @@ module Azure
       # another call will automatically be made with the marker value included
       # in the URL so that you don't have to perform such a step manually.
       #
-      def blobs(container, key = nil, options = {})
-        key ||= properties.key1
+      def blobs(container, key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         query = "restype=container&comp=list"
         options.each { |okey, ovalue| query += "&#{okey}=#{[ovalue].flatten.join(',')}" }
@@ -309,8 +308,9 @@ module Azure
 
       # Returns an array of all blobs for all containers.
       #
-      def all_blobs(key = nil, max_threads = 10)
-        key ||= properties.key1
+      def all_blobs(key = access_key, max_threads = 10)
+        raise ArgumentError, "No access key specified" unless key
+
         array = []
         mutex = Mutex.new
 
@@ -329,8 +329,8 @@ module Azure
 
       # Returns the blob service properties for the current storage account.
       #
-      def blob_service_properties(key = nil)
-        key ||= properties.key1
+      def blob_service_properties(key = access_key)
+        raise ArgumentError, "No access key specified" unless key
 
         response = blob_response(key, "restype=service&comp=properties")
         toplevel = 'StorageServiceProperties'
@@ -342,8 +342,8 @@ module Azure
       # Return metadata for the given +blob+ within +container+. You may
       # specify a +date+ to retrieve metadata for a specific snapshot.
       #
-      def blob_metadata(container, blob, key = nil, options = {})
-        key ||= properties.key1
+      def blob_metadata(container, blob, key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         query = "comp=metadata"
         query << "&snapshot=" + options[:date] if options[:date]
@@ -357,8 +357,8 @@ module Azure
       # available on the secondary location endpoint when read-access
       # geo-redundant replication is enabled for the storage account.
       #
-      def blob_service_stats(key = nil)
-        key ||= properties.key1
+      def blob_service_stats(key = access_key)
+        raise ArgumentError, "No access key specified" unless key
 
         response = blob_response(key, "restype=service&comp=stats")
         toplevel = 'StorageServiceStats'
@@ -375,8 +375,9 @@ module Azure
       #   source = "Microsoft.Compute/Images/your_container/your-img-osDisk.123xyz.vhd"
       #   storage_acct.copy_blob('system', source, 'vhds', nil, your_key)
       #
-      def copy_blob(src_container, src_blob, dst_container, dst_blob = nil, key = nil)
-        key ||= properties.key1
+      def copy_blob(src_container, src_blob, dst_container, dst_blob = nil, key = access_key)
+        raise ArgumentError, "No access key specified" unless key
+
         dst_blob ||= File.basename(src_blob)
 
         dst_url = File.join(properties.primary_endpoints.blob, dst_container, dst_blob)
@@ -405,8 +406,8 @@ module Azure
 
       # Delete the given +blob+ found in +container+.
       #
-      def delete_blob(container, blob, key = nil, options = {})
-        key ||= properties.key1
+      def delete_blob(container, blob, key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         url = File.join(properties.primary_endpoints.blob, container, blob)
         url += "?snapshot=" + options[:date] if options[:date]
@@ -438,8 +439,8 @@ module Azure
       # data['x-ms-blob-content-encoding']
       # # - Optional. Set the blob’s content encoding.
       # ...
-      def create_blob(container, blob, data, key = nil)
-        key ||= properties.key1
+      def create_blob(container, blob, data, key = access_key)
+        raise ArgumentError, "No access key specified" unless key
 
         url = File.join(properties.primary_endpoints.blob, container, blob)
 
@@ -460,8 +461,8 @@ module Azure
         Blob.new(response.headers)
       end
 
-      def create_blob_snapshot(container, blob, key = nil)
-        key ||= properties.key1
+      def create_blob_snapshot(container, blob, key = access_key)
+        raise ArgumentError, "No access key specified" unless key
 
         url = File.join(properties.primary_endpoints.blob, container, blob)
         url += "?comp=snapshot"
@@ -515,8 +516,8 @@ module Azure
       #   raise "Checksum error: #{range_str}, blob: #{@container}/#{@blob}" unless content_md5 == returned_md5
       #   return ret.body
       #
-      def get_blob_raw(container, blob, key = nil, options = {})
-        key ||= properties.key1
+      def get_blob_raw(container, blob, key = access_key, options = {})
+        raise ArgumentError, "No access key specified" unless key
 
         url = File.join(properties.primary_endpoints.blob, container, blob)
         url += "?snapshot=" + options[:date] if options[:date]

data/lib/azure/armrest/version.rb

@@ -1,6 +1,6 @@
 module Azure
   module Armrest
     # The version of the azure-armrest library.
-    VERSION = '0.7.4'.freeze
+    VERSION = '0.7.5'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +240,7 @@ files:
 - lib/azure/armrest/availability_set_service.rb
 - lib/azure/armrest/billing/usage_service.rb
 - lib/azure/armrest/configuration.rb
+- lib/azure/armrest/container_service.rb
 - lib/azure/armrest/environment.rb
 - lib/azure/armrest/exception.rb
 - lib/azure/armrest/insights/alert_service.rb