stax 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977f337dd555b2e8941cb23a8493af6ada396a3eeba4af49264a26ca7a022d4c
-  data.tar.gz: cb54eca3f8cad6131164e33b6704c69d48b4ca3b089e07ec27e978beca853ad0
+  metadata.gz: 2f2aca89588152ddee959060e8fc3c1dc1bef1c2abb3a57839ab0a35de9aa208
+  data.tar.gz: b9bcf76bba2aa8a472c07291596142b6d4338a566abd42636fb9cf8b05b6b7be
 SHA512:
-  metadata.gz: f44ff1358eef0fb11b44bdcee1f040757506c5792178b1e895b8e7ebf1f38d6ac43edd39c88effe79e9c257ccf44c6a0db84627e331047ddfdeeb9675b7c2bfb
-  data.tar.gz: b9d0c14a3b6a99354ecce5f32a8bdf31482abcaffe730d1a76919daa34d0396edb09fc2bf281360613b8abcf2f6f6575795dfdab4d7004dbe600930d93d17296
+  metadata.gz: b4f6c035f4c10239132e339ef964be95ac86069a47b6bf0f7f1cf7f25a5b1661d3b0d57a518cde8d4ef018d8dd333cc5bfc6b6db6f71e64846b77839bf037958
+  data.tar.gz: 651280004b99781f0d209b9c91179560b75b238dd0faa1431a6f418f94dc1283e9c06e0a6bb9c9636b847898812f9fa8648f052f47aefbe8230d3cc2c3a33074

data/lib/stax/base.rb

@@ -132,6 +132,12 @@ module Stax
         end
       end
 
+      ## run desktop open command
+      def os_open(*args)
+        cmd = RUBY_PLATFORM.end_with?('linux') ? 'xdg-open' : 'open'
+        system(cmd, *args)
+      end
+
     end
   end
-end
+end

data/lib/stax/cli/crud.rb

@@ -56,10 +56,11 @@ module Stax
     end
 
     desc 'delete', 'meta delete task'
+    method_option :notail, aliases: '-n', type: :boolean, default: false, description: 'do not tail stack events'
     def delete
       stack_objects.reverse.each do |s|
         if s.exists?
-          s.delete
+          s.invoke(:delete, [], options)
         else
           say("#{s.stack_name} does not exist", :green)
         end
@@ -67,4 +68,4 @@ module Stax
     end
 
   end
-end
+end

data/lib/stax/docker.rb

@@ -1,4 +1,3 @@
-require 'stax/aws/sts'
 require 'stax/aws/ecr'
 
 module Stax
@@ -7,7 +6,7 @@ module Stax
     no_commands do
       ## default to ECR registry for this account
       def docker_registry
-        @_docker_registry ||= "#{Aws::Sts.id.account}.dkr.ecr.#{ENV['AWS_REGION']}.amazonaws.com"
+        @_docker_registry ||= "#{aws_account_id}.dkr.ecr.#{aws_region}.amazonaws.com"
       end
 
       ## name the docker repo after the git repo
@@ -21,7 +20,7 @@ module Stax
       end
 
       ## build a docker image locally
-      def docker_local_build
+      def docker_build
         debug("Docker build #{docker_image}")
         system "docker build -t #{docker_image} #{Git.toplevel}"
       end
@@ -31,28 +30,6 @@ module Stax
         debug("Docker push #{docker_image}")
         system "docker push #{docker_image}"
       end
-
-      ## override this for your argus setup
-      def docker_argus_queue
-        @_docker_argus_queue ||= Aws::Sqs.queue_url('argus.fifo')
-      end
-
-      def docker_argus_build
-        debug("Sending to argus #{Git.branch}:#{Git.sha}")
-        org, repo = Git.repo.split('/')
-        Aws::Sqs.send(
-          queue_url: docker_argus_queue,
-          message_group_id: repo,
-          message_body: {
-            org:    org,
-            repo:   repo,
-            branch: Git.branch,
-            sha:    Git.sha,
-          }.to_json
-        ).tap do |r|
-          puts r&.message_id
-        end
-      end
     end
 
     desc 'registry', 'show registry name'
