Merge pull request #13 from articulate/prod-funk

Fixing the timestamp 🐛 once and for all

spec/configs/acl_config_spec.cr

@@ -15,5 +15,19 @@ module Biplane
       acl.member_route.should be_a(Route)
       acl.member_route.to_s.should eq "/consumers/#{parent.lookup_key}/acls/:id"
     end
+
+    it "outputs attrs for create" do
+      acl.for_create.should eq({
+        "group":      acl.group,
+        "created_at": "now",
+      })
+    end
+
+    it "uses epoch time for update" do
+      acl.for_update.should eq({
+        "group":      acl.group,
+        "created_at": Time.now.epoch,
+      })
+    end
   end
 end

spec/configs/api_config_spec.cr

@@ -20,5 +20,25 @@ module Biplane
       plugins.should be_a(Array(PluginConfig))
       plugins.map { |p| p.name }.should eq ["acl", "jwt"]
     end
+
+    it "outputs attrs for create" do
+      api.for_create.should eq({
+        "name":               api.name,
+        "request_path":       api.request_path,
+        "strip_request_path": api.strip_request_path,
+        "upstream_url":       api.upstream_url,
+        "created_at":         "now",
+      })
+    end
+
+    it "uses epoch time for update" do
+      api.for_update.should eq({
+        "name":               api.name,
+        "request_path":       api.request_path,
+        "strip_request_path": api.strip_request_path,
+        "upstream_url":       api.upstream_url,
+        "created_at":         Time.now.epoch,
+      })
+    end
   end
 end

spec/configs/consumer_config_spec.cr

@@ -20,5 +20,19 @@ module Biplane
       items.should be_a(Array(AclConfig | CredentialConfig))
       items.size.should eq 2
     end
+
+    it "outputs attrs for create" do
+      consumer.for_create.should eq({
+        "username":   consumer.username,
+        "created_at": "now",
+      })
+    end
+
+    it "uses epoch time for update" do
+      consumer.for_update.should eq({
+        "username":   consumer.username,
+        "created_at": Time.now.epoch,
+      })
+    end
   end
 end

spec/configs/credential_config_spec.cr

@@ -6,13 +6,21 @@ module Biplane
     credential.parent = parent = yaml_fixture(ConsumerConfig)
 
     it "can flatten for params" do
-      credential.as_params.should eq({
+      credential.for_create.should eq({
         "key":        "xxx",
         "secret":     "yyy",
         "created_at": "now",
       })
     end
 
+    it "outputs epoch time for update" do
+      credential.for_update.should eq({
+        "key":        "xxx",
+        "secret":     "yyy",
+        "created_at": Time.now.epoch,
+      })
+    end
+
     it "knows collection path" do
       credential.collection_route.should be_a(Route)
       credential.collection_route.to_s.should eq "/consumers/#{parent.lookup_key}/#{credential.name}"

spec/configs/plugin_config_spec.cr

@@ -23,7 +23,7 @@ module Biplane
     end
 
     it "can present config as params" do
-      plugin.as_params.should eq({
+      plugin.for_create.should eq({
         "name":   "acl",
         "config": {
           "whitelist": ["docs-auth", "google-auth"],
@@ -40,13 +40,23 @@ module Biplane
         },
       }))
 
-      odd.as_params.should eq({
+      odd.for_create.should eq({
         "name":   "what",
         "config": {
           "whitelist": ["name", "only"],
         },
         "created_at": "now",
       })
     end
+
+    it "outputs epoch time for update" do
+      plugin.for_update.should eq({
+        "name":   "acl",
+        "config": {
+          "whitelist": ["docs-auth", "google-auth"],
+        },
+        "created_at": Time.now.epoch,
+      })
+    end
   end
 end

src/biplane/configs/acl_config.cr

@@ -11,10 +11,12 @@ module Biplane
       group: String,
     })
 
-    def as_params
-      normalize(serialize, {
-        created_at: pg_now,
-      })
+    def for_create
+      normalize(serialize, {created_at: pg_now})
+    end
+
+    def for_update
+      normalize(for_create, {created_at: epoch_int})
     end
 
     def serialize

src/biplane/configs/api_config.cr

@@ -31,7 +31,7 @@ module Biplane
       ChildCollection.new(@plugins, self)
     end
 
-    def as_params
+    def for_create
       {
         "name":               name,
         "request_path":       request_path,
@@ -41,6 +41,10 @@ module Biplane
       }
     end
 
+    def for_update
+      for_create.merge({"created_at": epoch_int})
+    end
+
     def serialize
       {
         "name":       name,

src/biplane/configs/consumer_config.cr

@@ -14,13 +14,17 @@ module Biplane
       credentials: {type: Array(CredentialConfig), default: Array(CredentialConfig).new},
     })
 
-    def as_params
+    def for_create
       {
         "username":   username,
         "created_at": pg_now,
       }
     end
 
+    def for_update
+      for_create.merge({"created_at": epoch_int})
+    end
+
     def acls
       ChildCollection.new(@acls, self)
     end

src/biplane/configs/credential_config.cr

@@ -18,10 +18,12 @@ module Biplane
       route(collection_key, {name: name})
     end
 
-    def as_params
-      normalize(attributes, {
-        created_at: pg_now,
-      })
+    def for_create
+      normalize(attributes, {created_at: pg_now})
+    end
+
+    def for_update
+      normalize(for_create, {created_at: epoch_int})
     end
 
     def serialize

src/biplane/configs/plugin_config.cr

@@ -18,13 +18,17 @@ module Biplane
       @parsed_attrs ||= @attributes.nil? ? Hash(String, Type).new : normalize(to_hash(@attributes) as Hash)
     end
 
-    def as_params
+    def for_create
       normalize(attributes, {
         name:       name,
         created_at: pg_now,
       })
     end
 
+    def for_update
+      normalize(for_create, {created_at: epoch_int})
+    end
+
     def serialize
       serial = Hash(String, Type).new
       serial["name"] = name

src/biplane/kong_client.cr

@@ -101,7 +101,7 @@ module Biplane
       headers = HTTP::Headers.new
       headers.add("Content-Type", "application/json")
 
-      params = config.as_params
+      params = config.for_create
       response = @client.post(config.collection_route.to_s, headers, params.to_json) as HTTP::Client::Response
       @client.close # close immediately since we might make nested requests
 
@@ -139,7 +139,7 @@ module Biplane
       headers = HTTP::Headers.new
       headers.add("Content-Type", "application/json")
 
-      params = normalize(config.as_params, {"id": object.id})
+      params = normalize(config.for_update, {"id": object.id})
       response = @client.put(config.collection_route.to_s, headers, params.to_json) as HTTP::Client::Response
 
       case response.status_code

src/biplane/mixins/timestamps.cr

@@ -3,5 +3,9 @@ module Biplane::Mixins
     def pg_now
       "now"
     end
+
+    def epoch_int
+      Time.now.epoch
+    end
   end
 end

src/biplane/version.cr

@@ -1,3 +1,3 @@
 module Biplane
-  VERSION = "1.3.11"
+  VERSION = "1.3.12"
 end