uc3-sam-sceptre 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7d0e753bbcbfc977d046ad6beee0d8837459749b24c4518b4071e653c2b2d0
-  data.tar.gz: bf7717c153cc8414bab7e6a79fdf21759358e906525e69823d7a3cbace98f1b3
+  metadata.gz: 64fdd8ce5b3381224cc3d9599724258ef949bf00616ba090f759f3024b021563
+  data.tar.gz: 47cc57eca27a3a792dd370c5d57840ac5356489fa1b1ad7d3d98c9f31143da90
 SHA512:
-  metadata.gz: 11a60179364b3915ada6b464a6fa2fea14bbc1f59d6af4fb4e428b8432b4a0785eb2e739210e0703d59d49c277c4e3fd06a48cca7a2560083e40c14d37c799be
-  data.tar.gz: fbca8e612283e589377a04093427851b2e652403aeb92ce07be76e584ff02fad65ad237007826cbce6ba8cb490fadefca3015d4ca1befd7f87a641a14056a7a8
+  metadata.gz: ae05c6e2581a4d4b81eaff17108646a5b08873a503507f1f88e0dac850853dd191427150c778e929526419ac189ffd8c52b87c707d87978441639cf1bd941054
+  data.tar.gz: 489ff775002d7a6efd27fb1940049226858cb61122c87011ee4e7c542ba14a11d3577171ee872604b6ef7569b5c7ac064452aabb48ff5fcbd4856ce0c15f67bd

data/README.md

@@ -171,7 +171,7 @@ parameters:
 hooks:
   after_create:
     # Build the Lambda code and store in the bucket so it is available downstream
-    - !cmd './templates/lambdas/src/sam_build_deploy.rb'
+    - !cmd './templates/lambdas/src/sam_build_deploy.rb true true'
 ```
 
 ### Examples Ruby scripts:
@@ -181,36 +181,40 @@ The following is an example of deploying to a Lambda that is a Docker image into
 
 require 'uc3-sam-sceptre'
 
-params = {
-  service: 'dmp',
-  subservice: 'hub',
-  git_repo: 'https://github.com/CDLUC3/dmp-hub-cfn',
-  stack_suffix: 'docker-lambdas',
-  admin_email_key: 'AdminEmail',
-
-  ecr_uri_key: 'EcrRepositoryUri',
-
-  fetchable_cf_params: [
-    { stack_export_name: 'VpcId' },
-    { stack_export_name: 'SubnetA' },
-    { stack_export_name: 'SubnetB' },
-    { stack_export_name: 'SubnetC' },
-    { stack_export_name: 'DeadLetterQueueArn' },
-    { stack_export_name: 'LambdaSecGroupId' },
-    { stack_export_name: 'SnsTopicEmailArn', template_param_name: 'SnsEmailTopicArn' }
-    { stack_export_name: 'DomainName' },
-    { stack_export_name: 'RdsHost' },
-    { stack_export_name: 'RdsPort' },
-    { stack_export_name: 'RdsDbName' }
-  ],
-  static_cf_params: [
-    { template_param_name: 'Version', value: 'v0' }
-  ]
-}
-
-proxy = Uc3SamSceptre::Proxy.new(params)
-proxy.build
-proxy.deploy
+if ARGV.length == 2
+  params = {
+    service: 'dmp',
+    subservice: 'hub',
+    git_repo: 'https://github.com/CDLUC3/dmp-hub-cfn',
+    stack_suffix: 'docker-lambdas',
+    admin_email_key: 'AdminEmail',
+
+    ecr_uri_key: 'EcrRepositoryUri',
+
+    fetchable_cf_params: [
+      { stack_export_name: 'VpcId' },
+      { stack_export_name: 'SubnetA' },
+      { stack_export_name: 'SubnetB' },
+      { stack_export_name: 'SubnetC' },
+      { stack_export_name: 'DeadLetterQueueArn' },
+      { stack_export_name: 'LambdaSecGroupId' },
+      { stack_export_name: 'SnsTopicEmailArn', template_param_name: 'SnsEmailTopicArn' },
+      { stack_export_name: 'DomainName' },
+      { stack_export_name: 'RdsHost' },
+      { stack_export_name: 'RdsPort' },
+      { stack_export_name: 'RdsDbName' }
+    ],
+    static_cf_params: [
+      { template_param_name: 'Version', value: 'v0' }
+    ]
+  }
+
+  proxy = Uc3SamSceptre::Proxy.new(params)
+  proxy.build if ARGV[0].to_s.downcase.strip == 'true'
+  proxy.deploy if ARGV[1].to_s.downcase.strip == 'true'
+else
+  p 'Expected 2 arguments: run build? and run deploy? (For example: `ruby sam_build_deploy.rb true true`)'
+end
 ```
 
 The following is an example of deploying a Lambda that is NOT a Docker image into a ZIP archive stored in S3
