terraspace_plugin_google 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e63e836f63ed2b6731dbdf64bdd6a7635bacea437bb0e6430f5723552f83899
-  data.tar.gz: b7c5eb01564d29cae316d07bf52310bd4c110500d869392135a26275b196068f
+  metadata.gz: f70f3d2b05883b51424fcf33c4054ec87245a6194907501ece79d203d4004752
+  data.tar.gz: d98024a5205b2385d16761193ea367d302ba1cc2c57fef710f647cd3d49d2e54
 SHA512:
-  metadata.gz: dbc69e11cc8e24f636ea4fe3d9996d13d4d373dd7678018d2bf078e0a971762e55be7b61ec2cc0b39bfe321ffa9b0113715bc0075aa6110cf071c98774b39d11
-  data.tar.gz: 3aa893e192eb8004641bb0131da7ee2fffcb97b07d58ca09674ad5d5935806d7103e892538aae9896457a35b5241a73822bc59045cfdfc7d8506c49d08fc8308
+  metadata.gz: 11ec0a19248922068b38c68990477de03c8fcdd1c6bdc7eb9b8b583deb35a0a46a0f36c0319d7feb2fcf2913536b1e468d5c57c985c92cdfca7aba5379b6e16a
+  data.tar.gz: 30ea996f68cdd59da9902fd57dec0b89a643e272c5c04c7d9db407a9439aa5ef0c4ef89ae577ac0b9163b3aedb04df0d35debf3a7b43f4be63c719a69f09ede8

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 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.4] - 2022-01-11
+- [#10](https://github.com/boltops-tools/terraspace_provider_google/pull/10) set GOOGLE_CLOUD_PROJECT while keeping backwards compatibility
+
+## [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

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/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,3 +1,4 @@
+require "google-cloud-resource_manager"
 require "google-cloud-secret_manager"
 require "google/cloud/storage"
 
@@ -14,5 +15,10 @@ module TerraspacePluginGoogle
       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

@@ -4,11 +4,19 @@ module TerraspacePluginGoogle::Interfaces::Helper
   class Secret
     include TerraspacePluginGoogle::Clients
     include TerraspacePluginGoogle::Logging
+    extend Memoist
 
-    def initialize(options={})
-      @options = options
+    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.")
+      @project_id = options[:google_project] || ENV['GOOGLE_CLOUD_PROJECT'] || ENV['GOOGLE_PROJECT'] || raise("GOOGLE_PROJECT env variable is not set. It's required.")
+      # So google sdk newer versions use GOOGLE_CLOUD_PROJECT instead of GOOGLE_PROJECT
+      # Found out between google-cloud-storage-1.35.0 and google-cloud-storage-1.28.0
+      # Though it seems like an library underneath that with the change.
+      # Keeping backwards compatibility to not create breakage users who already have GOOGLE_PROJECT
+      # But then setting GOOGLE_CLOUD_PROJECT so it works with the SDK.
+      # For users, who set GOOGLE_CLOUD_PROJECT that will work also.
+      ENV['GOOGLE_CLOUD_PROJECT'] ||= @project_id
     end
 
     def fetch(short_name, version: "latest")
@@ -18,6 +26,7 @@ module TerraspacePluginGoogle::Interfaces::Helper
     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
@@ -25,19 +34,28 @@ module TerraspacePluginGoogle::Interfaces::Helper
       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
 
-    # TODO: Get the project from the list project api instead. Unsure where the docs are for this.
-    # If someone knows, let me know.
-    # Right now grabbing the first secret to then be able to get the google project number
+  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
 
-      parent = "projects/#{@project_id}"
-      resp = secret_manager_service.list_secrets(parent: parent) # note: page_size doesnt seem to get respected
-      name = resp.first.name # IE: projects/111111111111/secrets/demo-dev-db_host
-      @@project_number = name.split('/')[1]
+    def expand?
+      !(@options[:expansion] == false || @options[:expand] == false)
     end
   end
 end

data/lib/terraspace_plugin_google/interfaces/helper.rb

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

data/lib/terraspace_plugin_google/version.rb

@@ -1,3 +1,3 @@
 module TerraspacePluginGoogle
-  VERSION = "0.3.0"
+  VERSION = "0.3.4"
 end

data/terraspace_plugin_google.gemspec

@@ -24,6 +24,7 @@ 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace_plugin_google
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcp_data
@@ -38,6 +38,20 @@ 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
@@ -155,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Terraspace Google Cloud Plugin