CCM-10241 template mgmt bc smushing

.eslintrc.json

@@ -1,9 +1,4 @@
 {
-  "settings": {
-    "import/resolver": {
-      "typescript": {} // this loads <rootdir>/tsconfig.json to eslint
-    }
-  },
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
@@ -14,6 +9,30 @@
     "plugin:sonarjs/recommended-legacy",
     "plugin:unicorn/recommended"
   ],
+  "overrides": [
+    {
+      "files": [
+        "*.js"
+      ],
+      "rules": {
+        "@typescript-eslint/no-require-imports": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "global-require": "off",
+        "unicorn/prefer-module": "off"
+      }
+    },
+    {
+      "files": [
+        "*.{test,spec}.{ts,tsx}"
+      ],
+      "rules": {
+        "max-classes-per-file": "off",
+        "sonarjs/no-nested-functions": "off",
+        "unicorn/consistent-function-scoping": "off",
+        "unicorn/no-useless-undefined": "off"
+      }
+    }
+  ],
   "plugins": [
     "@typescript-eslint",
     "html",
@@ -26,42 +45,18 @@
     "unicorn"
   ],
   "rules": {
-    "no-restricted-syntax": "off",
-    "consistent-return": "off",
-    "prettier/prettier": "error",
-    "unicorn/prevent-abbreviations": "off",
-    "unicorn/filename-case": [
-      "error",
-      {
-        "case": "kebabCase",
-        "ignore": [
-          ".tsx"
-        ]
-      }
-    ],
-    "import/prefer-default-export": "off",
-    "import/extensions": "off",
-    "no-shadow": "off",
     "@typescript-eslint/no-shadow": "error",
     "@typescript-eslint/no-unused-vars": [
       "error",
       {
-        "ignoreRestSiblings": true,
         "argsIgnorePattern": "^_",
+        "ignoreRestSiblings": true,
         "varsIgnorePattern": "^_"
       }
     ],
-    "security/detect-object-injection": "off",
-    "sonarjs/no-duplicate-string": "off",
-    "sonarjs/todo-tag": "off",
-    "no-param-reassign": "off",
-    "no-useless-constructor": "off",
-    "sonarjs/no-small-switch": "off",
-    "sonarjs/no-unused-vars": "off",
-    "unicorn/no-null": "off",
-    "prefer-regex-literals": "off",
     "class-methods-use-this": "off",
-    "no-underscore-dangle": "off",
+    "consistent-return": "off",
+    "import/extensions": "off",
     "import/no-extraneous-dependencies": [
       "error",
       {
@@ -73,32 +68,36 @@
         ]
       }
     ],
+    "import/prefer-default-export": "off",
     "no-empty-function": "off",
+    "no-param-reassign": "off",
+    "no-restricted-syntax": "off",
+    "no-shadow": "off",
+    "no-underscore-dangle": "off",
+    "no-useless-constructor": "off",
+    "prefer-regex-literals": "off",
+    "prettier/prettier": "error",
+    "security/detect-object-injection": "off",
+    "sonarjs/no-duplicate-string": "off",
+    "sonarjs/no-small-switch": "off",
+    "sonarjs/no-unused-vars": "off",
+    "sonarjs/todo-tag": "off",
+    "unicorn/filename-case": [
+      "error",
+      {
+        "case": "kebabCase",
+        "ignore": [
+          ".tsx"
+        ]
+      }
+    ],
+    "unicorn/no-null": "off",
     "unicorn/prefer-module": "off",
-    "sonarjs/todo-tag": "off"
+    "unicorn/prevent-abbreviations": "off"
   },