@@ -73,8 +50,7 @@ module Stax
     ## override this method with the desired builder
     desc 'build', 'build docker image'
     def build
-      docker_local_build
-      # docker_argus_build
+      docker_build
     end
 
     desc 'login', 'login to registry'
@@ -103,4 +79,4 @@ module Stax
     end
 
   end
-end
+end

data/lib/stax/mixin/codebuild.rb

@@ -14,6 +14,7 @@ module Stax
     def stack_project_names
       @_stack_project_names ||= stack_projects.map(&:physical_resource_id)
     end
+
   end
 
   module Cmd
@@ -34,6 +35,17 @@ module Stax
           status = p.phase_status || (p.phase_type == 'COMPLETED' ? '' : 'in progress')
           puts "%-16s  %-12s  %4s  %s" % [p.phase_type, color(status, COLORS), duration, p.end_time]
         end
+
+        ## latest run id for a build project
+        def latest_run(name)
+          Aws::Codebuild.builds_for_project(name, 1).first
+        end
+
+        ## aws console link to latest project run
+        def latest_run_link(name)
+          id = latest_run(name)
+          "https://console.aws.amazon.com/codesuite/codebuild/#{aws_account_id}/projects/#{name}/build/#{id}/?region=#{aws_region}"
+        end
       end
 
       desc 'projects', 'list projects'
@@ -118,6 +130,20 @@ module Stax
         tail build.id
       end
 
+      desc 'link', 'link to latest run for builds'
+      def link
+        my.stack_project_names.map do |name|
+          puts latest_run_link(name)
+        end
+      end
+
+      desc 'open', 'open latest run in aws console'
+      def open
+        my.stack_project_names.map do |name|
+          os_open(latest_run_link(name))
+        end
+      end
+
     end
   end
-end
+end

data/lib/stax/mixin/codepipeline.rb

@@ -14,6 +14,12 @@ module Stax
     def stack_pipeline_names
       @_stack_pipeline_names ||= stack_pipelines.map(&:physical_resource_id)
     end
+
+    ## get status string for n-th pipeline
+    def stack_pipeline_status(n = 0)
+      name = stack_pipeline_names[n]
+      Aws::Codepipeline.executions(name, 1)&.first&.status
+    end
   end
 
   module Cmd
@@ -29,6 +35,12 @@ module Stax
         disabled:  :red,
       }
 
+      no_commands do
+        def pipeline_link(name)
+          "https://console.aws.amazon.com/codesuite/codepipeline/pipelines/#{name}/view?region=#{aws_region}"
+        end
+      end
+
       desc 'stages', 'list pipeline stages'
       def stages
         my.stack_pipeline_names.each do |name|
@@ -54,6 +66,14 @@ module Stax
         end
       end
 
+      ## print status as one of InProgress, Stopped, Stopping, Succeeded, Superseded, Failed
+      desc 'status', 'pipeline execution status'
+      def status
+        s = my.stack_pipeline_status
+        puts(s)
+        exit(1) if s == 'Failed'
+      end
+
       desc 'state', 'pipeline state'
       def state
         my.stack_pipeline_names.each do |name|
@@ -187,6 +207,20 @@ module Stax
         end
       end
 
+      desc 'link', 'link to pipelines in aws console'
+      def link
+        my.stack_pipeline_names.each do |name|
+          puts pipeline_link(name)
+        end
+      end
+
+      desc 'open', 'open pipelines in aws console'
+      def open
+        my.stack_pipeline_names.each do |name|
+          os_open(pipeline_link(name))
+        end
+      end
+
     end
   end
 end

data/lib/stax/stack/changeset.rb

@@ -71,11 +71,15 @@ module Stax
       end
 
       def change_set_unlock
-        Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy_during_update)
+        unless stack_policy_during_update.nil?
+          Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy_during_update)
+        end
       end
 
       def change_set_lock
-        Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy)
+        unless stack_policy.nil?
+          Aws::Cfn.set_policy(stack_name: stack_name, stack_policy_body: stack_policy)
+        end
       end
     end
 
