kubes_google 0.3.3 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b12dca084f1a7011be11085f1e91b3e2551ae1814ddc33acec6172da1b5a66
-  data.tar.gz: 1fb93979efa46e903873fb18f9bad7affce32c73bc52bfe4c68c35b642033c60
+  metadata.gz: 82665e26689438f751a461e77057cfbe2f442a097c80f788e965b2c69af16468
+  data.tar.gz: adc9c449688f97bbdc5117f3238bf005029ca674abca41ce54a0c6cd019d1313
 SHA512:
-  metadata.gz: 7494108d3c48d710449494be1c4e3c772b13a5341becdaa76afd5cb02c3b390fd715bc6f48b46b62f0b3335731df6cf1e308a7e1851acba9c33544548a5e9252
-  data.tar.gz: 38fade8f5865c6355153b1ff18c4c37e28532d318b802503629b49553a0f5fe69e4e0d99fbbab53423a231b8ab5909d87c6ec55d91269086b9a1a76cf5c892b4
+  metadata.gz: 27dea1991e538398e8d9be728887bd9b553645a8bd6437ca13bbd94721cc09b88d3956d224c98420362933309203844d964397516f496797fa4373ad0d09cec1
+  data.tar.gz: df11c671e4b70beac80e55a2c6fae56fe156ae2b9e892b018fe63da418577a14edb4f4550e27c10b682946b6ddc92e1f368e19edc4e04c94eb6055346da86f90

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.3.7] - 2022-02-07
+- [#9](https://github.com/boltops-tools/kubes_google/pull/9) performance improvement: cache secrets
+
+## [0.3.6] - 2022-02-04
+- [#7](https://github.com/boltops-tools/kubes_google/pull/7) Secret auto retry with gcloud strategy
+- [#8](https://github.com/boltops-tools/kubes_google/pull/8) add condition none
+- get google project number via api
+
+## [0.3.5] - 2020-11-12
+- add KubesGoogle.cloudbuild? check
+- fetcher sdk friendly suggestion to use gcloud when vpn errors
+
+## [0.3.4] - 2020-11-12
+- fix KubesGoogle.config.secrets.fetcher check
+
 ## [0.3.3] - 2020-11-12
 - [#6](https://github.com/boltops-tools/kubes_google/pull/6) sdk and gcloud secrets fetcher strategy: secrets.fetcher option
 

data/kubes_google.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
   spec.add_dependency "google-cloud-container"
+  spec.add_dependency "google-cloud-resource_manager"
   spec.add_dependency "google-cloud-secret_manager"
   spec.add_dependency "memoist"
   spec.add_dependency "zeitwerk"

data/lib/kubes_google/secrets/fetcher/gcloud.rb

@@ -3,7 +3,6 @@ class KubesGoogle::Secrets::Fetcher
     include KubesGoogle::Util::Sh
 
     def fetch(short_name, version="latest")
-      puts "gcloud fetch #{short_name}"
       value = gcloud("secrets versions access #{version} --secret #{short_name}")
       if value.include?("ERROR") && value.include?("NOT_FOUND")
         logger.info "WARN: secret #{short_name} not found".color(:yellow)

data/lib/kubes_google/secrets/fetcher/sdk.rb

@@ -16,19 +16,28 @@ class KubesGoogle::Secrets::Fetcher
       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::UnavailableError => e
+      logger.error "ERROR: #{e.message}"
+      if e.message.include?("failed to connect")
+        logger.info <<~EOL
+          WARNING: SSL Handshake failed. This error seems to happen with some VPN setups.
+          You can turn off this warning by setting the gcloud fetcher instead.
+          To set up see:
+
+            https://kubes.guru/docs/helpers/google/secrets/#fetcher-strategy
+        EOL
+        raise KubesGoogle::VpnSslError
+      else
+        raise
+      end
     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
-
-      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/686010496118/secrets/demo-dev-db_host
-      @@project_number = name.split('/')[1]
+      project = resource_manager.project(@project_id)
+      @@project_number = project.project_number
     end
   end
 end

data/lib/kubes_google/secrets/fetcher.rb

@@ -1,17 +1,25 @@
 class KubesGoogle::Secrets
   class Fetcher
+    include KubesGoogle::Logging
     extend Memoist
 
     def initialize(options={})
       @options = options
     end
 
+    @@cache = {}
     def fetch(short_name)
+      return @@cache[short_name] if @@cache[short_name]
+      logger.debug "Fetching secret: #{short_name}"
+      @@cache[short_name] = fetcher.fetch(short_name)
+    rescue KubesGoogle::VpnSslError
+      logger.info "Retry fetching secret with the gcloud strategy"
+      fetcher = Gcloud.new(@options)
       fetcher.fetch(short_name)
     end
 
     def fetcher
-      if Kubes.config.secrets_fetcher == "sdk"
+      if KubesGoogle.config.secrets.fetcher == "sdk"
         Sdk.new(@options)
       else
         Gcloud.new(@options)

data/lib/kubes_google/service_account.rb

@@ -40,6 +40,7 @@ module KubesGoogle
       sh "gcloud iam service-accounts add-iam-policy-binding \
                 --role roles/iam.workloadIdentityUser \
                 --member #{member} \
+                --condition=None \
                 #{@service_account}".squish
     end
 

data/lib/kubes_google/services.rb

@@ -1,3 +1,4 @@
+require "google-cloud-resource_manager"
 require "google-cloud-secret_manager"
 require "google/cloud/container"
 
@@ -14,6 +15,11 @@ module KubesGoogle
       Google::Cloud::SecretManager.secret_manager_service
     end
     memoize :secret_manager_service
+
+    def resource_manager
+      Google::Cloud.new.resource_manager
+    end
+    memoize :resource_manager
   end
 end
 

data/lib/kubes_google/version.rb

@@ -1,3 +1,3 @@
 module KubesGoogle
-  VERSION = "0.3.3"
+  VERSION = "0.3.7"
 end

data/lib/kubes_google.rb

@@ -6,6 +6,7 @@ KubesGoogle::Autoloader.setup
 
 module KubesGoogle
   class Error < StandardError; end
+  class VpnSslError < StandardError; end
 
   @@logger = nil
   def logger
@@ -35,6 +36,10 @@ module KubesGoogle
     Config.instance.config
   end
 
+  def cloudbuild?
+    !!ENV['BUILDER_OUTPUT'] # cloudbuild env vars: https://gist.github.com/tongueroo/7ae26abd60d30da3972e86b4e7ca315e
+  end
+
   extend self
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes_google
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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
@@ -146,7 +160,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: Kubes Google Helpers Library