-  "overrides": [
-    {
-      "files": [
-        "*.js"
-      ],
-      "rules": {
-        "@typescript-eslint/no-var-requires": "off",
-        "@typescript-eslint/no-require-imports": "off",
-        "unicorn/prefer-module": "off",
-        "global-require": "off"
-      }
-    },
-    {
-      "files": [
-        "*.{test,spec}.{ts,tsx}"
-      ],
-      "rules": {
-        "unicorn/no-useless-undefined": "off",
-        "unicorn/consistent-function-scoping": "off",
-        "max-classes-per-file": "off",
-        "sonarjs/no-nested-functions": "off"
-      }
+  "settings": {
+    "import/resolver": {
+      "typescript": {}
     }
-  ]
+  }
 }

.github/workflows/pr_closed.yaml

@@ -60,7 +60,9 @@ jobs:
             --targetEnvironment "main" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
             --targetComponent "${{ matrix.component }}" \
-            --terraformAction "apply"
+            --terraformAction "apply" \
+            --overrideProjectName "nhs" \
+            --overrideRoleName "nhs-main-acct-template-mgmt-github-deploy"
 
   check-event-schemas-version-change:
     name: Check for event schemas package version change

.github/workflows/pr_create_dynamic_env.yaml

@@ -31,4 +31,6 @@ jobs:
             --targetComponent "branch" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
             --terraformAction "apply" \
-            --overrides "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
+            --overrides "branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
+            --overrideProjectName "nhs" \
+            --overrideRoleName "nhs-main-acct-template-mgmt-github-deploy"

.github/workflows/pr_destroy_dynamic_env.yaml

@@ -31,7 +31,9 @@ jobs:
             --targetEnvironment "pr${{ github.event.number }}" \
             --targetComponent "branch" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
-            --terraformAction "destroy"
+            --terraformAction "destroy" \
+            --overrideProjectName "nhs" \
+            --overrideRoleName "nhs-main-acct-template-mgmt-github-deploy"
 
   sandbox-tear-down:
     name: Destroy Sandbox Environment

.github/workflows/stage-4-acceptance.yaml

@@ -31,7 +31,9 @@ jobs:
             --targetEnvironment "pr${{ inputs.pr_number }}" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
             --targetComponent "sandbox" \
-            --terraformAction "apply"
+            --terraformAction "apply" \
+            --overrideProjectName "nhs" \
+            --overrideRoleName "nhs-main-acct-template-mgmt-github-deploy"
 
       - name: Trigger Acceptance Tests
         shell: bash

.gitleaksignore

@@ -7,3 +7,4 @@ b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:15
 b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:25
 bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:15
 bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:25
+306d9ec55d3498b86d5506da9a90ac486fc66563:frontend/src/components/molecules/MessagePlanFallbackConditions/MessagePlanFallbackConditions.tsx:ipv4:92

.prettierrc.json

@@ -1,12 +1,12 @@
 {
-  "trailingComma": "es5",
-  "semi": true,
-  "tabWidth": 2,
-  "singleQuote": true,
-  "jsxSingleQuote": true,
-  "quoteProps": "as-needed",
   "arrowParens": "always",
   "bracketSpacing": true,
   "endOfLine": "lf",
-  "printWidth": 80
+  "jsxSingleQuote": true,
+  "printWidth": 80,
+  "quoteProps": "as-needed",
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "es5"
 }

frontend/.eslintrc.json

@@ -6,18 +6,18 @@
   ],
   "rules": {
     "react/display-name": "off",
-    "react/react-in-jsx-scope": "off",
-    "react/jsx-filename-extension": "off",
-    "react/jsx-props-no-spreading": "off",
     "react/function-component-definition": "off",
+    "react/jsx-filename-extension": "off",
+    "react/jsx-no-bind": "off",
     "react/jsx-no-useless-fragment": [
       "error",
       {
         "allowExpressions": true
       }
     ],
+    "react/jsx-props-no-spreading": "off",
     "react/no-danger": "off",
-    "react/require-default-props": "off",
-    "react/jsx-no-bind": "off"
+    "react/react-in-jsx-scope": "off",
+    "react/require-default-props": "off"
   }
 }