vagrant-s3auth-mfa 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e70547a0899e6c27aa2c8c6e191417769c5887743b809b2f531fbf69ff60fe3c
-  data.tar.gz: 64000adb641cbcb0dec50009a79a89d78a6e822c5103ed5e698008ea81c110bb
+  metadata.gz: 385cfd66de798618110817e177bfcb948d4169489f7e633ce13ed0efb70f6e46
+  data.tar.gz: 5314ea54b96109d51c63d4de07a8dd302555e84d2b3650c48a7aa6cd0e2dce0f
 SHA512:
-  metadata.gz: 6dcabed9610f84f1e0a2e6c44cc979446afcc3a470a16588b50870113eacfbe01545f9cf40f2d09af8b550e5e40da67de5b2a3a8cbc705454e9acf1b5bd7d40f
-  data.tar.gz: d707c5cc73019200330d8be7ff1342e4ae8b5fd42dd23c209b6bb2fa5e2b0fbd93cca633c64a49494b31f9eef3a8f06a708d677316da26de343945fbbe51d3bc
+  metadata.gz: 86f059873423512aecb5db98680b77af9306b166709b1488bb82896a53d806fe3e25d834b4a24a3a6bfc963e44716c13ac00a517f6112c550ac1546545e71b1b
+  data.tar.gz: 7e9e6605219a684a3ad93f241c783260dd76ee9334cf1dd07b62fa697051a04731adf2a4c0ac71281e47453559e9d6baeea96f12a42314880170ee8a450cdea7

data/CHANGELOG.md

@@ -1,6 +1,15 @@
+## 1.5.0
+
+**29 January 2019**
+
+Features:
+
+* Removed tests untill fixed
+* Removed unused dependencies
+
 ## 1.4.1
 
-**15 January 2018**
+**15 January 2019**
 
 Features:
 
@@ -8,7 +17,7 @@ Features:
 
 ## 1.4.0
 
-**14 January 2018**
+**14 January 2019**
 
 Features:
 

data/lib/vagrant-s3auth-mfa/util.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-s3'
 require 'log4r'
 require 'net/http'
 require 'uri'

data/lib/vagrant-s3auth-mfa/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module S3Auth
-      VERSION = '1.4.3'.freeze
+      VERSION = '1.5.0'.freeze
   end
 end

data/vagrant-s3auth-mfa.gemspec

@@ -8,14 +8,14 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Nikhil Benesch']
   spec.email         = ['benesch@whoop.com']
   spec.summary       = '[VRTDev Fork]Private, versioned Vagrant boxes hosted on Amazon S3.'
-  spec.homepage      = 'https://github.com/vrtdev/vagrant-s3auth-mfa'
+  spec.homepage      = 'https://github.com/vrtdev/vagrant-s3auth'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(/spec/)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '>= 3.0', '< 4'
+  spec.add_dependency 'aws-sdk-s3', '>= 1.30.0', '< 2' 
   spec.add_dependency 'aws_config', '~> 0.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-s3auth-mfa
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Nikhil Benesch
@@ -11,25 +11,25 @@ cert_chain: []
 date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.30.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.30.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: aws_config
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +116,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- TESTING.md
 - lib/vagrant-s3auth-mfa.rb
 - lib/vagrant-s3auth-mfa/errors.rb
 - lib/vagrant-s3auth-mfa/extension/downloader.rb
@@ -126,16 +124,8 @@ files:
 - lib/vagrant-s3auth-mfa/util.rb
 - lib/vagrant-s3auth-mfa/version.rb
 - locales/en.yml
-- test/box/minimal
-- test/box/minimal.box
-- test/box/public-minimal
-- test/box/public-minimal.box
-- test/cleanup.rb
-- test/run.bats
-- test/setup.rb
-- test/support.rb
 - vagrant-s3auth-mfa.gemspec
-homepage: https://github.com/vrtdev/vagrant-s3auth-mfa
+homepage: https://github.com/vrtdev/vagrant-s3auth
 licenses:
 - MIT
 metadata: {}

data/Rakefile

@@ -1,15 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'rubocop/rake_task'
-
-Dir.chdir(File.expand_path('../', __FILE__))
-
-Bundler::GemHelper.install_tasks
-
-RuboCop::RakeTask.new(:lint)
-
-task :test do
-  sh 'bats test/run.bats'
-end
-
-task default: %w[lint test]

data/TESTING.md

