terraspace_plugin_google 0.2.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f481b6c88c1de06a78da5d9a3097517202c3e17ceae6f81434bcb66abfd9468f
-  data.tar.gz: db7d7abd653cd1e0c7b780b69228645d840909a242fb920f44707fbdd19423db
+  metadata.gz: 0a0b80fe04a11716e39db70f0b64264f2eccecd150a4095307c0d108ef1b6f2b
+  data.tar.gz: b04f6e945ece9bf18bcd4956844d47675e460f23c35c52132813e43195da4fbf
 SHA512:
-  metadata.gz: f0d816df268ff24c79488afa29105ff493c75f602fcf3a066befe8fbb9824d54ad8ef8c3d3ea8c57fa4be691ed057291e9ca061cf54eb5e4b86c49fa13f408f1
-  data.tar.gz: f960ab4f7c2488112b6d954b6f0b747f3fb2e6999be626d0ebe8d2ec634154b56c8e3cea4cdfe2d900f6395d45ffe4abca61a0880ac5f42742745a428a67c3d4
+  metadata.gz: a94bac4d8de2cfc1b661368bed8edb2f90ebb3f8ccf7f285018535112d8d0da3d06a43d75af73bbd8c3840e6e583b9708a94fd0ddd157c1873e7e206d627e989
+  data.tar.gz: fa4e9afe18caae22b987a84b87626a46529fd27eb12e64b3d4cebc269efa10090c7e14a45f6a640292d1320aac1fc9217ef4a8759b2bbd345e5648b7d11006ef

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.3.3] - 2022-01-04
+- [#9](https://github.com/boltops-tools/terraspace_provider_google/pull/9) google_secret support expansion automatically
+
+## [0.3.2] - 2021-11-25
+- [#8](https://github.com/boltops-tools/terraspace_provider_google/pull/8) update example templates to include bucket location which is now required
+
+## [0.3.1] - 2021-11-13
+- [#7](https://github.com/boltops-tools/terraspace_provider_google/pull/7) get google project number via api
+
+## [0.3.0] - 2020-11-15
+- [#5](https://github.com/boltops-tools/terraspace_provider_google/pull/5) helper and secrets support
+- google secret
+
 ## [0.2.2]
 - #4 fix test template: folder rename to stacks
 

data/lib/templates/hcl/module/main.tf

@@ -1,4 +1,5 @@
 resource "google_storage_bucket" "this" {
   name                        = var.name
   uniform_bucket_level_access = var.uniform_bucket_level_access
+  location                    = var.location
 }

data/lib/templates/hcl/module/variables.tf

@@ -8,3 +8,9 @@ variable "uniform_bucket_level_access" {
   type        = bool
   default     = false
 }
+
+variable "location" {
+  description = "location"
+  type        = string
+  default     = "US"
+}

data/lib/templates/hcl/project/config/terraform/backend.tf.tt

@@ -1,6 +1,6 @@
 terraform {
   backend "gcs" {
-    bucket = "<%%= expansion('terraform-state-:PROJECT-:REGION-:ENV') %>" # expanded by terraspace IE: terraform-state-project-us-central1-dev
-    prefix = "<%%= expansion(':REGION/:ENV/:BUILD_DIR') %>" # expanded by terraspace IE: us-central1/dev/modules/vm
+    bucket = "<%%= expansion('terraform-state-:PROJECT-:REGION-:ENV') %>"
+    prefix = "<%%= expansion(':REGION/:ENV/:BUILD_DIR') %>"
   }
 }

data/lib/templates/hcl/stack/main.tf

@@ -7,4 +7,5 @@ module "bucket" {
 
   name                        = "bucket-${random_pet.this.id}"
   uniform_bucket_level_access = var.uniform_bucket_level_access
+  location                    = var.location
 }

data/lib/templates/hcl/stack/variables.tf

@@ -3,3 +3,9 @@ variable "uniform_bucket_level_access" {
   type        = bool
   default     = false
 }
+
+variable "location" {
+  description = "location"
+  type        = string
+  default     = "US"
+}

data/lib/terraspace_plugin_google/clients.rb

@@ -1,12 +1,24 @@
+require "google-cloud-resource_manager"
+require "google-cloud-secret_manager"
 require "google/cloud/storage"
 
 module TerraspacePluginGoogle
   module Clients
     extend Memoist
 
+    def secret_manager_service
+      Google::Cloud::SecretManager.secret_manager_service
+    end
+    memoize :secret_manager_service
+
     def storage
       Google::Cloud::Storage.new
     end
     memoize :storage
+
+    def resource_manager
+      Google::Cloud.new.resource_manager
+    end
+    memoize :resource_manager
   end
 end

data/lib/terraspace_plugin_google/interfaces/helper/secret.rb

@@ -0,0 +1,54 @@
+require "base64"
+
+module TerraspacePluginGoogle::Interfaces::Helper
+  class Secret
+    include TerraspacePluginGoogle::Clients
+    include TerraspacePluginGoogle::Logging
+    extend Memoist
+
+    def initialize(mod, options={})
+      @mod, @options = mod, options
+      @base64 = options[:base64]
+      @project_id = options[:google_project] || ENV['GOOGLE_PROJECT'] || raise("GOOGLE_PROJECT env variable is not set. It's required.")
+    end
+
+    def fetch(short_name, version: "latest")
+      value = fetch_value(short_name, version)
+      value = Base64.strict_encode64(value).strip if @base64
+      value
+    end
+
+    def fetch_value(short_name, version="latest")
+      short_name = expansion(short_name) if expand?
+      name = "projects/#{project_number}/secrets/#{short_name}/versions/#{version}"
+      version = secret_manager_service.access_secret_version(name: name)
+      version.payload.data
+    rescue Google::Cloud::NotFoundError => e
+      logger.info "WARN: secret #{name} not found".color(:yellow)
+      logger.info e.message
+      "NOT FOUND #{name}" # simple string so Kubernetes YAML is valid
+    rescue Google::Cloud::InvalidArgumentError => e
+      logger.info "WARN: secret #{name} not found".color(:yellow)
+      logger.info e.message
+      "NOT FOUND #{name}" # simple string so Kubernetes YAML is valid
+    end
+
+  private
+    @@project_number = nil
+    def project_number
+      return @@project_number if @@project_number
+      project = resource_manager.project(@project_id)
+      @@project_number = project.project_number
+    end
+
+    delegate :expansion, to: :expander
+    def expander
+      TerraspacePluginGoogle::Interfaces::Expander.new(@mod)
+    end
+    memoize :expander
+
+    def expand?
+      !(@options[:expansion] == false || @options[:expand] == false)
+    end
+  end
+end

data/lib/terraspace_plugin_google/interfaces/helper.rb

@@ -0,0 +1,10 @@
+module TerraspacePluginGoogle::Interfaces
+  module Helper
+    include Terraspace::Plugin::Helper::Interface
+
+    def google_secret(name, options={})
+      Secret.new(@mod, options).fetch(name)
+    end
+    cache_helper :google_secret
+  end
+end

data/lib/terraspace_plugin_google/logging.rb

@@ -0,0 +1,7 @@
+module TerraspacePluginGoogle
+  module Logging
+    def logger
+      Terraspace.logger
+    end
+  end
+end

data/lib/terraspace_plugin_google/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginGoogle
-  VERSION = "0.2.2"
+  VERSION = "0.3.3"
 end

data/lib/terraspace_plugin_google.rb

@@ -22,12 +22,22 @@ module TerraspacePluginGoogle
     Interfaces::Config.instance.config
   end
 
+  @@logger = nil
+  def logger
+    @@logger ||= Terraspace.logger
+  end
+
+  def logger=(v)
+    @@logger = v
+  end
+
   extend self
 end
 
 Terraspace::Plugin.register("google",
   backend: "gcs",
   config_class: TerraspacePluginGoogle::Interfaces::Config,
+  helper_class: TerraspacePluginGoogle::Interfaces::Helper,
   layer_class: TerraspacePluginGoogle::Interfaces::Layer,
   root: File.dirname(__dir__),
 )

data/terraspace_plugin_google.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "gcp_data"
   spec.add_dependency "google-cloud-storage"
+  spec.add_dependency "google-cloud-resource_manager"
+  spec.add_dependency "google-cloud-secret_manager"
   spec.add_dependency "memoist"
   spec.add_dependency "zeitwerk"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_google
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcp_data
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: google-cloud-resource_manager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: google-cloud-secret_manager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -114,8 +142,11 @@ files:
 - lib/terraspace_plugin_google/interfaces/backend.rb
 - lib/terraspace_plugin_google/interfaces/config.rb
 - lib/terraspace_plugin_google/interfaces/expander.rb
+- lib/terraspace_plugin_google/interfaces/helper.rb
+- lib/terraspace_plugin_google/interfaces/helper/secret.rb
 - lib/terraspace_plugin_google/interfaces/layer.rb
 - lib/terraspace_plugin_google/interfaces/summary.rb
+- lib/terraspace_plugin_google/logging.rb
 - lib/terraspace_plugin_google/version.rb
 - terraspace_plugin_google.gemspec
 homepage: https://github.com/boltops-tools/terraspace_plugin_google
@@ -138,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Terraspace Google Cloud Plugin