kubes_google 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4940b31e1e64807b1036d0980ab6c1ebe81aa6f05581b1e2d00b3bf915d12c0
-  data.tar.gz: 6761294987f6c33fef1d9764712bab015b7b264fa8e5b84c166a633f03bc44aa
+  metadata.gz: '088f3403efb08082a1aafe32aa0790dd3f3066c2fa49097963d952150171ec03'
+  data.tar.gz: 6865c3cbf32056aea2615ae9022c1763ec8449dea2fc5242f3ddb01750bb2cd2
 SHA512:
-  metadata.gz: 4c09463d4a76e82240502a5779e90a9874b9c91d4f195f91af128fa48a134b44a9485a5c327fad74826834edd57e0137ebd9375558f4253ec0ca5242610061a7
-  data.tar.gz: a7ecffa4255c71544b92fd5df88bac16a5a06eb4e2c8e48eed9d9b1f61a12c98f18c3c6edd8f92aef51ffeb595605a9cccb578a42dbc810b89fc9eeb9a97fe02
+  metadata.gz: a760e087e9cd8eb9636fd1540aa020e2ed74da3038aeec039e562e83123dd70a9bfec6fc594b31fb1e1911d1664553398cd051548949b4c55f9eff7bcf844956
+  data.tar.gz: fc8d14d3cdbc386ebc53d815e8e854affa8bfe1eef97c6e578aa6a519704901131e4f9e5be8734a18b512cebd00df36c12ab665f7ff63bc769613911803dd922

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.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

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/sdk.rb

@@ -16,32 +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
-    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
-    @@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]
     rescue Google::Cloud::UnavailableError => e
       logger.error "ERROR: #{e.message}"
       if e.message.include?("failed to connect")
         logger.info <<~EOL
-          SSL Handshake failed. This error seems to happen with some VPN setups.
-          Please try the gcloud fetcher instead. To set up see:
+          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
-        exit 1
+        raise KubesGoogle::VpnSslError
       else
         raise
       end
     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
   end
 end

data/lib/kubes_google/secrets/fetcher.rb

@@ -8,6 +8,10 @@ class KubesGoogle::Secrets
 
     def fetch(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

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.5"
+  VERSION = "0.3.6"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes_google
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2022-02-04 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