kite 1.1.16 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e00b61b8ca0cc04370f64f980f8b4310224cca761bfb7f715f695eaa0406d976
-  data.tar.gz: 472d73e63301a579f417b1e3f2b36240205d10f62acf23d41a6fcb60c8bffac9
+  metadata.gz: 7552fc6615c7625de7e6a0af8a1d754d3fe6182ef9bc3647629bfa9433dfa8ad
+  data.tar.gz: 40ab1c6d62b70cd9a7af5f5542553b14eb09d4cb20484761ca0981d384ba3a8a
 SHA512:
-  metadata.gz: b8635a7babd515ed0497e7072c0807dae03191693fb784ede1888ad6bda8a354d44d13c92458965371325d56201890064f3cbfa6549a8f1fd38326d5a45583ee
-  data.tar.gz: 1c6ec38d77affe28413096cc7535683316a7039a0cf0ca2c886918cd7010c65e7fae05a01ace943453d55f625768fcc2bd42bb38ba998eeb91b3733328f63605
+  metadata.gz: 74133016ffc62362f47a4e36329b3a2e04b249491063509c33ca61eff78b545d19971b1c5cf0131753cb8fcf435a18154f5517a29d28e828bf78685a6feb27e4
+  data.tar.gz: cb6ac1c1a1bda61618264b4297f757fb13f3b34f8361f8629ecde6df623ebc0217e80f990601ed8981b7c04a85e4f8d83f01da2ee2a00b374a33b63faf720a1b

data/.drone.yml

@@ -1,6 +1,10 @@
 kind: pipeline
 name: default
 
+trigger:
+  event:
+    - push
+
 steps:
 - name: Run rspec
   image: ruby:2.6
@@ -8,22 +12,37 @@ steps:
     - bundle
     - bundle exec rspec
   when:
-   event:
-    - pull_request
+    branch:
+      exclude:
+        - master
+        - "*stable"
 
-- name: Bump and Tag
-  image: ruby:2.6
+- name: Bump and tag
+  image: quay.io/openware/sdk-citools:2.4.5
   environment:
+    BRANCH_NAME: ${DRONE_BRANCH}
+    REPO_NAME: ${DRONE_REPO}
     GITHUB_API_KEY:
       from_secret: kite_bot_key
   commands:
-    - ruby ci/bump.rb
+    - BUNDLE_GEMFILE=/sdk/Gemfile bundle exec rake --rakefile=/sdk/Rakefile ci:prebuild
   when:
-    event:
-      - push
     branch:
-      - 1-1-stable
+      - master
+      - "*stable"
 
+image_pull_secrets:
+  - dockerconfigjson
+
+---
+kind: pipeline
+name: publish
+
+trigger:
+  event:
+    - tag
+
+steps:
 - name: Publish to RubyGems
   image: ruby:2.6
   environment:
@@ -37,6 +56,3 @@ steps:
     - bundle --jobs $(nproc)
     - bundle exec gem build kite.gemspec
     - bundle exec gem push kite-$DRONE_TAG.gem
-  when:
-    event:
-      - tag

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.5

data/VERSION

@@ -0,0 +1 @@
+1.2.1

data/lib/kite/generate.rb

@@ -33,7 +33,7 @@ module Kite
       directory('service', path)
     end
 
-    method_option :provider, type: :string, desc: "Cloud provider", enum: %w{aws gcp ali}, required: true
+    method_option :provider, type: :string, desc: "Cloud provider", enum: %w{aws gcp ali baremetal}, required: true
     desc 'environment NAME', 'Generate an environment with base terraform files'
     def environment(name)
       say "Generating environment for #{options[:provider]}"

data/lib/kite/version.rb

@@ -1,3 +1,3 @@
 module Kite
-  VERSION = '1.1.16'
+  VERSION = '1.2.3'
 end

data/tpl/aws/environment/main.tf.tt

