polyn-cli 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae34f6e95adeb45fa4c421f9eb70960bf599e570a2934365efff5218948d954
-  data.tar.gz: f72f8e51082c3d68956bd28a78667d6e484e89c7e90aa87dc212ad6c1d7a59e5
+  metadata.gz: d0492c19f8164fbaa7e050276f22e3c56c9879f63307840e3551a5d955e190ce
+  data.tar.gz: bc6f7f2a6899e28261453509402eaa5955e45e8c163ec9dd79a069c366ffcd8b
 SHA512:
-  metadata.gz: cf5e0ff4dae1a5769da3f041f32a579a159c7fe00281d8a8f563e0c0642d55a3632010f47d7351b6e72592cfd781e6eea1d88091a3a51dd12c8e9045809ca040
-  data.tar.gz: 9a91d45f22c7c2ec3d3dce6e32776607d9da6d17d6c93a811c5219e4ae11cf0b47aa60bd0615fb705d857fe1fcd60df3e20243a92c4cfeb98e8170dfa892c0d6
+  metadata.gz: dd5a1d0fc16b7d499d95e8fcc1a6c96a7006da394205ccb5ec969e91c7d3c7c37bed608d6b86b4555c39ca16e1ce70ed91120c0ddac30a5014435abfc301a2e0
+  data.tar.gz: d33d503d6dee25d3220532b2731beac35eb90ccc28859475f2cadef9ec03dc19f8b283ef6ba2bbcbbd5a5f31ca81f48564da747e92c17a0e153665fa9381701a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyn-cli (0.1.2)
+    polyn-cli (0.1.5)
       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 unless msg.data.empty?
+        # 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.5"
   end
 end

data/lib/polyn/cli.rb

@@ -130,7 +130,7 @@ module Polyn
 
       def tf_apply
         if polyn_env == "development"
-          %(terraform apply -var "jetstream_servers=#{nats_servers}")
+          %(terraform apply -auto-approve -input=false -var "jetstream_servers=#{nats_servers}")
         else
           "terraform apply -auto-approve -input=false "\
             "-var \"jetstream_servers=#{nats_servers}\" "\

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

@@ -3,20 +3,19 @@
 This repository contains all of the events and terraform resources for the Polyn services
 environment.
 
-## Development Setup
-
 1. Install [Ruby](https://github.com/asdf-vm/asdf-ruby)
-2. Install Terraform. For M1 Macs, [download the AMD64 version](https://www.terraform.io/downloads)
+2. Install bundler `gem install bundler`
+3. Install dependencies `bundle install`
+4. Install Terraform. For M1 Macs, [download the AMD64 version](https://www.terraform.io/downloads)
    rather than using Homebrew to install Terraform.
-3. Ensure Docker & Docker Compose is installed
-4. [Install the Polyn CLI](https://github.com/SpiffInc/polyn-cli)
-5. Call `polyn tf_init` if this is the first time using terraform in the codebase.
-6. Call `polyn up`. By default this will run in `development` mode, which will start the NATS
+5. Ensure Docker & Docker Compose is installed
+6. Call `bundle exec polyn tf_init` if this is the first time using terraform in the codebase.
+7. Call `bundle exec polyn up`. By default this will run in `development` mode, which will start the NATS
    server, configure it via Terraform, and update the Polyn Event Registry.
 
 ### Running NATS locally
 
-`polyn up` will use run a Docker container for you if one is not already running. Alternatively, you can run `nats-server` yourself locally if you prefer.
+`bundle exec polyn up` will use run a Docker container for you if one is not already running. Alternatively, you can run `nats-server` yourself locally if you prefer.
 
 ## Naming Conventions
 
@@ -24,15 +23,15 @@ See the Protocol Documentation for [Naming Conventions](https://github.com/Spiff
 
 ## Streams
 
-Each stream should have its own configuration file under `./tf` . Run `polyn gen:stream <stream_name>` to generate a new configuration file for a stream
+Each stream should have its own configuration file under `./tf`. Run `bundle exec polyn gen:stream <stream_name>` to generate a new configuration file for a stream
 
 ## Consumers
 
-Run `polyn gen:consumer <stream_name> <destination_name> <event_type>` to generate new configuration for a consumer of a stream. It will be included in the same file as the stream configuration.
+Run `bundle exec polyn gen:consumer <stream_name> <destination_name> <event_type>` to generate new configuration for a consumer of a stream. It will be included in the same file as the stream configuration.
 
 ## Event Schemas
 
-Run `polyn gen:schema <event_type>` to generate a new JSON Schema for an event
+Run `bundle exec polyn gen:schema <event_type>` to generate a new JSON Schema for an event
 
 All the schemas for your events should live in the `./events` directory.
 The name of your schema file should be the same as your event, but with `.json` at the end.
@@ -45,7 +44,7 @@ This means you only need to include the JSON Schema for the `data` portion of th
 
 If you'd like to organize your events by team ownership or some other convention, you can use subdirectories to do so. The full event type should still be part of the file name. You should also ensure there are not duplicate event types in different directories as only one schema can be defined per event type.
 
-You can generate a schema in a subdirectory like this: `polyn gen:schema some/nested/dir/widgets.created.v1`
+You can generate a schema in a subdirectory like this: `bundle exec polyn gen:schema some/nested/dir/widgets.created.v1`
 
 ## Schema Versioning
 
@@ -81,4 +80,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.5
 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-09-02 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