gce-host 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19193e270212331af7d6ed88a67a2477cc918ffd
-  data.tar.gz: 6938284bed1b7ae803773b673ee47b2507e4993a
+  metadata.gz: 9dcb22f8502017ffafae992fec07a972eff348b8
+  data.tar.gz: 1167b8fa23f4d18d24cda1473799a60cf9964ead
 SHA512:
-  metadata.gz: 2489ae5fd002f8e517592d9ca0c88b932d08c49aab5193bacfc8dfa2164b7fff3889541178b69c63f238a1c338075ea0c1d3c82e0c1869ff010f326d7b29941d
-  data.tar.gz: 852d0b3b2c8dbba2229ccfbf4e69821da5ac7484b94388ab12df563c60ec77d950ef2ea7121391b652e87d152cc59d85f838ef522c9bbb8b918b773eb9e4f602
+  metadata.gz: 4c3be2a15187ff646baa87b93377cbcfd86de9b9d7816ebc0f585d6b18bf0a87b4a54572a2aaf128fdca064313d84af8b410a9738809d50c403a09ebed5c0c01
+  data.tar.gz: af63c8a6aabbfa595de78f233814f9502047a269252f17c93b7e394c494ba441b2734bd671a0810b20a188afe5f91eefd1656deaab103e6110057f4203a23bb3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.1 (2016/11/25)
+
+Enhancements
+
+* Get project_id from credentials['client_email'] for a service account json
+
 # 0.3.0 (2016/11/25)
 
 Changes

data/README.md

@@ -21,8 +21,9 @@ You can write a configuration file located at `/etc/sysconfig/gce-host` (You can
 
 GOOGLE API parameters:
 
-* **AUTH_METHOD (optional)**: Authentication method. Currently, `compute_engine`, `service_account`, `authorized_user`, and `application_default` is available. The default reads from `GOOGLE_APPLICATION_CREDENTIALS`.
+* **AUTH_METHOD (optional)**: Authentication method. Currently, `compute_engine`, `service_account`, `authorized_user`, and `application_default` is available. The default is `application_default`
 * **GOOGLE_APPLICATION_CREDENTIALS (optional)**: Specify path of json credential file. The default is `~/.config/gcloud/application_default_credentials.json`.
+* **GOOGLE_PROJECT (optional)**: Specify project name of your GCP account. It tries to retrieve project_id if service account json is given in `GOOGLE_APPLICATION_CREDENTIALS`.
 
 gce-host parameters:
 
@@ -169,7 +170,7 @@ NOTE: Currently, mock is not supported yet. So, you have to create your own gclo
 Configure .env file as
 
 ```
-AUTH_METHOD=json_key
+AUTH_METHOD=service_account
 GOOGLE_APPLICATION_CREDENTIALS=service_acount.json
 GOOGLE_PROJECT=XXXXXXXXXXXXX
 OPTIONAL_STRING_KEYS=service,status

data/example/example.conf

@@ -1,4 +1,4 @@
-AUTH_METHOD=json_key
+AUTH_METHOD=service_account
 GOOGLE_APPLICATION_CREDENTIALS=~/.config/gcloud/your-project-000.json
 ROLES_KEY=roles
 ROLE_VALUE_DELIMITER=:
@@ -6,3 +6,4 @@ OPTIONAL_STRING_KEYS=service,status
 OPTIONAL_ARRAY_KEYS=tags
 ARRAY_VALUE_DELIMITER=,
 LOG_LEVEL=info
+STATUS=state

data/lib/gce/host/config.rb

@@ -16,12 +16,12 @@ class GCE
       end
 
       def self.auth_method
-        @auth_method ||= ENV['AUTH_METHOD'] || config.fetch('AUTH_METHOD', nil) || credentials['type'] || 'application_default'
+        @auth_method ||= ENV['AUTH_METHOD'] || config.fetch('AUTH_METHOD', nil) || 'application_default'
       end
 
       def self.credentials_file
         # ref. https://developers.google.com/identity/protocols/application-default-credentials
-        @credential_file ||= File.expand_path(ENV['GOOGLE_APPLICATION_CREDENTIALS'] || config.fetch('GOOGLE_APPLICATION_CREDENTIALS', nil) || credentials_file_default)
+        @credentials_file ||= File.expand_path(ENV['GOOGLE_APPLICATION_CREDENTIALS'] || config.fetch('GOOGLE_APPLICATION_CREDENTIALS', nil) || credentials_file_default)
       end
 
       def self.credentials_file_default
@@ -57,7 +57,9 @@ class GCE
       end
 
       def self.project
-        @project ||= ENV['GOOGLE_PROJECT'] || config.fetch('GOOGLE_PROJECT', nil) || credentials['project_id'] || project_default
+        @project ||= ENV['GOOGLE_PROJECT'] || config.fetch('GOOGLE_PROJECT', nil) || credentials['project_id']
+        @project ||= credentials['client_email'].chomp('.iam.gserviceaccount.com').split('@').last if credentials['client_email']
+        @project ||= project_default
       end
 
       def self.log_level

data/lib/gce/host/version.rb

@@ -1,5 +1,5 @@
 class GCE
   class Host
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gce-host
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Naotoshi Seo