refactor!: move actions up to project root

BREAKING CHANGE action path has been changed to remove `packages/`
clowdhaus · Sep 24, 2020 · 7739e2e · 7739e2e
1 parent 6595627
commit 7739e2e
Show file tree

Hide file tree

Showing 35 changed files with 83 additions and 66 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -13,21 +13,21 @@
 
 Collection of GitHub actions for interacting with AWS services.
 
-| Action                                                                                                      | Local Action Tests                                                                                                      |
-| ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
-| [`clowdhaus/aws-github-actions/packages/awscli@master`](../packages/awscli)                                 | ![AWS Command Line Interface](https://github.com/clowdhaus/aws-github-actions/workflows/awscli/badge.svg)               |
-| [`clowdhaus/aws-github-actions/packages/cloudfront_invalidate@master`](../packages/cloudfront_invalidate)   | ![CloudFront Invalidate](https://github.com/clowdhaus/aws-github-actions/workflows/CloudFront%20Invalidation/badge.svg) |
-| [`clowdhaus/aws-github-actions/packages/iam_access_credentials@master`](../packages/iam_access_credentials) | ![IAM Access Credentials](https://github.com/clowdhaus/aws-github-actions/workflows/IAM%20Credentials/badge.svg)        |
-| [`clowdhaus/aws-github-actions/packages/s3_sync@master`](../packages/s3_sync)                               | ![S3 Sync](https://github.com/clowdhaus/aws-github-actions/workflows/S3%20Sync/badge.svg)                               |
+| Action                                                                                    | Local Action Tests                                                                                                      |
+| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- |
+| [`clowdhaus/aws-github-actions/awscli@master`](../awscli)                                 | ![AWS Command Line Interface](https://github.com/clowdhaus/aws-github-actions/workflows/awscli/badge.svg)               |
+| [`clowdhaus/aws-github-actions/cloudfront_invalidate@master`](../cloudfront_invalidate)   | ![CloudFront Invalidate](https://github.com/clowdhaus/aws-github-actions/workflows/CloudFront%20Invalidation/badge.svg) |
+| [`clowdhaus/aws-github-actions/iam_access_credentials@master`](../iam_access_credentials) | ![IAM Access Credentials](https://github.com/clowdhaus/aws-github-actions/workflows/IAM%20Credentials/badge.svg)        |
+| [`clowdhaus/aws-github-actions/s3_sync@master`](../s3_sync)                               | ![S3 Sync](https://github.com/clowdhaus/aws-github-actions/workflows/S3%20Sync/badge.svg)                               |
 
 ## Usage
 
 See individual action directory for details on usage and examples.
 
-- [AWS Command Line Interface](../packages/awscli) - execute awscli commands
-- [CloudFront Invalidate](../packages/cloudfront_invalidate) - invalidate AWS CloudFront distribution to force cache refresh
-- [IAM Access Credentials](../packages/iam_access_credentials) - ensure GitHub actions workflow environment has necessary AWS IAM credentials available for subsequent AWS actions
-- [S3 Sync](../packages/s3_sync) - synchronize local files to remote AWS S3 bucket
+- [AWS Command Line Interface](../awscli) - execute awscli commands
+- [CloudFront Invalidate](../cloudfront_invalidate) - invalidate AWS CloudFront distribution to force cache refresh
+- [IAM Access Credentials](../iam_access_credentials) - ensure GitHub actions workflow environment has necessary AWS IAM credentials available for subsequent AWS actions
+- [S3 Sync](../s3_sync) - synchronize local files to remote AWS S3 bucket
 
 ## Getting Started
 
@@ -50,7 +50,7 @@ See [here](https://yarnpkg.com/en/docs/install#debian-stable) for instructions o
 
 `lerna` is used to managed the project as a monorepo - where each action is packaged and managed individually, and some packages are internal modules shared across the actions.
 
-To install  locally on your machine, it is recommended to install globally via npm or yarn:
+To install locally on your machine, it is recommended to install globally via npm or yarn:
 
 ```bash
 $ npm install lerna --globally

diff --git a/.github/workflows/awscli.yml b/.github/workflows/awscli.yml
@@ -5,16 +5,9 @@ on:
     branches:
       - master
     paths:
-      - 'packages/awscli/**'
+      - 'awscli/**'
       - 'packages/awscli-core/**'
       - 'package.json'
-  # pull_request:
-  #   branches:
-  #     - master
-  #   paths:
-  #     - 'packages/awscli/**'
-  #     - 'packages/awscli-core/**'
-  #     - 'package.json'
 
 jobs:
   awscli:
@@ -27,29 +20,29 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Configure AWS Credentials
-        uses: ./packages/iam_access_credentials
+        uses: ./iam_access_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
       - name: List us-east-1 DHCP option set values w/ default json output
-        uses: ./packages/awscli
+        uses: ./awscli
         with:
           cli-command: ec2
           cli-subcommand: describe-dhcp-options
           cli-parameters: --query DhcpOptions[0].DhcpConfigurations[*].Values[0].Value
           aws-region: us-east-1
       - name: Get network interface subnet ID
         id: net-int-subnet-id
-        uses: ./packages/awscli
+        uses: ./awscli
         with:
           cli-command: ec2
           cli-subcommand: describe-network-interfaces
           cli-options: --output text
           cli-parameters: --query NetworkInterfaces[0].SubnetId
           aws-region: us-east-1
       - name: Describe interface subnet ID
-        uses: ./packages/awscli
+        uses: ./awscli
         env:
           ACTIONS_RUNNER_DEBUG: true
         with:

diff --git a/.github/workflows/cloudfront_invalidate.yml b/.github/workflows/cloudfront_invalidate.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
     paths:
-      - 'packages/cloudfront_invalidate/**'
+      - 'cloudfront_invalidate/**'
       - 'package.json'
 
 jobs:
@@ -16,13 +16,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Configure AWS Credentials
-        uses: ./packages/iam_access_credentials
+        uses: ./iam_access_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
       - name: CloudFront invalidation
-        uses: ./packages/cloudfront_invalidate
+        uses: ./cloudfront_invalidate
         with:
           distribution-id: EMKUWBIVAK6PF
           paths: |

diff --git a/.github/workflows/iam_access_credentials.yaml b/.github/workflows/iam_access_credentials.yaml
@@ -5,14 +5,8 @@ on:
     branches:
       - master
     paths:
-      - 'packages/iam_access_credentials/**'
+      - 'iam_access_credentials/**'
       - 'package.json'
-  # pull_request:
-  #   branches:
-  #     - master
-  #   paths:
-  #     - 'packages/iam_access_credentials/**'
-  #     - 'package.json'
 
 jobs:
   s3-sync:
@@ -25,7 +19,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Configure AWS Credentials
-        uses: ./packages/iam_access_credentials
+        uses: ./iam_access_credentials
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,33 @@
+name: release
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'awscli/**'
+      - 'cloudfront_invalidate/**'
+      - 'iam_access_credentials/**'
+      - 'pacakges/**'
+      - 's3_sync/**'
+      - 'package.json'
+
+jobs:
+  prTitle:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2-beta
+        with:
+          node-version: '12'
+      - run: yarn install
+      - run: yarn run build
+      - run: yarn run release
+        env:
+          GIT_AUTHOR_NAME: claus-cli
+          GIT_COMMITTER_NAME: claus-cli
+          GIT_AUTHOR_EMAIL: ${{ secrets.EMAIL }}
+          GIT_COMMITTER_EMAIL: ${{ secrets.EMAIL }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/s3_sync.yml b/.github/workflows/s3_sync.yml
@@ -5,16 +5,9 @@ on:
     branches:
       - master
     paths:
-      - 'packages/s3_sync/**'
+      - 's3_sync/**'
       - 'packages/awscli-core/**'
       - 'package.json'
-  # pull_request:
-  #   branches:
-  #     - master
-  #   paths:
-  #     - 'packages/s3_sync/**'
-  #     - 'packages/awscli-core/**'
-  #     - 'package.json'
 
 jobs:
   s3-sync:
@@ -27,15 +20,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Configure AWS Credentials
-        uses: ./packages/iam_access_credentials
+        uses: ./iam_access_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
       - name: Sync to S3
-        uses: ./packages/s3_sync
+        uses: ./s3_sync
         with:
-          local-path: packages/s3_sync/dist
+          local-path: s3_sync/dist
           bucket-name: github-actions-028920223318-us-east-1
           path-prefix: my/new/prefix
           args: --delete
diff --git a/packages/awscli/CHANGELOG.md → awscli/CHANGELOG.md b/packages/awscli/CHANGELOG.md → awscli/CHANGELOG.md
diff --git a/packages/awscli/README.md → awscli/README.md b/packages/awscli/README.md → awscli/README.md
@@ -16,7 +16,7 @@ Reference - https://docs.aws.amazon.com/cli/latest/reference/index.html#cli-aws
 ## Usage
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/awscli@v0.4
+- uses: clowdhaus/aws-github-actions/awscli@master
   with:
     # Command passed to awscli, which is infact the service that is the target of
     # your invocation <i.e. - ec2, s3, ebs, etc.>
@@ -47,7 +47,7 @@ Reference - https://docs.aws.amazon.com/cli/latest/reference/index.html#cli-aws
 ### Execute describe style command with standard json result output
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/awscli@v0.4
+- uses: clowdhaus/aws-github-actions/awscli@master
   with:
     cli-command: ec2
     cli-subcommand: describe-dhcp-options
@@ -57,7 +57,7 @@ Reference - https://docs.aws.amazon.com/cli/latest/reference/index.html#cli-aws
 ### Execute describe style command with query and text output
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/awscli@v0.4
+- uses: clowdhaus/aws-github-actions/awscli@master
   with:
     cli-command: ec2
     cli-subcommand: describe-network-interfaces
@@ -69,7 +69,7 @@ Reference - https://docs.aws.amazon.com/cli/latest/reference/index.html#cli-aws
 ### Execute describe style command using output from a prior describe command of ID `net-int-subnet-id`
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/awscli@v0.4
+- uses: clowdhaus/aws-github-actions/awscli@master
   env:
     ACTIONS_RUNNER_DEBUG: true
   with:

diff --git a/packages/awscli/action.yml → awscli/action.yml b/packages/awscli/action.yml → awscli/action.yml
diff --git a/awscli/dist/index.js b/awscli/dist/index.js
diff --git a/packages/awscli/index.ts → awscli/index.ts b/packages/awscli/index.ts → awscli/index.ts
diff --git a/packages/awscli/package.json → awscli/package.json b/packages/awscli/package.json → awscli/package.json
diff --git a/packages/cloudfront_invalidate/CHANGELOG.md → cloudfront_invalidate/CHANGELOG.md b/packages/cloudfront_invalidate/CHANGELOG.md → cloudfront_invalidate/CHANGELOG.md
diff --git a/packages/cloudfront_invalidate/README.md → cloudfront_invalidate/README.md b/packages/cloudfront_invalidate/README.md → cloudfront_invalidate/README.md
@@ -13,7 +13,7 @@ The `cloudfront_invalidate` GitHub action creates an invalidation request for an
 ## Usage
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/cloudfront_invalidate@v0.4
+- uses: clowdhaus/aws-github-actions/cloudfront_invalidate@master
   with:
     # The CloudFront distribution ID
     # Required: true
@@ -39,15 +39,15 @@ The `cloudfront_invalidate` GitHub action creates an invalidation request for an
 ### Invalidate entire distribution
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/cloudfront_invalidate@v0.4
+- uses: clowdhaus/aws-github-actions/cloudfront_invalidate@master
   with:
     distribution-id: E323PSTTFMI4A7
 ```
 
 ### Invalidate multiple paths
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/cloudfront_invalidate@v0.4
+- uses: clowdhaus/aws-github-actions/cloudfront_invalidate@master
   with:
     distribution-id: E323PSTTFMI4A7
     paths: |

diff --git a/packages/cloudfront_invalidate/action.yml → cloudfront_invalidate/action.yml b/packages/cloudfront_invalidate/action.yml → cloudfront_invalidate/action.yml
diff --git a/cloudfront_invalidate/dist/index.js b/cloudfront_invalidate/dist/index.js
diff --git a/packages/cloudfront_invalidate/index.ts → cloudfront_invalidate/index.ts b/packages/cloudfront_invalidate/index.ts → cloudfront_invalidate/index.ts
diff --git a/packages/cloudfront_invalidate/package.json → cloudfront_invalidate/package.json b/packages/cloudfront_invalidate/package.json → cloudfront_invalidate/package.json
diff --git a/packages/iam_access_credentials/CHANGELOG.md → iam_access_credentials/CHANGELOG.md b/packages/iam_access_credentials/CHANGELOG.md → iam_access_credentials/CHANGELOG.md
diff --git a/packages/iam_access_credentials/README.md → iam_access_credentials/README.md b/packages/iam_access_credentials/README.md → iam_access_credentials/README.md
@@ -13,7 +13,7 @@ The `iam_access_credentials` GitHub action will configure the workflow environme
 ## Usage
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/iam_access_credentials@v0.4
+- uses: clowdhaus/aws-github-actions/iam_access_credentials@master
   with:
     # AWS Region to send the request to. If defined, this environment variable overrides
     # the value for the profile setting region
@@ -62,7 +62,7 @@ The `iam_access_credentials` GitHub action will configure the workflow environme
 ### Standard setup of access credentials from GitHub secrets
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/iam_access_credentials@v0.4
+- uses: clowdhaus/aws-github-actions/iam_access_credentials@master
   with:
     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -72,7 +72,7 @@ The `iam_access_credentials` GitHub action will configure the workflow environme
 ### Use credentials from assumed IAM role
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/s3_sync@v0.4
+- uses: clowdhaus/aws-github-actions/s3_sync@master
   with:
     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -84,7 +84,7 @@ The `iam_access_credentials` GitHub action will configure the workflow environme
 ### Use credentials from assumed IAM role with external ID
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/s3_sync@v0.4
+- uses: clowdhaus/aws-github-actions/s3_sync@master
   with:
     aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
     aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/packages/iam_access_credentials/action.yml → iam_access_credentials/action.yml b/packages/iam_access_credentials/action.yml → iam_access_credentials/action.yml
diff --git a/iam_access_credentials/dist/index.js b/iam_access_credentials/dist/index.js
diff --git a/packages/iam_access_credentials/index.ts → iam_access_credentials/index.ts b/packages/iam_access_credentials/index.ts → iam_access_credentials/index.ts
diff --git a/packages/iam_access_credentials/package.json → iam_access_credentials/package.json b/packages/iam_access_credentials/package.json → iam_access_credentials/package.json
diff --git a/package.json b/package.json
@@ -21,7 +21,11 @@
   "homepage": "https://github.com/clowdhaus/aws-github-actions#readme",
   "private": true,
   "workspaces": [
-    "packages/*"
+    "awscli",
+    "cloudfront_invalidate",
+    "iam_access_credentials",
+    "packages/*",
+    "s3_sync"
   ],
   "scripts": {
     "build": "lerna run build && lerna run compile",

diff --git a/packages/awscli/dist/index.js b/packages/awscli/dist/index.js
diff --git a/packages/cloudfront_invalidate/dist/index.js b/packages/cloudfront_invalidate/dist/index.js
diff --git a/packages/iam_access_credentials/dist/index.js b/packages/iam_access_credentials/dist/index.js
diff --git a/packages/s3_sync/dist/index.js b/packages/s3_sync/dist/index.js
diff --git a/packages/s3_sync/CHANGELOG.md → s3_sync/CHANGELOG.md b/packages/s3_sync/CHANGELOG.md → s3_sync/CHANGELOG.md
diff --git a/packages/s3_sync/README.md → s3_sync/README.md b/packages/s3_sync/README.md → s3_sync/README.md
@@ -15,7 +15,7 @@ Note: The sync action works on directories only, not individual files, and can b
 ## Usage
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/s3_sync@v0.4
+- uses: clowdhaus/aws-github-actions/s3_sync@master
   with:
     # Path to local directory to synchronize, starting from project root directory
     # Required: true
@@ -42,7 +42,7 @@ Note: The sync action works on directories only, not individual files, and can b
 ### Sync to root of S3 bucket
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/s3_sync@v0.4
+- uses: clowdhaus/aws-github-actions/s3_sync@master
   with:
     local-path: dist/
     bucket-name: my-s3-bucket
@@ -51,7 +51,7 @@ Note: The sync action works on directories only, not individual files, and can b
 ### Sync to S3 bucket prefix
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/s3_sync@v0.4
+- uses: clowdhaus/aws-github-actions/s3_sync@master
   with:
     local-path: dist/
     bucket-name: my-s3-bucket
@@ -61,7 +61,7 @@ Note: The sync action works on directories only, not individual files, and can b
 ### Sync to S3 bucket prefix & delete files not in source
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/s3_sync@v0.4
+- uses: clowdhaus/aws-github-actions/s3_sync@master
   with:
     local-path: dist/
     bucket-name: my-s3-bucket
@@ -75,7 +75,7 @@ Only syncs `*.js` files in `dist/` directory and delete those no longer found fr
 Note: order of args dictates precedence - see [documentation](https://docs.aws.amazon.com/cli/latest/reference/s3/index.html#use-of-exclude-and-include-filters)
 
 ```yml
-- uses: clowdhaus/aws-github-actions/packages/s3_sync@v0.4
+- uses: clowdhaus/aws-github-actions/s3_sync@master
   with:
     local-path: dist/
     bucket-name: my-s3-bucket

diff --git a/packages/s3_sync/action.yml → s3_sync/action.yml b/packages/s3_sync/action.yml → s3_sync/action.yml
diff --git a/s3_sync/dist/index.js b/s3_sync/dist/index.js
diff --git a/packages/s3_sync/index.ts → s3_sync/index.ts b/packages/s3_sync/index.ts → s3_sync/index.ts
diff --git a/packages/s3_sync/package.json → s3_sync/package.json b/packages/s3_sync/package.json → s3_sync/package.json