@fishawack/lab-env 4.35.2 → 4.37.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 ## Changelog
 
+### 4.37.0 (2024-10-22)
+
+#### Features
+
+* added fullstack permission type that attaches eb permissions ([f98ccaa](https://bitbucket.org/fishawackdigital/lab-env/commits/f98ccaa600f6417e1bf0764ea45f2c512c438ecd))
+* permissions now accepted for IAM users to narrow down access ([507eceb](https://bitbucket.org/fishawackdigital/lab-env/commits/507ecebbabd2feb2d9ced604975a5f86ca9c1aaa))
+
+#### Build Updates
+
+* bumped nodemailer to fix punycode deprecation warning ([db4fd29](https://bitbucket.org/fishawackdigital/lab-env/commits/db4fd294fc39e0455e30319f796f3813f65c2bdc))
+* **core/1:** Bumped lab-env-core-1 ([6d706a9](https://bitbucket.org/fishawackdigital/lab-env/commits/6d706a95e09d75de8758a5b8703056ace009191e))
+
+### 4.36.0 (2024-10-08)
+
+#### Features
+
+* content command now has init flag which returns s3 auto content config ([342c433](https://bitbucket.org/fishawackdigital/lab-env/commits/342c43301c92a2840125e28608450faa9540a226))
+
+#### Build Updates
+
+* add scope to pull request against aws-runner ([325e84a](https://bitbucket.org/fishawackdigital/lab-env/commits/325e84a10974c56700c51eaebf2b2b3c4d3e635d))
+* **core/1:** Bumped lab-env-core-1 ([2c7c446](https://bitbucket.org/fishawackdigital/lab-env/commits/2c7c446164ba9f52f509590c21a60ce7619cfd0e))
+* **core/1:** Bumped lab-env-core-1 ([de4a471](https://bitbucket.org/fishawackdigital/lab-env/commits/de4a471e23a088740ffc9eceef7473483fafae44))
+* only release on fix, feat and build updates ([9e8feb5](https://bitbucket.org/fishawackdigital/lab-env/commits/9e8feb5c9594fee29f21b721491d26b396534b44))
+
 ### 4.35.2 (2024-10-02)
 
 #### Build Updates

package/bitbucket-pipelines.yml

@@ -72,7 +72,7 @@ pipelines:
             - sed -i -e "s/\(@fishawack\/lab-env@\).*/\1$(git ls-remote --tags --refs --sort="v:refname" https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME | tail -n1 | sed 's/.*\///')/g" Dockerfile
             - git add .
             - |
-              git commit --allow-empty -m "build: Bumped $BITBUCKET_REPO_SLUG"
+              git commit --allow-empty -m "build($BITBUCKET_REPO_SLUG): Bumped $BITBUCKET_REPO_SLUG"
             - git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
             - |
               curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/aws-runner/pullrequests \

package/commands/content.js

@@ -1,8 +1,29 @@
+const execSync = require('child_process').execSync;
+const utilities = require('./create/libs/utilities');
 const _ = require('../globals.js');
 
 module.exports = [
     'content', 
     'pulls any external content and assets into the repo', 
-    yargs => {}, 
-    argv => _.command("core", `npm run content`)
+    yargs => {
+        yargs.option('init', {
+                alias: 'i',
+                describe: 'Returns config for s3 content folder',
+                type: 'boolean'
+            });
+    }, 
+    argv => {
+        if(argv.init){
+            const stringify = JSON.stringify({
+                "aws-s3": "fishawack",
+                "location": `fw-auto-content/${_.repo_safe}`,
+                "key": `fw-s3-${_.repo_safe}`,
+                "sync": true
+            }, null, 4);
+            execSync(`printf '${stringify}' | pbcopy`);
+            console.log(utilities.colorize(`\n${stringify}\n\n(copied to clipboard)`, 'title'));
+        } else {
+            _.command("core", `npm run content`)
+        }
+    }
 ];

package/commands/create/cmds/key.js

@@ -85,7 +85,7 @@ module.exports = [
                     credentials[user] = {};
                 }
 
-                let res = await aws.iam.createFWIAMUser(`fw-automation-${user}`, client);
+                let res = await aws.iam.createFWIAMUser(`fw-automation-${user}`, client, _.config.users.find(d => d.username === user).permissions);
 
                 credentials[user][client] = {
                     key: res.AccessKey && res.AccessKey.AccessKeyId || res.AccessKeyMetadata[0].AccessKeyId,

package/commands/create/services/aws/iam.js

@@ -24,10 +24,10 @@ module.exports.createIAMUser = async (UserName, account, tags = []) => {
     return res;
 };
 
-module.exports.createFWIAMUser = async (UserName, account) => {
+module.exports.createFWIAMUser = async (UserName, account, permissions) => {
     await module.exports.createIAMUser(UserName, account);
 
-    await module.exports.syncFWIAMPolicies(UserName, account);
+    await module.exports.syncFWIAMPolicies(UserName, account, permissions);
 
     let res = await module.exports.createAccessKeySafe(UserName, account);
 
@@ -73,10 +73,20 @@ module.exports.attachIAMPolicy = async (UserName, account, policy) => {
     return res;
 };
 
-module.exports.syncFWIAMPolicies = async (UserName, account) => {
+module.exports.syncFWIAMPolicies = async (UserName, account, permissions = ["auto-content", "deploy-static"]) => {
     await module.exports.removeAllIAMPolicies(UserName, account);
-    await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/AmazonS3FullAccess');
-    await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/CloudFrontFullAccess');
+
+    if(permissions.includes("auto-content") || permissions.includes("deploy-static")){
+        await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/AmazonS3FullAccess');
+    }
+
+    if(permissions.includes("deploy-static")){
+        await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/CloudFrontFullAccess');
+    }
+    
+    if(permissions.includes("deploy-fullstack")){
+        await module.exports.attachIAMPolicy(UserName, account, 'arn:aws:iam::aws:policy/AdministratorAccess-AWSElasticBeanstalk');
+    }
 };
 
 module.exports.removeIAMPolicy = async (UserName, account, policy) => {

package/core/1/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Changelog
 
+### 1.6.0 (2024-10-22)
+
+#### Features
+
+* own global node_modules folder so local modules can be linked ([82f84fa](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/82f84faa5dfa7c009458bec4fe3a9f2b437c34bf))
+
+### 1.5.2 (2024-10-08)
+
+#### Bug Fixes
+
+* rclone in alpine image and aws sdk back in full image as rclone used for s3 content ([9e68463](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/9e684631bb83c105aa9e5407e8fee30a788309cd))
+
+### 1.5.1 (2024-10-07)
+
+#### Bug Fixes
+
+* move aws from full image to alpine now that s3 content requests are supported ([a947817](https://bitbucket.org/fishawackdigital/lab-env-core-1/commits/a94781756ea482545b63018e72ab30ce25727af9))
+
 ### 1.5.0 (2024-10-01)
 
 #### Features

package/core/1/Dockerfile

@@ -58,6 +58,9 @@ RUN npm install git-branch -g
 # Link root global node_modules to ~/.node_modules
 RUN ln -s /usr/local/lib/node_modules/ /home/node/.node_modules
 
+# Install rclone
+RUN curl https://rclone.org/install.sh | bash
+
 # Cleanup apt-get install folders
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

package/core/1/bitbucket-pipelines.yml

@@ -15,14 +15,15 @@ pipelines:
             - production
           size: 4x
           script:
+            # Install release deps
+            - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
+            # Release version via node so can exit out when no release made
+            - |
+              node -e "const spawn = require('child_process').spawn('semantic-release', ['--repositoryUrl', 'https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME'], { env: { ...process.env, FORCE_COLOR: true } }); spawn.stderr.on('data', d => process.stderr.write(d.toString())); spawn.stdout.on('data', d => {process.stdout.write(d.toString()); if(d.toString().includes('There are no relevant changes, so no new version is released.') || d.toString().includes('therefore a new version won\'t be published.')){process.exit(1);}})" || exit 0
             # Copy ssh keys so physical files exist for agent to use
             - cp /build/*/ssh/* ~/.ssh/
             # Start ssh agent and add all (if any) keys
             - eval `ssh-agent` && ssh-add || true
-            # Install release deps
-            - npm install -g semantic-release@24 @semantic-release/changelog@6 @semantic-release/git@10 conventional-changelog-conventionalcommits@8
-            # Release version
-            - semantic-release --repositoryUrl=https://$GIT_CREDENTIALS@bitbucket.org/$BITBUCKET_REPO_FULL_NAME
             # Publish docker image
             - docker login $DOCKER_CREDENTIALS && docker buildx create --use && npm run image
             # Sync development after publish
@@ -38,7 +39,7 @@ pipelines:
             - git submodule update --remote --merge core/1
             - git add .
             - |
-              git commit --allow-empty -m "build: Bumped $BITBUCKET_REPO_SLUG"
+              git commit --allow-empty -m "build(core/1): Bumped $BITBUCKET_REPO_SLUG"
             - git push origin "$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT"
             - |
               curl https://api.bitbucket.org/2.0/repositories/fishawackdigital/lab-env/pullrequests \
@@ -56,6 +57,11 @@ pipelines:
                       \"name\": \"$BITBUCKET_REPO_SLUG-$BITBUCKET_COMMIT\"
                     }
                   },
+                  \"reviewers\": [
+                      {
+                          \"uuid\": \"{2518e4c3-fc1d-4653-b355-c00be099ce6c}\"
+                      }
+                  ],
                   \"close_source_branch\": true
                 }"
           services:

package/core/1/entrypoint.sh

@@ -8,6 +8,9 @@ if [ -z "$FW_ROOT" ]; then
     # Own the node_modules folder otherwise it'll be owned by root/previous node id which will prevent writing
     chown node /app/node_modules
 
+    # Own the global node_modules folder otherwise it'll be owned by root/previous node id which will prevent writing
+    chown node /usr/local/lib/node_modules
+
     # Default arguments will always be bash -l, if nothing follows this just start an non login interactive shell
     if [ -z "${@:3}" ]; then
         exec su node

package/core/1/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "lab-env docker config for the @fishawack/core/1 npm module",
   "scripts": {
     "image": "docker buildx build --ssh default --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1:$npm_package_version -t fishawack/lab-env-core-1:latest --push . && docker buildx build --ssh default --target alpine --platform linux/amd64,linux/arm64 -t fishawack/lab-env-core-1-alpine:$npm_package_version -t fishawack/lab-env-core-1-alpine:latest --push ."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.35.2",
+  "version": "4.37.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "glob": "7.1.7",
     "inquirer": "8.1.2",
     "lodash": "^4.17.21",
-    "nodemailer": "^6.7.8",
+    "nodemailer": "^6.9.15",
     "ora": "5.4.1",
     "semver": "7.3.4",
     "update-notifier": "^6.0.2",
@@ -60,22 +60,6 @@
             {
               "type": "build",
               "release": "patch"
-            },
-            {
-              "type": "perf",
-              "release": "patch"
-            },
-            {
-              "type": "ci",
-              "release": "patch"
-            },
-            {
-              "type": "refactor",
-              "release": "patch"
-            },
-            {
-              "type": "style",
-              "release": "patch"
             }
           ]
         }
@@ -102,22 +86,6 @@
               {
                 "type": "build",
                 "section": "Build Updates"
-              },
-              {
-                "type": "perf",
-                "section": "Performance Improvements"
-              },
-              {
-                "type": "ci",
-                "section": "CI/CD updates"
-              },
-              {
-                "type": "refactor",
-                "section": "Code Refactors"
-              },
-              {
-                "type": "style",
-                "section": "Style Updates"
               }
             ]
           }