declapract-typescript-ehmpathy 0.22.8 → 0.23.0

package/dist/practices/{cicd-integrate → cicd-common}/best-practice/.github/workflows/.test.yml

@@ -6,17 +6,17 @@ on:
       aws-region:
         type: string
         description: the aws region within which we should run the tests
-        required: true
+        required: false
       aws-account-id:
         type: string
         description: the id of the account the credentials are expected to access
-        required: true
+        required: false
     secrets:
       aws-access-key-id:
-        required: true
+        required: false
         description: required credentials to authenticate with aws the aws account against which to run the tests
       aws-secret-access-key:
-        required: true
+        required: false
         description: required credentials to authenticate with aws the aws account against which to run the tests
 
 jobs:
@@ -174,14 +174,16 @@ jobs:
           key: ${{ runner.os }}-node-${{ github.sha }}
 
       - name: configure aws credentials
+        if: "${{ inputs.aws-account-id != '' }}"
         uses: aws-actions/configure-aws-credentials@v1
         id: credentials
         with:
           aws-access-key-id: ${{ secrets.aws-access-key-id }}
           aws-secret-access-key: ${{ secrets.aws-secret-access-key }}
-          aws-region: us-east-1
+          aws-region: ${{ inputs.aws-region }}
 
       - name: confirm aws credentials
+        if: "${{ inputs.aws-account-id != '' }}"
         run: |
           [[ ${{steps.credentials.outputs.aws-account-id}} != ${{ inputs.aws-account-id }} ]] \
             && echo 'wrong aws account' && exit 1 \
@@ -213,14 +215,16 @@ jobs:
           key: ${{ runner.os }}-node-${{ github.sha }}
 
       - name: configure aws credentials
+        if: "${{ inputs.aws-account-id != '' }}"
         uses: aws-actions/configure-aws-credentials@v1
         id: credentials
         with:
           aws-access-key-id: ${{ secrets.aws-access-key-id }}
           aws-secret-access-key: ${{ secrets.aws-secret-access-key }}
-          aws-region: us-east-1
+          aws-region: ${{ inputs.aws-region }}
 
       - name: confirm aws credentials
+        if: "${{ inputs.aws-account-id != '' }}"
         run: |
           [[ ${{steps.credentials.outputs.aws-account-id}} != ${{ inputs.aws-account-id }} ]] \
             && echo 'wrong aws account' && exit 1 \

package/dist/practices/{cicd-deploy-package → cicd-package}/best-practice/.github/workflows/.publish-npm.yml

@@ -12,17 +12,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: read nvmrc
-        id: nvmrc
-        run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
-
-      - name: setup node
-        uses: actions/setup-node@v2
+      - name: set node version
+        uses: actions/setup-node@v3
         with:
-          node-version: ${{ steps.nvmrc.outputs.NODE_VERSION }}
-          registry-url: 'https://registry.npmjs.org'
+          node-version-file: '.nvmrc'
           cache: 'npm'
 
       - name: install

package/dist/practices/cicd-package/best-practice/.github/workflows/publish.yml

@@ -0,0 +1,15 @@
+name: publish
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  test:
+    uses: ./.github/workflows/.test.yml
+
+  publish:
+    uses: ./.github/workflows/.publish-npm.yml
+    secrets:
+      npm-auth-token: ${{ secrets.NPM_TOKEN }}

package/dist/practices/cicd-package/best-practice/.github/workflows/test.yml

@@ -0,0 +1,13 @@
+name: test
+
+on:
+  workflow_call:
+  push:
+    branches-ignore:
+      - 'main' # exclude main branch, since deploy workflow triggers on main, and calls the test workflow inside of it already
+    tags-ignore:
+      - v* # exclude tags, since deploy workflow triggers on tags, and calls the test workflow inside of it already
+
+jobs:
+  suite:
+    uses: ./.github/workflows/.test.yml

package/dist/practices/git/best-practice/.gitignore.declapract.ts

@@ -3,6 +3,7 @@ import expect from 'expect';
 import uniq from 'lodash.uniq';
 
 const expectedIgnores = [
+  '*.log',
   '.artifact', // deployment artifacts from `simple-artifact-builder` are produced here
   '.env',
   '.serverless',

package/dist/practices/terraform/best-practice/provision/aws/product/variables.tf

@@ -12,3 +12,10 @@ locals {
     product     = local.service
   }
 }
+
+data "aws_caller_identity" "current" {}
+data "aws_region" "current" {}
+locals {
+  aws_account_id = data.aws_caller_identity.current.account_id
+  aws_region     = data.aws_region.current.name
+}

package/dist/useCases.yml

@@ -2,7 +2,7 @@
 use-cases:
   typescript-project:
     practices:
-      - cicd-integrate
+      - cicd-common
       - conventional-commits
       - directory-structure-src
       - domain
@@ -22,14 +22,14 @@ use-cases:
     extends:
       - typescript-project
     practices:
-      - cicd-deploy-package
+      - cicd-package
       - node-package
   lambda-service:
     extends:
       - typescript-project
     practices:
       - artifact
-      - cicd-deploy-service
+      - cicd-service
       - config
       - dates-and-times
       - environments-aws

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "declapract-typescript-ehmpathy",
-  "version": "0.22.8",
+  "version": "0.23.0",
   "description": "declapract best practices declarations for typescript",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",

package/dist/practices/cicd-deploy-package/best-practice/.github/workflows/publish.yml

@@ -1,21 +0,0 @@
-name: publish
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  test:
-    uses: ./.github/workflows/.test.yml
-    with:
-      aws-region: us-east-1
-      aws-account-id: '@declapract{variable.awsAccountId.dev}'
-    secrets:
-      aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
-      aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}
-
-  publish:
-    uses: ./.github/workflows/.publish-npm.yml
-    secrets:
-      npm-auth-token: ${{ secrets.NPM_TOKEN }}