@@ -219,29 +223,33 @@ The following is an example of deploying a Lambda that is NOT a Docker image int
 
 require 'uc3-sam-sceptre'
 
-params = {
-  service: 'dmp',
-  subservice: 'hub',
-  git_repo: 'https://github.com/CDLUC3/dmp-hub-cfn',
-  ecr_uri_key: 'EcrRepositoryUri',
-  stack_suffix: 'docker-lambdas',
-  admin_email_key: 'AdminEmail',
-
-  s3_arn_key: 'S3PrivateBucketArn',
-
-  fetchable_cf_params: [
-    { stack_export_name: 'CloudFrontDistroId' },
-    { stack_export_name: 'S3PublicBucketArn' },
-    { stack_export_name: 'DynamoTableName' },
-    { stack_export_name: 'SnsTopicEmailArn', template_param_name: 'SnsEmailTopicArn' }
-    { stack_export_name: 'DomainName' }
-  ],
-  static_cf_params: [
-    { template_param_name: 'Version', value: 'v0' }
-  ]
-}
-
-proxy = Uc3SamSceptre::Proxy.new(params)
-proxy.build
-proxy.deploy
+if ARGV.length == 2
+  params = {
+    service: 'dmp',
+    subservice: 'hub',
+    git_repo: 'https://github.com/CDLUC3/dmp-hub-cfn',
+    ecr_uri_key: 'EcrRepositoryUri',
+    stack_suffix: 'docker-lambdas',
+    admin_email_key: 'AdminEmail',
+
+    s3_arn_key: 'S3PrivateBucketArn',
+
+    fetchable_cf_params: [
+      { stack_export_name: 'CloudFrontDistroId' },
+      { stack_export_name: 'S3PublicBucketArn' },
+      { stack_export_name: 'DynamoTableName' },
+      { stack_export_name: 'SnsTopicEmailArn', template_param_name: 'SnsEmailTopicArn' },
+      { stack_export_name: 'DomainName' }
+    ],
+    static_cf_params: [
+      { template_param_name: 'Version', value: 'v0' }
+    ]
+  }
+
+  proxy = Uc3SamSceptre::Proxy.new(params)
+  proxy.build if ARGV[0].to_s.downcase.strip == 'true'
+  proxy.deploy if ARGV[1].to_s.downcase.strip == 'true'
+else
+  p 'Expected 2 arguments: run build? and run deploy? (For example: `ruby sam_build_deploy.rb true true`)'
+end
 ```

data/lib/uc3-sam-sceptre/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3SamSceptre
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/lib/uc3-sam-sceptre.rb

@@ -71,7 +71,7 @@ module Uc3SamSceptre
         "--confirm-changeset #{!@auto}",
         '--capabilities CAPABILITY_NAMED_IAM',
         '--disable-rollback false',
-        "--tags #{_sam_tags(admin_email: _locate_value(key: @admin_email_key)}",
+        "--tags #{_sam_tags(admin_email: _locate_value(key: @admin_email_key))}",
         "--parameter-overrides #{_build_deploy_overrides}"
       ]
       # Add the S3 or ECR details depending on what we're working with

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-sam-sceptre
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Brian Riley
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3cloudformation
+  name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"