declapract-typescript-ehmpathy 0.39.10 → 0.39.12

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

@@ -7,11 +7,10 @@ on:
         type: string
         description: the aws region within which we should run the tests
         required: false
+    secrets:
       aws-account-id:
-        type: string
         description: the id of the account the credentials are expected to access
         required: false
-    secrets:
       aws-access-key-id:
         required: false
         description: required credentials to authenticate with aws the aws account against which to run the tests
@@ -154,7 +153,7 @@ jobs:
           key: ${{ needs.install.outputs.node-modules-cache-key }}
 
       - name: configure aws credentials
-        if: "${{ inputs.aws-account-id != '' }}"
+        if: "${{ inputs.aws-region != '' }}"
         uses: aws-actions/configure-aws-credentials@v1
         id: credentials
         with:
@@ -163,9 +162,9 @@ jobs:
           aws-region: ${{ inputs.aws-region }}
 
       - name: confirm aws credentials
-        if: "${{ inputs.aws-account-id != '' }}"
+        if: "${{ inputs.aws-region != '' }}"
         run: |
-          [[ ${{steps.credentials.outputs.aws-account-id}} != ${{ inputs.aws-account-id }} ]] \
+          [[ ${{steps.credentials.outputs.aws-account-id}} != ${{ secrets.aws-account-id }} ]] \
             && echo 'wrong aws account' && exit 1 \
             || echo 'correct aws account';
 
@@ -194,7 +193,7 @@ jobs:
           key: ${{ needs.install.outputs.node-modules-cache-key }}
 
       - name: configure aws credentials
-        if: "${{ inputs.aws-account-id != '' }}"
+        if: "${{ inputs.aws-region != '' }}"
         uses: aws-actions/configure-aws-credentials@v1
         id: credentials
         with:
@@ -203,9 +202,9 @@ jobs:
           aws-region: ${{ inputs.aws-region }}
 
       - name: confirm aws credentials
-        if: "${{ inputs.aws-account-id != '' }}"
+        if: "${{ inputs.aws-region != '' }}"
         run: |
-          [[ ${{steps.credentials.outputs.aws-account-id}} != ${{ inputs.aws-account-id }} ]] \
+          [[ ${{steps.credentials.outputs.aws-account-id}} != ${{ secrets.aws-account-id }} ]] \
             && echo 'wrong aws account' && exit 1 \
             || echo 'correct aws account';
 

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

@@ -17,7 +17,7 @@ jobs:
     uses: ./.github/workflows/.test.yml
     with:
       aws-region: us-east-1
-      aws-account-id: '@declapract{variable.awsAccountId.dev}'
     secrets:
+      aws-account-id: '@declapract{variable.awsAccountId.dev}' # not a secret for services, but is a secret generically, since .test supports packages too
       aws-access-key-id: ${{ secrets.DEV_AWS_ACCESS_KEY_ID }}
       aws-secret-access-key: ${{ secrets.DEV_AWS_SECRET_ACCESS_KEY }}

package/dist/practices/uuid/bad-practices/deps-file/.declapract.readme.md

@@ -0,0 +1 @@
+prefer uuid-fns for a stable contract, batteries included

package/dist/practices/uuid/bad-practices/deps-file/package.json.declapract.ts

@@ -0,0 +1,23 @@
+import { FileCheckFunction, FileFixFunction } from 'declapract';
+
+export const check: FileCheckFunction = (contents) => {
+  const packageJSONObject = JSON.parse(contents!);
+  if (Object.keys(packageJSONObject.dependencies).includes('uuid')) return; // matches
+  if (Object.keys(packageJSONObject.devDependencies).includes('@types/uuid'))
+    return; // matches
+  throw new Error('does not match bad practice');
+};
+
+export const fix: FileFixFunction = (contents) => {
+  if (!contents) return {}; // should not occur
+  const packageJSONObject = JSON.parse(contents);
+  const fixedPackageJSONObject = {
+    ...packageJSONObject,
+    dependencies: { ...packageJSONObject.dependencies, uuid: undefined },
+    devDependencies: {
+      ...packageJSONObject.dependencies,
+      '@types/uuid': undefined,
+    },
+  };
+  return { contents: JSON.stringify(fixedPackageJSONObject, null, 2) };
+};

package/dist/practices/uuid/bad-practices/deps-file/src/deps.ts.declapract.ts

@@ -0,0 +1,3 @@
+import { FileCheckType } from 'declapract';
+
+export const check = FileCheckType.EXISTS;

package/dist/practices/uuid/best-practice/package.json

@@ -1,8 +1,5 @@
 {
-  "dependencies": {
-    "uuid": "@declapract{check.minVersion('9.0.0')}"
-  },
   "devDependencies": {
-    "@types/uuid": "@declapract{check.minVersion('9.0.0')}"
+    "uuid-fns": "@declapract{check.minVersion('1.0.2')}"
   }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "declapract-typescript-ehmpathy",
   "author": "ehmpathy",
   "description": "declapract best practices declarations for typescript",
-  "version": "0.39.10",
+  "version": "0.39.12",
   "license": "MIT",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",

package/dist/practices/uuid/best-practice/.declapract.readme.md

@@ -1 +0,0 @@
-industry standard; the community has converged on it

package/dist/practices/uuid/best-practice/src/deps.ts

@@ -1 +0,0 @@
-export { v4 as uuid } from 'uuid';