@@ -1,70 +0,0 @@
-# Testing
-
-No unit testing, since the project is so small. But a full suite of acceptance
-tests that run using [Bats: Bash Automated Testing System][bats]! Basically, the
-acceptance tests run `vagrant box add S3_URL` with a bunch of S3 URLs and box
-types, and assert that everything works!
-
-See [the .travis.yml CI configuration](.travis.yml) for a working example.
-
-## Environment variables
-
-You'll need to export the below. Recommended values included when not sensitive.
-
-```bash
-# AWS credentials with permissions to create S3 buckets
-export AWS_ACCESS_KEY_ID=
-export AWS_SECRET_ACCESS_KEY=
-
-# Atlas (Vagrant Cloud) API credentials
-export ATLAS_USERNAME="vagrant-s3auth"
-export ATLAS_TOKEN
-
-# Base name of bucket. Must be unique.
-export VAGRANT_S3AUTH_BUCKET="testing.vagrant-s3auth.com"
-
-# If specified as 'metadata', will upload 'box/metadata' and 'box/metadata.box'
-# to each S3 bucket
-export VAGRANT_S3AUTH_BOX_BASE="minimal"
-
-# Base name of Atlas (Vagrant Cloud) box. Atlas boxes can never re-use a once
-# existing name, so include a timestamp or random string in the name.
-export VAGRANT_S3AUTH_ATLAS_BOX_NAME="vagrant-s3auth-192458"
-
-# Additional S3 region to use in testing. US Standard is always used.
-export VAGRANT_S3AUTH_REGION_NONSTANDARD="eu-west-1"
-```
-
-[bats]: https://github.com/sstephenson/bats
-
-## Running tests
-
-You'll need [Bats][bats] installed! Then:
-
-```bash
-# export env vars as described
-$ test/setup.rb
-$ rake test
-# hack hack hack
-$ rake test
-$ test/cleanup.rb
-```
-
-## Scripts
-
-### test/setup.rb
-
-Creates two S3 buckets—one in US Standard (`us-east-1`) and one in
-`$VAGRANT_S3AUTH_REGION_NONSTANDARD`, both with the contents of the box
-directory.
-
-Then creates an Atlas (Vagrant Cloud) box with one version with one VirtualBox
-provider that points to one of the S3 boxes at random.
-
-### test/cleanup.rb
-
-Destroys S3 buckets and Atlas box.
-
-## run.bats
-
-Attempts to `vagrant box add` the boxes on S3 in every way possible.

data/test/box/minimal

@@ -1,13 +0,0 @@
-{
-  "name": "vagrant-s3auth-mfa/minimal",
-  "description": "This box contains company secrets.",
-  "versions": [{
-    "version": "1.0.1",
-    "providers": [{
-      "name": "virtualbox",
-      "url": "%{box_url}",
-      "checksum_type": "sha1",
-      "checksum": "8ea536dd3092cf159f02405edd44ded5b62ba4e6"
-    }]
-  }]
-}

data/test/box/public-minimal

@@ -1,13 +0,0 @@
-{
-  "name": "vagrant-s3auth-mfa/public-minimal",
-  "description": "This box contains no company secrets.",
-  "versions": [{
-    "version": "1.0.1",
-    "providers": [{
-      "name": "virtualbox",
-      "url": "%{box_url}",
-      "checksum_type": "sha1",
-      "checksum": "8ea536dd3092cf159f02405edd44ded5b62ba4e6"
-    }]
-  }]
-}

data/test/box/public-minimal.box

@@ -1 +0,0 @@
-test/box/minimal.box

data/test/cleanup.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'aws-sdk'
-
-require_relative 'support'
-
-[REGION_STANDARD, REGION_NONSTANDARD].each do |region|
-  s3 = Aws::S3::Resource.new(region: region)
-
-  buckets = if ARGV.include?('--all')
-              s3.buckets.select do |b|
-                b.name.include?('vagrant-s3auth-mfa.com') && b.name.include?(region)
-              end
-            else
-              [s3.bucket("#{region}.#{BUCKET}")]
-            end
-
-  buckets.each { |b| b.delete! if b.exists? }
-end
-
-atlas = Atlas.new(ATLAS_TOKEN, ATLAS_USERNAME)
-atlas.delete_box(ATLAS_BOX_NAME)

data/test/run.bats