@@ -1,6 +1,4 @@
 provider "aws" {
-  version = "~> 2.18.0"
-
   region = "<%= @cloud['region'] %>"
   access_key = "<%= @cloud['aws']['access_key'] %>"
   secret_key = "<%= @cloud['aws']['secret_key'] %>"

data/tpl/aws/environment/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+  }
+  required_version = ">= 0.13"
+}

data/tpl/gcp/environment/gcs.tf.tt

@@ -3,16 +3,14 @@ terraform {
   backend "gcs" {
     bucket  = "<%= @cloud['gcp']['bucket_name'] %>"
     prefix  = "<%= @env_name %>-terraform.tfstate"
-    project = "<%= @cloud['gcp']['project'] %>"
   }
 }
 
 # Store .tfstate in a GCS bucket
 data "terraform_remote_state" "tfstate" {
   backend = "gcs"
-  config {
+  config  = {
     bucket  = "<%= @cloud['gcp']['bucket_name'] %>"
-    path    = "<%= @env_name %>-terraform.tfstate"
-    project = "<%= @cloud['gcp']['project'] %>"
+    prefix  = "<%= @env_name %>-terraform.tfstate"
   }
 }

data/tpl/gcp/environment/main.tf.tt

@@ -1,5 +1,9 @@
 provider "google" {
-  credentials = "${file("<%= @cloud['gcp']['service_account'] %>")}"
-  project = "<%= @cloud['gcp']['project'] %>"
-  region = "<%= @cloud['region'] %>"
+  credentials = file("<%= @cloud['gcp']['service_account'] %>")
+  project     = "<%= @cloud['gcp']['project'] %>"
+  region      = "<%= @cloud['region'] %>"
+}
+
+terraform {
+  required_version = ">= 0.12"
 }

data/tpl/gcp/environment/outputs.tf.tt

@@ -1,5 +1,5 @@
 output service_account_b64 {
-  description = "GCloud service account key"
-  value       = "${base64encode(file("<%= @cloud['gcp']['service_account'] %>"))}"
+  description = "Google Cloud service account key"
+  value       = base64encode(file("<%= @cloud['gcp']['service_account'] %>"))
   sensitive   = true
 }

data/tpl/gcp/environment/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+    }
+  }
+  required_version = ">= 0.13"
+}

data/tpl/skel/config/cloud.yml

@@ -13,3 +13,4 @@ default: &default
   ali:
     access_key:       "********************"
     secret_key:       "****************************************"
+  baremetal:          {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kite
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.2.3
 platform: ruby
 authors:
 - Louis Bellet
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -144,6 +144,7 @@ files:
 - Makefile
 - README.md
 - Rakefile
+- VERSION
 - bin/concourse/check
 - bin/concourse/in
 - bin/concourse/out
@@ -172,10 +173,12 @@ files:
 - lib/kite/version.rb
 - tpl/ali/environment/main.tf.tt
 - tpl/aws/environment/main.tf.tt
-- tpl/aws/environment/s3.tf.tt
+- tpl/aws/environment/versions.tf
+- tpl/baremetal/environment/.gitkeep
 - tpl/gcp/environment/gcs.tf.tt
 - tpl/gcp/environment/main.tf.tt
 - tpl/gcp/environment/outputs.tf.tt
+- tpl/gcp/environment/versions.tf
 - tpl/service/%output_path%/charts/%app_name%/Chart.yaml.tt
 - tpl/service/%output_path%/charts/%app_name%/templates/NOTES.txt.tt
 - tpl/service/%output_path%/charts/%app_name%/templates/_helpers.tpl

data/tpl/aws/environment/s3.tf.tt

@@ -1,13 +0,0 @@
-# Create a bucket for kite purposes
-resource "aws_s3_bucket" "kite_bucket" {
-  bucket_prefix  = "<%= @cloud['aws']['bucket_name'] %>"
-
-  tags {
-    Name         = "<%= @cloud['aws']['bucket_name'] %>"
-    Component    = "kite-stack"
-  }
-}
-
-output "bucket_name" {
-  value = "${aws_s3_bucket.kite_bucket.id}"
-}