@@ -91,4 +95,4 @@ module Stax
     end
 
   end
-end
+end

data/lib/stax/stack/crud.rb

@@ -24,28 +24,31 @@ module Stax
         }
       end
 
-      ## policy to lock the stack to all updates
+      ## policy to lock the stack to all updates, for example:
+      ## {
+      ##   Statement: [
+      ##     Effect:    'Deny',
+      ##     Action:    'Update:*',
+      ##     Principal: '*',
+      ##     Resource:  '*'
+      ##   ]
+      ## }.to_json
       def stack_policy
-        {
-          Statement: [
-            Effect:    'Deny',
-            Action:    'Update:*',
-            Principal: '*',
-            Resource:  '*'
-          ]
-        }.to_json
+        nil
       end
 
-      ## temporary policy during updates; modify this to restrict resources
+      ## tmp policy during updates, in case a deny was set in stack_policy()
+      ## for example:
+      ## {
+      ##   Statement: [
+      ##     Effect:    'Allow',
+      ##     Action:    'Update:*',
+      ##     Principal: '*',
+      ##     Resource:  '*'
+      ##   ]
+      ## }.to_json
       def stack_policy_during_update
-        {
-          Statement: [
-            Effect:    'Allow',
-            Action:    'Update:*',
-            Principal: '*',
-            Resource:  '*'
-          ]
-        }.to_json
+        nil
       end
 
       ## cleanup sometimes needs to wait
@@ -206,11 +209,12 @@ module Stax
     end
 
     desc 'delete', 'delete stack'
+    method_option :notail, aliases: '-n', type: :boolean, default: false, description: 'do not tail stack events'
     def delete
       delete_warn_imports
       if yes? "Really delete stack #{stack_name}?", :yellow
         Aws::Cfn.delete(stack_name)
-        tail
+        tail unless options[:notail]
       end
     rescue ::Aws::CloudFormation::Errors::ValidationError => e
       fail_task(e.message)

data/lib/stax/staxfile.rb

@@ -1,6 +1,7 @@
 module Stax
   @@_root_path = nil
   @@_stack_list = []
+  @@_command_list = []
 
   ## the stax root is defined as location of Staxfile
   def self.root_path
@@ -12,6 +13,11 @@ module Stax
     @@_stack_list
   end
 
+  ## list of commands defined in Staxfile
+  def self.command_list
+    @@_command_list
+  end
+
   ## search up the dir tree for nearest Staxfile
   def self.find_staxfile
     Pathname.pwd.ascend do |path|
@@ -24,6 +30,7 @@ module Stax
     if root_path
       load(root_path.join('Staxfile'))
       require_stacks
+      require_commands
     end
   end
 
@@ -35,6 +42,14 @@ module Stax
     end
   end
 
+  ## auto-require any command lib files
+  def self.require_commands
+    command_list.each do |command|
+      f = root_path.join('lib', "#{command}.rb")
+      require(f) if File.exist?(f)
+    end
+  end
+
   ## add a stack by name, creates class as needed
   def self.add_stack(name, opt = {})
     @@_stack_list << name
@@ -64,9 +79,14 @@ module Stax
   end
 
   ## add a non-stack command at top level
-  def self.add_command(name, klass)
+  def self.add_command(name, klass = nil)
+    @@_command_list << name
+
+    ## class defaults to eg Stax::Name::Cmd
+    klass ||= self.const_get(name.to_s.split(/[_-]/).map(&:capitalize).join + '::Cmd')
+
     Cli.desc(name, "#{name} commands")
     Cli.subcommand(name, klass)
   end
 
-end
+end

data/lib/stax/version.rb

@@ -1,3 +1,3 @@
 module Stax
-  VERSION = '0.1.3'
+  VERSION = '0.1.7'
 end

data/stax.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "docile", "1.2.0"
   spec.add_development_dependency "stax-examples"
 
   spec.add_dependency('aws-sdk-cloudformation')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stax
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - Richard Lister
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: docile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: stax-examples
   requirement: !ruby/object:Gem::Requirement
@@ -624,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Control Cloudformation stack and other stuff.