From 1f79e5786f9f22ac1861d606b89fc141dda42313 Mon Sep 17 00:00:00 2001
From: Will Dower
Date: Fri, 3 Apr 2020 18:51:40 -0400
Subject: [PATCH] Removed categories. Added default-to-open behavior
Signed-off-by: Will Dower
---
src/assets/data/faqs.json | 40 +++++++------------
src/components/faqInfo.vue | 51 ++++++++++--------------
src/components/training/traininginfo.vue | 2 +-
3 files changed, 37 insertions(+), 56 deletions(-)
diff --git a/src/assets/data/faqs.json b/src/assets/data/faqs.json
index 9d98614d5..8cc4c7974 100644
--- a/src/assets/data/faqs.json
+++ b/src/assets/data/faqs.json
@@ -1,33 +1,23 @@
{
"faqs": [
{
- "category": "InSpec",
- "desc": "foobar",
- "questions": [
+ "question": "How do I know which NIST SP 800-53 Security Controls are addressed using this framework?",
+ "answer": "NIST SP 800-53 associations are included in all InSpec profiles and output from other security tools processed through Heimdall_tools. See our presentation to learn more!",
+ "links": [
{
- "question": "How do I know which NIST SP 800-53 Security Controls are addressed using this framework?",
- "answer": "NIST SP 800-53 associations are included in all InSpec profiles and output from other security tools processed through Heimdall_tools. See our presentation to learn more!",
- "links": [
- {
- "name": "InSpec, HDF, and NIST SP 800-53 Security Controls",
- "download_link": "MITRE_InSpec_Profiles_and_HDF_include_NIST_SP-800-53_Associations.pdf"
- }
- ]
- },
+ "name": "InSpec, HDF, and NIST SP 800-53 Security Controls",
+ "download_link": "MITRE_InSpec_Profiles_and_HDF_include_NIST_SP-800-53_Associations.pdf"
+ }
+ ]
+ },
+ {
+ "question": "How can I use InSpec tests in my CI/CD pipeline?",
+ "answer": "InSpec tests can be integrated as part of a test battery in your favorite CI platform. For example, you can add InSpec testing to your Travis CI file to run InSpec automatically. For further details, please see our Advanced InSpec Developer's Course.",
+ "code": "// travis.yml\n\nsudo: required\n\n# blocklist\n#branches:\n# except:\n# - development\n\n# safelist\n#branches:\n# only:\n# - master\n# - stable\n\nlanguage: ruby\nrvm:\n - 2.6.1\n\ncache: bundler\n\naddons:\n apt:\n sources:\n - chef-current-xenial\n # packages:\n # - chef-workstation\n #artifacts: true\n\n# Don't `bundle install` which takes about 1.5 mins\ninstall:\n\nservices: docker\n\nenv:\n matrix:\n - INSTANCE=default-ubuntu-1604\n\nbefore_script:\n - wget https://packages.chef.io/files/stable/chef-workstation/0.5.1/ubuntu/16.04/chef-workstation_0.5.1-1_amd64.deb\n - sudo dpkg -i chef-workstation_*.deb\n - rm chef-workstation_*.deb\n - sudo iptables -L DOCKER || ( echo \"DOCKER iptables chain missing\" ; sudo iptables -N DOCKER )\n - eval\\$(chef shell-init bash)\"\n - gem install bundler:2.0.1\n - gem install inspec_tools\n - inspec --version\n - CHEF_LICENSE=accept chef gem update inspec\n - CHEF_LICENSE=accept chef gem update inspec-bin\n - /opt/chef-workstation/embedded/bin/gem update inspec\n - /opt/chef-workstation/embedded/bin/gem update inspec-bin\n - inspec --version\n - bundle update --bundler\n - bundle install\n - chef --version\n - cookstyle --version\n - foodcritic --version\n\nscript: \n - CHEF_LICENSE=accept-no-persist KITCHEN_LOCAL_YAML=kitchen.dokken.yml CHEF_VERSION=\\${CHEF_VERSION} kitchen verify \\${INSTANCE} || true\n - export RESULTS=\\$(ls results/*.json)\n - inspec_tools compliance -j $RESULTS -f threshold.yml",
+ "links": [
{
- "question": "How can I use InSpec tests in my CI/CD pipeline?",
- "answer": "InSpec tests can be integrated as part of a test battery in your favorite CI platform. For example, you can add InSpec testing to your Travis CI file to run InSpec automatically. For further details, please see our Advanced InSpec Developer's Course.",
- "code": "// travis.yml\n\nsudo: required\n\n# blocklist\n#branches:\n# except:\n# - development\n\n# safelist\n#branches:\n# only:\n# - master\n# - stable\n\nlanguage: ruby\nrvm:\n - 2.6.1\n\ncache: bundler\n\naddons:\n apt:\n sources:\n - chef-current-xenial\n # packages:\n # - chef-workstation\n #artifacts: true\n\n# Don't `bundle install` which takes about 1.5 mins\ninstall:\n\nservices: docker\n\nenv:\n matrix:\n - INSTANCE=default-ubuntu-1604\n\nbefore_script:\n - wget https://packages.chef.io/files/stable/chef-workstation/0.5.1/ubuntu/16.04/chef-workstation_0.5.1-1_amd64.deb\n - sudo dpkg -i chef-workstation_*.deb\n - rm chef-workstation_*.deb\n - sudo iptables -L DOCKER || ( echo \"DOCKER iptables chain missing\" ; sudo iptables -N DOCKER )\n - eval\\$(chef shell-init bash)\"\n - gem install bundler:2.0.1\n - gem install inspec_tools\n - inspec --version\n - CHEF_LICENSE=accept chef gem update inspec\n - CHEF_LICENSE=accept chef gem update inspec-bin\n - /opt/chef-workstation/embedded/bin/gem update inspec\n - /opt/chef-workstation/embedded/bin/gem update inspec-bin\n - inspec --version\n - bundle update --bundler\n - bundle install\n - chef --version\n - cookstyle --version\n - foodcritic --version\n\nscript: \n - CHEF_LICENSE=accept-no-persist KITCHEN_LOCAL_YAML=kitchen.dokken.yml CHEF_VERSION=\\${CHEF_VERSION} kitchen verify \\${INSTANCE} || true\n - export RESULTS=\\$(ls results/*.json)\n - inspec_tools compliance -j $RESULTS -f threshold.yml",
- "links": [
- {
- "name": "InSpec Pipeline Integration Example",
- "link": "https://mitre-inspec-advanced-developer.netlify.com/course/4.html"
- },
- {
- "name": "InSpec Pipeline Integration Example",
- "link": "https://mitre-inspec-advanced-developer.netlify.com/course/4.html"
- }
- ]
+ "name": "InSpec Pipeline Integration Example",
+ "link": "https://mitre-inspec-advanced-developer.netlify.com/course/4.html"
}
]
}
diff --git a/src/components/faqInfo.vue b/src/components/faqInfo.vue
index d41030048..02b7fa400 100644
--- a/src/components/faqInfo.vue
+++ b/src/components/faqInfo.vue
@@ -1,37 +1,27 @@
-
-
+
+
{{category.category}}
- {{category.desc}}
-
-
- {{faq.question}}
- {{faq.answer}}
-
-
-
-
-
-
- {{faq.code}}
-
-
-
-
-
+ >{{faq.question}}
+ {{faq.answer}}
+
+
+
+
+
+
+ {{faq.code}}
+
+
@@ -65,7 +55,8 @@
import faqs from "@/assets/data/faqs.json";
export default {
data: () => ({
- faqs: faqs.faqs
+ faqs: faqs.faqs,
+ panel: [0, 1],
})
};
\ No newline at end of file
diff --git a/src/components/training/traininginfo.vue b/src/components/training/traininginfo.vue
index 4d1620ffb..8af1eefe7 100644
--- a/src/components/training/traininginfo.vue
+++ b/src/components/training/traininginfo.vue
@@ -21,7 +21,7 @@
target="_blank"
>InSpec Advanced Developer Course
- - In depth explaination of some of the higher functionalities provided by InSpec
+ - In depth explanation of some of the higher functionalities provided by InSpec