@@ -1,147 +0,0 @@
-#!/usr/bin/env bats
-
-missing_vars=()
-
-require_var() {
-  [[ "${!1}" ]] || missing_vars+=("$1")
-}
-
-require_var AWS_ACCESS_KEY_ID
-require_var AWS_SECRET_ACCESS_KEY
-require_var ATLAS_TOKEN
-require_var ATLAS_USERNAME
-require_var VAGRANT_S3AUTH_BUCKET
-require_var VAGRANT_S3AUTH_BOX_BASE
-require_var VAGRANT_S3AUTH_ATLAS_BOX_NAME
-require_var VAGRANT_S3AUTH_REGION_NONSTANDARD
-
-if [[ ${#missing_vars[*]} -gt 0 ]]; then
-  echo "Missing required environment variables:"
-  printf '    %s\n' "${missing_vars[@]}"
-  exit 1
-fi
-
-teardown() {
-  bundle exec vagrant box remove "$VAGRANT_S3AUTH_BOX_BASE" > /dev/null 2>&1 || true
-  bundle exec vagrant box remove "public-$VAGRANT_S3AUTH_BOX_BASE" > /dev/null 2>&1 || true
-  bundle exec vagrant box remove "vagrant-s3auth-mfa/$VAGRANT_S3AUTH_BOX_BASE" > /dev/null 2>&1 || true
-  bundle exec vagrant box remove "vagrant-s3auth-mfa/public-$VAGRANT_S3AUTH_BOX_BASE" > /dev/null 2>&1 || true
-  bundle exec vagrant box remove "$ATLAS_USERNAME/$VAGRANT_S3AUTH_ATLAS_BOX_NAME" > /dev/null 2>&1 || true
-}
-
-@test "vagrant cloud" {
-  bundle exec vagrant box add "$ATLAS_USERNAME/$VAGRANT_S3AUTH_ATLAS_BOX_NAME"
-}
-
-@test "simple box with full path standard url" {
-  bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3.amazonaws.com/us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "public simple box with full path standard url without credentials" {
-  AWS_ACCESS_KEY_ID= \
-    bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3.amazonaws.com/us-east-1.$VAGRANT_S3AUTH_BUCKET/public-$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "simple box with full host standard url" {
-  bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://us-east-1.$VAGRANT_S3AUTH_BUCKET.s3.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "simple box with shorthand standard url" {
-  bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "s3://us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "simple box with full path nonstandard url" {
-  bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "public simple box with full path nonstandard url without credentials" {
-  AWS_ACCESS_KEY_ID= \
-    bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/public-$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "simple box with full host nonstandard url" {
-  bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET.s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "simple box with shorthand nonstandard url" {
-  bundle exec vagrant box add \
-    --name "$VAGRANT_S3AUTH_BOX_BASE" \
-    "s3://$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE.box"
-}
-
-@test "metadata box with full path standard url" {
-  bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3.amazonaws.com/us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-@test "public metadata box with full path standard url without credentials" {
-  AWS_ACCESS_KEY_ID= \
-    bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/public-$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3.amazonaws.com/us-east-1.$VAGRANT_S3AUTH_BUCKET/public-$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-@test "metadata box with full host standard url" {
-  bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://us-east-1.$VAGRANT_S3AUTH_BUCKET.s3.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-@test "metadata box with shorthand standard url" {
-  bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/$VAGRANT_S3AUTH_BOX_BASE" \
-    "s3://us-east-1.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-@test "metadata box with full path nonstandard url" {
-  bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-@test "public metadata box with full path nonstandard url without credentials" {
-  AWS_ACCESS_KEY_ID= \
-    bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/public-$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/public-$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-
-@test "metadata box with full host nonstandard url" {
-  bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/$VAGRANT_S3AUTH_BOX_BASE" \
-    "https://$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET.s3-$VAGRANT_S3AUTH_REGION_NONSTANDARD.amazonaws.com/$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-@test "metadata box with shorthand nonstandard url" {
-  bundle exec vagrant box add \
-    --name "vagrant-s3auth-mfa/$VAGRANT_S3AUTH_BOX_BASE" \
-    "s3://$VAGRANT_S3AUTH_REGION_NONSTANDARD.$VAGRANT_S3AUTH_BUCKET/$VAGRANT_S3AUTH_BOX_BASE"
-}
-
-@test "garbage shorthand url" {
-  run bundle exec vagrant box add --name "$VAGRANT_S3AUTH_BOX_BASE" s3://smoogedydoop
-  [[ "$status" -eq 1 ]]
-  [[ "$output" == *"Malformed shorthand S3 box URL"* ]]
-}
-
-@test "garbage full url" {
-  run bundle exec vagrant box add --name "$VAGRANT_S3AUTH_BOX_BASE" https://smoogedydoop
-  [[ "$status" -eq 1 ]]
-  [[ "$output" == *"error occurred while downloading the remote file"* ]]
-}

data/test/setup.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'aws-sdk'
-
-require_relative 'support'
-
-ROOT = Pathname.new(File.dirname(__FILE__))
-
-box_urls = [REGION_STANDARD, REGION_NONSTANDARD].flat_map do |region|
-  s3 = Aws::S3::Resource.new(region: region)
-  bucket = s3.create_bucket(bucket: "#{region}.#{BUCKET}")
-
-  [BOX_BASE, 'public-' + BOX_BASE].flat_map do |box_name|
-    box = bucket.object("#{box_name}.box")
-    box.upload_file(ROOT + Pathname.new("box/#{box_name}.box"))
-    box.acl.put(acl: 'public-read') if box_name.start_with?('public')
-
-    metadata_string = format(File.read(ROOT + Pathname.new("box/#{box_name}")),
-      box_url: box.public_url)
-
-    metadata = bucket.object(box_name)
-    metadata.put(body: metadata_string, content_type: 'application/json')
-    metadata.acl.put(acl: 'public-read') if box_name.start_with?('public')
-
-    box.public_url
-  end
-end
-
-atlas = Atlas.new(ATLAS_TOKEN, ATLAS_USERNAME)
-atlas.create_box(ATLAS_BOX_NAME)
-atlas.create_version(ATLAS_BOX_NAME, '1.0.1')
-atlas.create_provider(ATLAS_BOX_NAME, '1.0.1', box_urls.sample)
-atlas.release_version(ATLAS_BOX_NAME, '1.0.1')

data/test/support.rb

@@ -1,82 +0,0 @@
-require 'http'
-
-BOX_BASE = ENV['VAGRANT_S3AUTH_BOX_BASE'].freeze
-BUCKET = ENV['VAGRANT_S3AUTH_BUCKET'].freeze
-REGION_STANDARD = 'us-east-1'.freeze
-REGION_NONSTANDARD = ENV['VAGRANT_S3AUTH_REGION_NONSTANDARD'].freeze
-
-ATLAS_TOKEN = ENV['ATLAS_TOKEN'].freeze
-ATLAS_USERNAME = ENV['ATLAS_USERNAME'].freeze
-ATLAS_BOX_NAME = ENV['VAGRANT_S3AUTH_ATLAS_BOX_NAME'].freeze
-
-class Atlas
-  BASE_URL = 'https://app.vagrantup.com/api/v1'.freeze
-
-  BOX_CREATE_URL = "#{BASE_URL}/boxes".freeze
-  BOX_RESOURCE_URL = "#{BASE_URL}/box/%<username>s/%<box_name>s".freeze
-
-  VERSION_CREATE_URL = "#{BOX_RESOURCE_URL}/versions".freeze
-  VERSION_RESOURCE_URL = "#{BOX_RESOURCE_URL}/version/%<version>s".freeze
-  VERSION_RELEASE_URL = "#{VERSION_RESOURCE_URL}/release".freeze
-
-  PROVIDER_CREATE_URL = "#{VERSION_RESOURCE_URL}/providers".freeze
-  PROVIDER_RESOURCE_URL = "#{VERSION_RESOURCE_URL}/provider/%<provider_name>s".freeze
-
-  attr_accessor :provider
-
-  def initialize(token, username)
-    raise if !token || token.empty?
-    raise if !username || username.empty?
-
-    @token = token
-    @username = username
-    @provider = 'virtualbox'
-  end
-
-  def create_box(box_name)
-    post(BOX_CREATE_URL, data: { box: { name: box_name, is_private: false } })
-  end
-
-  def delete_box(box_name)
-    url_params = { box_name: box_name }
-    delete(BOX_RESOURCE_URL, url_params: url_params)
-  end
-
-  def create_version(box_name, version)
-    post(VERSION_CREATE_URL,
-      data: { version: { version: version } },
-      url_params: { box_name: box_name })
-  end
-
-  def release_version(box_name, version)
-    put(VERSION_RELEASE_URL,
-      url_params: { box_name: box_name, version: version })
-  end
-
-  def create_provider(box_name, version, url)
-    post(PROVIDER_CREATE_URL,
-      data: { provider: { name: @provider, url: url } },
-      url_params: { box_name: box_name, version: version })
-  end
-
-  def request(method, url, options)
-    url_params = (options[:url_params] || {}).merge(username: @username)
-    data = (options[:data] || {})
-
-    url = (url % url_params) + "?access_token=#{@token}"
-    response = HTTP.request(method, url, json: data)
-    raise response unless response.code >= 200 && response.code < 400
-  end
-
-  def post(url, options)
-    request(:post, url, options)
-  end
-
-  def put(url, options)
-    request(:put, url, options)
-  end
-
-  def delete(url, options)
-    request(:delete, url, options)
-  end
-end