polyn-cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae34f6e95adeb45fa4c421f9eb70960bf599e570a2934365efff5218948d954
-  data.tar.gz: f72f8e51082c3d68956bd28a78667d6e484e89c7e90aa87dc212ad6c1d7a59e5
+  metadata.gz: 4157c24284768c4e60893c3f3d7aca891e8916752ca85c6c48577ad59b9719bc
+  data.tar.gz: 114bb082e7f42f3db6d0efde45d4f058bb33bab652c42fc316668b6456d0e500
 SHA512:
-  metadata.gz: cf5e0ff4dae1a5769da3f041f32a579a159c7fe00281d8a8f563e0c0642d55a3632010f47d7351b6e72592cfd781e6eea1d88091a3a51dd12c8e9045809ca040
-  data.tar.gz: 9a91d45f22c7c2ec3d3dce6e32776607d9da6d17d6c93a811c5219e4ae11cf0b47aa60bd0615fb705d857fe1fcd60df3e20243a92c4cfeb98e8170dfa892c0d6
+  metadata.gz: c349dfca556555beaccbe06d2829378e4fb027a76651d444b3f0b0b8560237ca4f2ab8a8678be12de69eee47ade4837ca8cae405e632fbc2c5e2a5e55cbbae0d
+  data.tar.gz: 1d09e688a62159910697b791de37cebbd0d21f5e7078b84201854b777e0b3d22bcf93b9f034fd4d81f9125ddd32a17d683c0e0d9284a360e0ddb2e23afdd4e99

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyn-cli (0.1.2)
+    polyn-cli (0.1.3)
       dotenv (~> 2.7.6)
       json_schemer (~> 0.2)
       nats-pure (~> 2.0.0)

data/bin/apply_changes.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# We want to keep these commands out of the Docker image
+# build and instead defer them till the container is run.
+# terraform init may require credentials for a remote backend
+# and we don't want that in the image for security reasons.
+bundle exec polyn tf_init
+bundle exec polyn up

data/lib/polyn/cli/schema_loader.rb

@@ -19,26 +19,38 @@ module Polyn
       def initialize(thor, **opts)
         @thor               = thor
         @client             = NATS.connect(Polyn::Cli.configuration.nats_servers).jetstream
-        @bucket             = client.key_value(opts.fetch(:store_name, STORE_NAME))
+        @store_name         = opts.fetch(:store_name, STORE_NAME)
+        @bucket             = client.key_value(@store_name)
         @cloud_event_schema = Polyn::Cli::CloudEvent.to_h.freeze
         @events_dir         = opts.fetch(:events_dir, File.join(Dir.pwd, "events"))
         @events             = {}
+        @existing_events    = {}
       end
 
       def load_events
         thor.say "Loading events into the Polyn event registry from '#{events_dir}'"
         read_events
+        load_existing_events
 
         events.each do |name, event|
           bucket.put(name, JSON.generate(event))
         end
 
+        delete_missing_events
+
         true
       end
 
       private
 
-      attr_reader :thor, :events, :client, :bucket, :cloud_event_schema, :events_dir
+      attr_reader :thor,
+        :events,
+        :client,
+        :bucket,
+        :cloud_event_schema,
+        :events_dir,
+        :store_name,
+        :existing_events
 
       def read_events
         event_files = Dir.glob(File.join(events_dir, "/**/*.json"))
@@ -95,6 +107,32 @@ module Polyn
           }),
         })
       end
+
+      def load_existing_events
+        sub = client.subscribe("#{key_prefix}.>")
+
+        loop do
+          msg                                                     = sub.next_msg
+          existing_events[msg.subject.gsub("#{key_prefix}.", "")] = msg.data
+        # A timeout is the only mechanism given to indicate there are no
+        # more messages
+        rescue NATS::IO::Timeout
+          break
+        end
+        sub.unsubscribe
+      end
+
+      def key_prefix
+        "$KV.#{store_name}"
+      end
+
+      def delete_missing_events
+        missing_events = existing_events.keys - events.keys
+        missing_events.each do |event|
+          thor.say "Deleting event #{event}"
+          bucket.delete(event)
+        end
+      end
     end
   end
 end

data/lib/polyn/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Polyn
   class Cli
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/polyn/templates/Dockerfile

@@ -11,10 +11,6 @@ ADD tf ./tf
 
 FROM app as dev
 ENV POLYN_ENV='development'
-RUN bundle exec polyn tf_init
-CMD bundle exec polyn up
 
 FROM app as prod
-ENV POLYN_ENV='production'
-RUN bundle exec polyn tf_init
-CMD bundle exec polyn up
+ENV POLYN_ENV='production'

data/lib/polyn/templates/README.md

@@ -81,4 +81,6 @@ Polyn expects you to keep a `./remote_state_config/backend.tf` file that configu
 
 ## Deployment
 
-The default `Dockerfile` generated by [Install the Polyn CLI](https://github.com/SpiffInc/polyn-cli) can help you create an image that will configure terraform and your infrastucture with the latest changes when you execute `docker run`. You'll need to pass in `env` variables for `NATS_SERVERS` and `NATS_CREDENTIALS`. Also any `env` variables needed to connect to your remote state storage.
+The default `Dockerfile` generated by [Install the Polyn CLI](https://github.com/SpiffInc/polyn-cli) can help you create an image with the latest changes and nessary environment to run polyn commands.
+
+The `bin/apply_changes.sh` script can be used to execute the polyn commands you need to update your production NATS server. You'll need to pass in `env` variables for `NATS_SERVERS` and `NATS_CREDENTIALS`. Also any `env` variables needed to connect to your remote state storage.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyn-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jarod
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -89,6 +89,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/apply_changes.sh
 - bin/console
 - bin/setup
 - exe/polyn