remocon 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93390c5bcbfb187a136b9574a25a698792f6d983
-  data.tar.gz: 9535d94e292b39592b59648a5d99dcd7f3cd7d58
+  metadata.gz: 4f0c28fa84a9323c0c1d867d81d7b8a13b676774
+  data.tar.gz: 2637bbbec4410f90cfc2d086b55fc6340890c6ed
 SHA512:
-  metadata.gz: cea8d85ee2d7f346823d5836b3d9022083b4d6d159948ca5d6bbc37514d690ace6d5c33e8849c06d47925ccdb93cc2094ef90cce9eaf598c5839cef426b5bc15
-  data.tar.gz: b11688605b37af9448bbf43c40d081c204b303b4d5cbdc9102ffa607f6e13e449af0595a7f7ce000fd2772068c7149d7d32f2d56889025b27166c1b3ac9882aa
+  metadata.gz: 3ac73ff7a2316cad4ce51836741d753b7c023bd8413c36e4c8c7bbb707a4fa7f63e8facccf2386bab7216686e824e977e61f67eaf75d329540f033fddf1319ba
+  data.tar.gz: be5f1b03a2967c35ef96be01d23dd84eb8ad5392b99bbdaa95268f39eb687dc0e84a9d140e11b0b0960473714eec132b832706802c81906b5f382d7b55b41fbd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remocon (0.4.0)
+    remocon (0.4.1)
       activesupport
       googleauth
       thor

data/lib/remocon.rb

@@ -10,6 +10,7 @@ require "open-uri"
 require "fileutils"
 require "net/http"
 require "googleauth"
+require "tempfile"
 
 require "remocon/util/array"
 require "remocon/util/hash"

data/lib/remocon/command/lib/interpreter_helper.rb

@@ -28,10 +28,6 @@ module Remocon
       @parameter_hash ||= sort_parameters(read_parameters.first)
     end
 
-    def parameter_errors
-      @parameter_errors ||= read_parameters.second
-    end
-
     def read_conditions
       @read_conditions ||= begin
         condition_interpreter = Remocon::ConditionFileInterpreter.new(require_conditions_file_path)
@@ -43,10 +39,6 @@ module Remocon
       @condition_array ||= sort_conditions(read_conditions.first)
     end
 
-    def condition_errors
-      @condition_errors ||= read_conditions.second
-    end
-
     def condition_names
       @condition_names ||= condition_array.map { |e| e[:name] }
     end

data/lib/remocon/command/lib/request.rb

@@ -27,6 +27,31 @@ module Remocon
       return response, response_body
     end
 
+    def self.validate(config, config_temp_file)
+      raise "etag should be specified. If you want to ignore this error, then please add --force option" unless config.etag
+
+      client, uri = Request.build_client(config)
+
+      headers = {
+          "Authorization" => "Bearer #{config.token}",
+          "Content-Type" => "application/json; UTF8",
+          "If-Match" => config.etag,
+      }
+
+      request = Net::HTTP::Put.new("#{uri.request_uri}?validate_only=true", headers)
+      request.body = +""
+      request.body << config_temp_file.read.delete("\r\n")
+
+      response = client.request(request)
+
+      response_body = begin
+        json_str = response.try(:read_body)
+        (json_str ? JSON.parse(json_str) : {}).with_indifferent_access
+      end
+
+      return response, response_body
+    end
+
     def self.pull(config)
       raw_json, etag = open(config.endpoint, "Authorization" => "Bearer #{config.token}") do |io|
         [io.read, io.meta["etag"]]

data/lib/remocon/command/validate_command.rb

@@ -23,21 +23,36 @@ module Remocon
       def run
         validate_options
 
-        errors = parameter_errors + condition_errors + etag_errors
+        artifact = {
+            conditions: condition_array,
+            parameters: parameter_hash
+        }.skip_nil_values.stringify_values
 
-        print_errors(errors)
+        response, body = Tempfile.open do |t|
+          t.write(JSON.pretty_generate(artifact))
+          t.flush
 
-        errors.empty?
-      end
+          Request.validate(config, t)
+        end
 
-      def print_errors(errors)
-        if errors.empty?
-          STDOUT.puts "No error was found."
-        else
-          errors.each do |e|
-            STDERR.puts "#{e.class} #{e.message}"
-            STDERR.puts e.backtrace&.join("\n")
+        if response.kind_of?(Net::HTTPOK)
+          if response.header["etag"] =~ /^.*-0$/
+            if etag_errors.empty?
+              STDOUT.puts "valid"
+              true
+            else
+              # validation api cannot validate etag
+              STDERR.puts "the latest etag was updated"
+              false
+            end
+          else
+            # https://firebase.google.com/docs/remote-config/use-config-rest#validate_before_publishing
+            STDERR.puts "api server returned 200 but etag is not followed the valid format"
+            false
           end
+        else
+          STDERR.puts body
+          false
         end
       end
 
@@ -46,7 +61,7 @@ module Remocon
       def validate_options
         raise ValidationError, "A condition file must exist" unless File.exist?(config.conditions_file_path)
         raise ValidationError, "A parameter file must exist" unless File.exist?(config.parameters_file_path)
-        raise ValidationError, "An etag file must exist" unless File.exist?(config.etag_file_path)
+        raise ValidationError, "An etag must be specified" unless config.etag
       end
 
       def remote_etag
@@ -54,7 +69,7 @@ module Remocon
       end
 
       def etag_errors
-        if config.etag != remote_etag
+        if config.etag != "*" && config.etag != remote_etag
           [ValidationError.new("#{config.etag} is found but the latest etag is #{remote_etag || 'none'}")]
         else
           []

data/lib/remocon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Remocon
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remocon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jumpei Matsuda