gitlab_config 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d6d03d55ccd88f54eadf815b61659bdad65fb6
-  data.tar.gz: 560d18b385a93223df9f96de1f4e05f0690a5c4e
+  metadata.gz: 62e1f212b333bd9501445ed36e3c2bd547f1515a
+  data.tar.gz: 4caffbd0f2ba687452cf3d49e0fb64e755dab5ae
 SHA512:
-  metadata.gz: 288d9ff7481ea99c08e7e1ccabaf90c296cf4d527956becc7a33635d2fe64d59a1ca62f7b15052ddc40b860746e2aa2cc2f5fa07bc90d311b0c3488c7be314b0
-  data.tar.gz: 87901f2249b6ba9820c047adcce112c7b581acb7fc8b4acc50e645dd09d08fe845fcc233be084cd794d16fed7ab2b1d8b2e810eaef83293e5cb05bfe5e40974e
+  metadata.gz: f2cacee770a19b2723d7a9dffa3184b9d258d6e4a1e8330b327679c4caa0a2c3c23cc47b1f5af3ca2475ae34a6440de6b25e3f0f0dc2072261bbd6a53a594d2f
+  data.tar.gz: 94d051a2624bd7c0dc7afe7aa8ea3ff4d239e075e80c8418466b52635dc915b12488ed79152e6d04821a1c85293cde70775ae02e122308ec037ace2c68f249c9

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.byebug_history

data/gitlab_config.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'byebug'
 end

data/lib/gitlab_config.rb

@@ -5,20 +5,18 @@ require 'gitlab_config/aws/iam_role'
 module GitlabConfig
   def self.load_configuration(options)
     if options.fetch(:source) == :s3 and options.has_key?(:iam_role)
-      options = fetch_iam_parameters(options)
+      options = add_iam_configuration!(options)
     end
 
-    yield Configuration.new.get_configuration(options)
+    yield Configuration.new(options).get_configuration
   end
 
-  def self.fetch_iam_parameters(options)
+  def self.add_iam_configuration!(options)
     key = options.fetch(:key, nil)
     secret = options.fetch(:secret, nil)
 
     if key.nil? && secret.nil?
-      iam = IamRole.new(options.fetch(:iam_role))
-      options[:key] = iam.key
-      options[:secret] = iam.secret
+      options[:iam] = IamRole.new(options.fetch(:iam_role))
     end
     options
   end

data/lib/gitlab_config/aws/iam_role.rb

@@ -3,6 +3,10 @@ require 'json'
 
 module GitlabConfig
 
+  # Iam role is used to get the credentials for the node and use them in the configuration elsewhere
+  #
+  # In order to get the correct credentials it is necessary to call an AWS api that will return them. See:
+  # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html
   class IamRole
 
     AWS_URL = 'http://169.254.169.254/latest/meta-data/iam/security-credentials'

data/lib/gitlab_config/configuration.rb

@@ -5,25 +5,52 @@ module GitlabConfig
 
   class Configuration
 
-    def get_configuration(options)
-      source(options).get_configuration(options)
+    def initialize(options)
+      @options = options
+    end
+
+    def get_configuration
+      configuration = source.get_configuration(@options)
+
+      add_backup_credentials!(configuration) if configuration.respond_to? :fetch
+      configuration
     end
 
     private
 
     # Get the configuration class
-    def source(options)
-      case options.fetch(:source)
+    def source
+      case @options.fetch(:source)
         when :custom
-          options.fetch(:config_source)
+          @options.fetch(:config_source)
         when :s3
-          S3ConfigurationSource.new(options.fetch(:region), options.fetch(:key), options.fetch(:secret))
+          S3ConfigurationSource.new(@options.fetch(:region), iam)
         when :local
           LocalSource.new
         else
           raise 'Configuration source not set'
       end
+    end
+
+    def add_backup_credentials!(configuration)
+      gitlab_rails_config = configuration.fetch('gitlab_rails', {})
+      if gitlab_rails_config.fetch('backup_upload_connection', {}).fetch('provider', nil) == 'AWS'
+        if has_iam?
+          configuration['gitlab_rails']['backup_upload_connection']['aws_access_key_id'] = iam.key
+          configuration['gitlab_rails']['backup_upload_connection']['aws_secret_access_key'] = iam.secret
+        end
+      end
+      configuration
+    end
+
+    # Validate that the options hash has the iam object enabled
+    def has_iam?
+      iam = @options.fetch(:iam)
+      iam.respond_to?(:key) && iam.respond_to?(:secret)
+    end
 
+    def iam
+      @options.fetch(:iam)
     end
 
   end

data/lib/gitlab_config/source/s3.rb

@@ -7,10 +7,10 @@ module GitlabConfig
   #
   class S3ConfigurationSource
 
-    attr_reader :region, :key, :secret
+    attr_reader :region, :iam
 
-    def initialize(region, key, secret)
-      @region, @key, @secret = region, key, secret
+    def initialize(region, iam)
+      @region, @iam = region, iam
     end
 
     # Get configuration will download the file read it
@@ -30,7 +30,7 @@ module GitlabConfig
     end
 
     def credentials
-      Aws::Credentials.new(@key, @secret)
+      Aws::Credentials.new(@iam.key, @iam.secret)
     end
 
   end

data/lib/gitlab_config/version.rb

@@ -1,3 +1,3 @@
 module GitlabConfig
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_config
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew Tarry
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The Gitlab configuration gem can be loaded in the gitlab.rb configuration
   file to allow dynamic properties to be loaded
 email: