Skip to content

Commit

Permalink
chore: fix invalid dependencies version constraints
Browse files Browse the repository at this point in the history
Also treat zero major version as if Magic Zero rule was dropped.
See semver/semver#221.
Upgrade of major version to 1 means incompatible changes.

Also add version constraints for Terraform providers
implemented in Terraform 0.10.0.
  • Loading branch information
grv87 committed Sep 3, 2017
1 parent c0d1e7b commit 8e177cc
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 31 deletions.
30 changes: 16 additions & 14 deletions gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,22 @@

source 'https://fidata.jfrog.io/fidata/api/gems/gems'

gem 'chef', '~> 13'
gem 'knife-solo'
gem 'knife-solo_data_bag', '~> 2.1.0'
gem 'thor'
gem 'berkshelf', '~> 6'
gem 'knife-art', '~> 1'
gem 'rubocop'
gem 'cookstyle', '~> 2'
gem 'foodcritic', '~> 11'
gem 'test-kitchen', '~> 1'
gem 'kitchen-vagrant', '~> 1'
gem 'kitchen-ec2', '~> 1'
gem 'kitchen-inspec'
# CAVEAT: We can't use just any version of Chef gem.
# Specified version should exist on Omnitruck <>
gem 'chef', '13.3.42'
gem 'knife-solo', '~> 0.6'
gem 'knife-solo_data_bag', '~> 2.1'
gem 'thor', '~> 0.19'
gem 'berkshelf', '~> 6.3'
gem 'knife-art', '~> 1.0'
gem 'rubocop', '~> 0.49'
gem 'cookstyle', '~> 2.1'
gem 'foodcritic', '~> 11.3'
gem 'test-kitchen', '~> 1.17'
gem 'kitchen-vagrant', '~> 1.2'
gem 'kitchen-ec2', '~> 1.3'
gem 'kitchen-inspec', '~> 0.19'

group :plugins do
gem 'vagrant-cachier'
gem 'vagrant-cachier', '~> 1.2'
end
18 changes: 9 additions & 9 deletions src/chef/cookbooks/fidata-build-toolkit/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
supports 'ubuntu'
supports 'debian'
supports 'windows'
chef_version '>= 12.7' if respond_to?(:chef_version)
depends 'java', '~> 1'
depends 'git', '~> 6'
depends 'cmake'
depends 'poise-ruby', '~> 2'
depends 'perl', '~> 5'
depends 'texlive'
depends 'pandoc', '~> 1'
depends 'imagemagick'
chef_version '~> 13.3' if respond_to?(:chef_version)
depends 'java', '~> 1.50'
depends 'git', '~> 6.1'
depends 'cmake', '~> 0.4'
depends 'poise-ruby', '~> 2.3'
depends 'perl', '~> 5.2'
depends 'texlive', '~> 0.2'
depends 'pandoc', '~> 1.0'
depends 'imagemagick', '~> 0.2'
14 changes: 7 additions & 7 deletions src/chef/site-cookbooks/fidata-jenkins-master/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
source_url 'https://github.com/FIDATA/infrastructure/tree/src/chef/site-cookbooks/fidata-jenkins-master'
issues_url 'https://github.com/FIDATA/infrastructure/issues'
supports 'ubuntu', '>= 16.04'
chef_version '>= 12.14' if respond_to?(:chef_version)
depends 'java', '~> 1'
depends 'apache2', '~> 5'
depends 'jenkins', '~> 5'
depends 'git', '~> 6'
depends 'ssh'
depends 'octokit'
chef_version '~> 13.3' if respond_to?(:chef_version)
depends 'java', '~> 1.50'
depends 'apache2', '~> 5.0'
depends 'jenkins', '~> 5.0'
depends 'git', '~> 6.1'
depends 'ssh', '~> 0.10'
depends 'octokit', '~> 0.1'
2 changes: 1 addition & 1 deletion src/chef/site-cookbooks/fidata-jenkins-slave/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
supports 'ubuntu'
supports 'debian'
supports 'windows'
chef_version '>= 12.7' if respond_to?(:chef_version)
chef_version '~> 13.3' if respond_to?(:chef_version)
depends 'fidata-build-toolkit'
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ variable "type" {
}

provider "atlas" {
version = ">= 0.1"
token = "${var.atlas_token}"
}

Expand Down
5 changes: 5 additions & 0 deletions src/terraform/common/common.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ variable "aws_secret_key" {
# Providers

provider "aws" {
version = ">= 0.1"
access_key = "${var.aws_access_key}"
secret_key = "${var.aws_secret_key}"
region = "eu-west-1"
}

provider "external" {
version = ">= 0.1"
}

# IAMs

resource "aws_iam_user" "fidata_jenkins" {
Expand Down
3 changes: 3 additions & 0 deletions src/terraform/instances/instances.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,19 @@ variable "cloudflare_token" {
# Providers

provider "atlas" {
version = ">= 0.1"
token = "${var.atlas_token}"
}

provider "aws" {
version = ">= 0.1"
access_key = "${var.aws_access_key}"
secret_key = "${var.aws_secret_key}"
region = "eu-west-1"
}

provider "cloudflare" {
version = ">= 0.1"
email = "${var.cloudflare_email}"
token = "${var.cloudflare_token}"
}
Expand Down

0 comments on commit 8e177cc

Please sign in to comment.