Merge pull request #146 from DSACMS/dev

Merge Dev to Main

README.md

@@ -20,7 +20,7 @@ cookiecutter https://github.com/DSACMS/repo-scaffolder --directory=tierX
 ```
 
 ## Add Repometrics to your Project
-To integrate repometrics into your new project, navigate to your project's directory and run the following cookiecutter command:
+To integrate repometrics into your new project, navigate to your project's `.github` directory and run the following cookiecutter command:
 ```
 cookiecutter . --directory=repometrics
 ```

code.json

@@ -1,10 +1,10 @@
 {
-    "project_type": "Tools",
-    "user_input": "No",
-    "project_fisma_level": "Low",
+    "projectType": "Tools",
+    "userInput": "No",
+    "fismaLevel": "Low",
     "group": "CMS/OA/DSAC",
-    "subset_in_healthcare": "Operational",
-    "user_type": "Government",
-    "repository_host": "Github.com",
-    "maturity_model_tier": "3"
+    "subsetInHealthcare": "Operational",
+    "userType": "Government",
+    "repositoryHost": "Github.com",
+    "maturityModelTier": "3"
 }

tier1/cookiecutter.json

@@ -11,5 +11,5 @@
       "create_repo": "Would you like to create a repo on github.com?",
       "receive_updates": "Would you like to receive updates from the DSACMS team via pull requests?"
     },
-    "_copy_without_render": ["repometrics"]
+    "_copy_without_render": [".github/repometrics"]
 }

tier1/{{cookiecutter.project_slug}}/repometrics/cookiecutter.json → tier1/{{cookiecutter.project_slug}}/.github/repometrics/cookiecutter.json

@@ -1,7 +1,7 @@
 {
-    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs"],
+    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs", "Docs"],
     "user_input": ["Yes", "No"],
-    "project_fisma_level": ["Low", "Moderate", "High"],
+    "fisma_level": ["Low", "Moderate", "High"],
     "group": "CMS/OA/DSAC",
     "subset_in_healthcare": "Policy, Operational",
     "user_type": "Providers, Patients, Government",
@@ -10,7 +10,7 @@
         "group": "Which group is the project part of?",
         "subset_in_healthcare": "Which subset of healthcare does the project belong to?",
         "user_type": "Who are the intended users?",
-        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, etc.)",
+        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, upload files, etc.)",
         "repository_host": "Where is the repository hosted?"
     }
 }

tier3/{{cookiecutter.project_slug}}/repometrics/hooks/post_gen_project.sh → tier1/{{cookiecutter.project_slug}}/.github/repometrics/hooks/post_gen_project.sh

@@ -14,11 +14,11 @@ fi
 project_type="{{cookiecutter.project_type}}"
 sub_project_dir="${project_type}"
 repometrics_file="code.json"
-parent_dir="./"
+project_root_dir="../"
 
 if [ -f "${sub_project_dir}/${repometrics_file}" ]; then  
   # Move code.json file to parent directory
-  mv "${sub_project_dir}/${repometrics_file}" "${parent_dir}"
+  mv "${sub_project_dir}/${repometrics_file}" "${project_root_dir}"
 
   # Check if the move was successful
   if [ $? -eq 0 ]; then    

tier1/{{cookiecutter.project_slug}}/.github/repometrics/{{cookiecutter.project_type}}/code.json

@@ -0,0 +1,10 @@
+{
+    "projectType": "{{ cookiecutter.project_type }}",
+    "userInput": "{{ cookiecutter.user_input }}",
+    "fismaLevel": "{{ cookiecutter.fisma_level }}",
+    "group": "{{ cookiecutter.group }}",
+    "subsetInHealthcare": "{{ cookiecutter.subset_in_healthcare }}",
+    "userType": "{{ cookiecutter.user_type }}",
+    "repositoryHost": "{{ cookiecutter.repository_host }}",
+    "maturityModelTier": "1"
+}

tier1/{{cookiecutter.project_slug}}/.github/workflows/checks.yml

@@ -54,4 +54,6 @@ jobs:
 
           # The default token is the repolinter token for the DSACMS org
           # You can change it if needed.
+          {% raw %}
           token: ${{ secrets.REPOLINTER_AUTO_TOKEN }}
+          {% endraw %}

tier2/cookiecutter.json

@@ -14,5 +14,5 @@
     "receive_updates": "Would you like to receive updates from the DSACMS team via pull requests?",
     "add_maintainer": "Would you like to add a maintainer?"
   },
-  "_copy_without_render": ["repometrics"]
+  "_copy_without_render": [".github/repometrics"]
 }

tier3/{{cookiecutter.project_slug}}/repometrics/cookiecutter.json → tier2/{{cookiecutter.project_slug}}/.github/repometrics/cookiecutter.json

@@ -1,7 +1,7 @@
 {
-    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs"],
+    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs", "Docs"],
     "user_input": ["Yes", "No"],
-    "project_fisma_level": ["Low", "Moderate", "High"],
+    "fisma_level": ["Low", "Moderate", "High"],
     "group": "CMS/OA/DSAC",
     "subset_in_healthcare": "Policy, Operational",
     "user_type": "Providers, Patients, Government",
@@ -10,7 +10,7 @@
         "group": "Which group is the project part of?",
         "subset_in_healthcare": "Which subset of healthcare does the project belong to?",
         "user_type": "Who are the intended users?",
-        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, etc.)",
+        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, upload files, etc.)",
         "repository_host": "Where is the repository hosted?"
     }
 }

tier1/{{cookiecutter.project_slug}}/repometrics/hooks/post_gen_project.sh → tier2/{{cookiecutter.project_slug}}/.github/repometrics/hooks/post_gen_project.sh

@@ -14,11 +14,11 @@ fi
 project_type="{{cookiecutter.project_type}}"
 sub_project_dir="${project_type}"
 repometrics_file="code.json"
-parent_dir="./"
+project_root_dir="../"
 
 if [ -f "${sub_project_dir}/${repometrics_file}" ]; then  
   # Move code.json file to parent directory
-  mv "${sub_project_dir}/${repometrics_file}" "${parent_dir}"
+  mv "${sub_project_dir}/${repometrics_file}" "${project_root_dir}"
 
   # Check if the move was successful
   if [ $? -eq 0 ]; then    

tier2/{{cookiecutter.project_slug}}/.github/repometrics/{{cookiecutter.project_type}}/code.json

@@ -0,0 +1,10 @@
+{
+    "projectType": "{{ cookiecutter.project_type }}",
+    "userInput": "{{ cookiecutter.user_input }}",
+    "fismaLevel": "{{ cookiecutter.fisma_level }}",
+    "group": "{{ cookiecutter.group }}",
+    "subsetInHealthcare": "{{ cookiecutter.subset_in_healthcare }}",
+    "userType": "{{ cookiecutter.user_type }}",
+    "repositoryHost": "{{ cookiecutter.repository_host }}",
+    "maturityModelTier": "2"
+}

tier2/{{cookiecutter.project_slug}}/.github/workflows/checks.yml

@@ -54,4 +54,6 @@ jobs:
 
           # The default token is the repolinter token for the DSACMS org
           # You can change it if needed.
+          {% raw %}
           token: ${{ secrets.REPOLINTER_AUTO_TOKEN }}
+          {% endraw %}

tier3/cookiecutter.json

@@ -14,5 +14,5 @@
     "receive_updates": "Would you like to receive updates from the DSACMS team via pull requests?",
     "add_maintainer": "Would you like to add maintainers, approvers, and/or reviewers?"
   },
-  "_copy_without_render": ["repometrics"]
+  "_copy_without_render": [".github/repometrics"]
 }

tier4/{{cookiecutter.project_slug}}/repometrics/cookiecutter.json → tier3/{{cookiecutter.project_slug}}/.github/repometrics/cookiecutter.json

@@ -1,7 +1,7 @@
 {
-    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs"],
+    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs", "Docs"],
     "user_input": ["Yes", "No"],
-    "project_fisma_level": ["Low", "Moderate", "High"],
+    "fisma_level": ["Low", "Moderate", "High"],
     "group": "CMS/OA/DSAC",
     "subset_in_healthcare": "Policy, Operational",
     "user_type": "Providers, Patients, Government",
@@ -10,7 +10,7 @@
         "group": "Which group is the project part of?",
         "subset_in_healthcare": "Which subset of healthcare does the project belong to?",
         "user_type": "Who are the intended users?",
-        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, etc.)",
+        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, upload files, etc.)",
         "repository_host": "Where is the repository hosted?"
     }
 }

tier2/{{cookiecutter.project_slug}}/repometrics/hooks/post_gen_project.sh → tier3/{{cookiecutter.project_slug}}/.github/repometrics/hooks/post_gen_project.sh

@@ -14,11 +14,11 @@ fi
 project_type="{{cookiecutter.project_type}}"
 sub_project_dir="${project_type}"
 repometrics_file="code.json"
-parent_dir="./"
+project_root_dir="../"
 
 if [ -f "${sub_project_dir}/${repometrics_file}" ]; then  
   # Move code.json file to parent directory
-  mv "${sub_project_dir}/${repometrics_file}" "${parent_dir}"
+  mv "${sub_project_dir}/${repometrics_file}" "${project_root_dir}"
 
   # Check if the move was successful
   if [ $? -eq 0 ]; then    

tier3/{{cookiecutter.project_slug}}/.github/repometrics/{{cookiecutter.project_type}}/code.json

@@ -0,0 +1,10 @@
+{
+    "projectType": "{{ cookiecutter.project_type }}",
+    "userInput": "{{ cookiecutter.user_input }}",
+    "fismaLevel": "{{ cookiecutter.fisma_level }}",
+    "group": "{{ cookiecutter.group }}",
+    "subsetInHealthcare": "{{ cookiecutter.subset_in_healthcare }}",
+    "userType": "{{ cookiecutter.user_type }}",
+    "repositoryHost": "{{ cookiecutter.repository_host }}",
+    "maturityModelTier": "3"
+}

tier3/{{cookiecutter.project_slug}}/.github/workflows/checks.yml

@@ -54,4 +54,6 @@ jobs:
 
           # The default token is the repolinter token for the DSACMS org
           # You can change it if needed.
+          {% raw %}
           token: ${{ secrets.REPOLINTER_AUTO_TOKEN }}
+          {% endraw %}

tier4/cookiecutter.json

@@ -14,5 +14,5 @@
     "receive_updates": "Would you like to receive updates from the DSACMS team via pull requests?",
     "add_maintainer": "Would you like to add maintainers, approvers, and/or reviewers?"
   },
-  "_copy_without_render": ["repometrics"]
+  "_copy_without_render": [".github/repometrics"]
 }

tier2/{{cookiecutter.project_slug}}/repometrics/cookiecutter.json → tier4/{{cookiecutter.project_slug}}/.github/repometrics/cookiecutter.json

@@ -1,7 +1,7 @@
 {
-    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs"],
+    "project_type" : ["Package", "Website", "Standards", "Libraries", "Data", "Apps", "Tools", "APIs", "Docs"],
     "user_input": ["Yes", "No"],
-    "project_fisma_level": ["Low", "Moderate", "High"],
+    "fisma_level": ["Low", "Moderate", "High"],
     "group": "CMS/OA/DSAC",
     "subset_in_healthcare": "Policy, Operational",
     "user_type": "Providers, Patients, Government",
@@ -10,7 +10,7 @@
         "group": "Which group is the project part of?",
         "subset_in_healthcare": "Which subset of healthcare does the project belong to?",
         "user_type": "Who are the intended users?",
-        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, etc.)",
+        "user_input": "Does the project accept user input? (e.g. allows user to query a database, allows login by users, upload files, etc.)",
         "repository_host": "Where is the repository hosted?"
     }
 }

tier4/{{cookiecutter.project_slug}}/repometrics/hooks/post_gen_project.sh → tier4/{{cookiecutter.project_slug}}/.github/repometrics/hooks/post_gen_project.sh

@@ -14,11 +14,11 @@ fi
 project_type="{{cookiecutter.project_type}}"
 sub_project_dir="${project_type}"
 repometrics_file="code.json"
-parent_dir="./"
+project_root_dir="../"
 
 if [ -f "${sub_project_dir}/${repometrics_file}" ]; then  
   # Move code.json file to parent directory
-  mv "${sub_project_dir}/${repometrics_file}" "${parent_dir}"
+  mv "${sub_project_dir}/${repometrics_file}" "${project_root_dir}"
 
   # Check if the move was successful
   if [ $? -eq 0 ]; then    

tier4/{{cookiecutter.project_slug}}/.github/repometrics/{{cookiecutter.project_type}}/code.json

@@ -0,0 +1,10 @@
+{
+    "projectType": "{{ cookiecutter.project_type }}",
+    "userInput": "{{ cookiecutter.user_input }}",
+    "fismaLevel": "{{ cookiecutter.fisma_level }}",
+    "group": "{{ cookiecutter.group }}",
+    "subsetInHealthcare": "{{ cookiecutter.subset_in_healthcare }}",
+    "userType": "{{ cookiecutter.user_type }}",
+    "repositoryHost": "{{ cookiecutter.repository_host }}",
+    "maturityModelTier": "4"
+}

tier4/{{cookiecutter.project_slug}}/.github/workflows/checks.yml

@@ -54,4 +54,6 @@ jobs:
 
           # The default token is the repolinter token for the DSACMS org
           # You can change it if needed.
+          {% raw %}
           token: ${{ secrets.REPOLINTER_AUTO_TOKEN }}
+          {% endraw %}