Update renderer to simplify framework criteria satisfaction based on controls in place, in addition to existing policy and narrative

.env.example

@@ -1 +0,0 @@
-COMPLY_USE_LOCAL_PANDOC=

.gitignore

@@ -2,7 +2,4 @@ comply
 output
 dist
 .envrc
-bindata.go
-.idea/
-.env
-.vscode/
+bindata.go

Dockerfile

@@ -1,4 +1,4 @@
-FROM strongdm/pandoc:edge
+FROM strongdm/pandoc:latest
 
 # based on implementation by James Gregory <james@jagregory.com>
 MAINTAINER Comply <comply@strongdm.com>
@@ -7,7 +7,7 @@ RUN apt-get update -y \
   && apt-get install -y curl
 
 ARG COMPLY_VERSION
-ENV COMPLY_VERSION ${COMPLY_VERSION:-1.6.0}
+ENV COMPLY_VERSION ${COMPLY_VERSION:-1.4.0}
 
 EXPOSE 4000/tcp
 

Makefile

@@ -52,8 +52,8 @@ else
 endif
 
 docker:
-	cd build && docker build -t strongdm/pandoc:edge .
-	docker push strongdm/pandoc:edge
+	cd build && docker build -t strongdm/pandoc .
+	docker push strongdm/pandoc
 
 cleanse:
 	git checkout --orphan newbranch
@@ -71,9 +71,6 @@ endif
 ifndef COMPLY_TAPDIR
 	$(error COMPLY_TAPDIR must be set to the path of the comply homebrew tap repo)
 endif
-ifndef COMPLY_RELEASE_WEBHOOK
-	$(error COMPLY_RELEASE_WEBHOOK must be set to a webhook for the release Slack channel)
-endif
 
 release: release-env dist release-deps
 	$(eval VERSION := $(shell git describe --tags --always --dirty="-dev"))
@@ -107,11 +104,11 @@ release: release-env dist release-deps
 
 patch-release: release-env patch release
 	$(eval VERSION := $(shell git describe --tags --always --dirty="-dev"))
-	curl -X POST --data-urlencode 'payload={"channel": "#release", "username": "release", "text": "comply $(VERSION) released", "icon_emoji": ":shipit:"}' $$COMPLY_RELEASE_WEBHOOK
+	curl -X POST --data-urlencode 'payload={"channel": "#release", "username": "release", "text": "comply $(VERSION) released", "icon_emoji": ":shipit:"}' https://hooks.slack.com/services/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
 
 minor-release: release-env minor release
 	$(eval VERSION := $(shell git describe --tags --always --dirty="-dev"))
-	curl -X POST --data-urlencode 'payload={"channel": "#release", "username": "release", "text": "comply $(VERSION) released", "icon_emoji": ":shipit:"}' $$COMPLY_RELEASE_WEBHOOK
+	curl -X POST --data-urlencode 'payload={"channel": "#release", "username": "release", "text": "comply $(VERSION) released", "icon_emoji": ":shipit:"}' https://hooks.slack.com/services/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
 
 docker-release:
 	docker build --build-arg COMPLY_VERSION=`cat VERSION` -t strongdm/comply .

README.md

@@ -1,4 +1,4 @@
-![Comply](./logo.png)
+![Comply](https://github.com/strongdm/comply/blob/master/logo.png)
 
 Comply is a SOC2-focused compliance automation tool:
 
@@ -34,27 +34,24 @@ Once `comply init` is complete, just `git init` and `git push` your project to a
 
 # Discussion
 
-Join us in [Comply Users](https://join.slack.com/t/comply-users/shared_invite/zt-4k3f46wy-Cs1DceznNvAL~lnW9_HjIA)
+Join us in [Comply Users](https://join.slack.com/t/comply-users/shared_invite/enQtMzU3MTk5MDkxNDU4LTMwYzZkMjA4YjQ2YTM5Zjc0NTAyYWY5MDBlOGMwMzRmZTk5YzBlOTRiMTVlNGRlZjY1MTY1NDE0MjY5ZjYwNWU)
 
 # Screenshots
 
 [Demo video](https://vimeo.com/270257486)
 
 ## Start a Project
-
 ![screencast 1](sc-1.gif)
 
 ## Build PDFs
-
 ![screencast 4](sc-4.gif)
 ![pdf example](pdf-example.png)
 
-## Track Policy Coverage
 
+## Track Policy Coverage
 ![screencast 3](sc-2.gif)
 
 ## Dashboard
-
 ![screencast 2](sc-3.gif)
 
 ## Dependencies
@@ -102,43 +99,13 @@ Serving content of output/ at http://127.0.0.1:4000 (ctrl-c to quit)
 
 For Windows users, replace $PWD with the full path to your project directory
 
-### Running in macOS M1
-
-If you're running Comply inside Docker, or using it installed by HomeBrew, in a macOS M1, you should increase the Docker allocatable memory space to ~7 GB, but it won't run smoothly. So, we recommend to run Comply locally with pandoc binary installed via HomeBrew. For that, install the `pandoc` and `basictex` packages using the following command:
-
-```bash
-brew install pandoc basictex
-```
-
-Then when running the Comply binary -installed by HomeBrew- it will work as expected.
 
 ## Ticketing Integrations:
-
 - Jira
 - Github
 - Gitlab
 
-## Configuration
-
-## GitHub
-
-Ticketing integration with GitHub can be configured with the following YAML in `comply.yml`:
-
-```yaml
-tickets:
-  github:
-    repo: <repo-name>
-    token: <token>
-    username: org or personal username
-```
-
-If you're setting up the repo in your personal account, set `username` to your username.
-If you're setting up the repo in an github organization, set `username` to your org's username instead.
-
-Also, `GITHUB_REPO`, `GITHUB_TOKEN`, and `GITHUB_USERNAME` can be used to override values from the YAML file.
-
-### Jira
-
+## Configuring Jira
 When comply creates a ticket (through `proc`, for instance), it sets the following fields.
 
 - assignee
@@ -149,12 +116,12 @@ When comply creates a ticket (through `proc`, for instance), it sets the followi
 - reporter
 - summary
 
-Please make sure that the default _Create Screen_ has all of those fields enabled. Additionally, make sure that there are no other required fields for the issue type you choose.
+Please make sure that the default *Create Screen* has all of those fields enabled. Additionally, make sure that there are no other required fields for the issue type you choose.
+
+
 
-About authentication, you need to create an [API Token](https://id.atlassian.com/manage-profile/security/api-tokens) to use as a password.
 
 ## Forking and local development
-
 > Assumes installation of golang and configuration of GOPATH in .bash_profile, .zshrc, etc
 > Inspiration: http://code.openark.org/blog/development/forking-golang-repositories-on-github-and-managing-the-import-path
 

SUPPORT.md

@@ -1,5 +0,0 @@
-# Support
-
-All questions/support related to Comply would be kindly addressed by the community, you can reach out to us via:
-* [Issues](https://github.com/strongdm/comply/issues), or
-* [Slack](https://join.slack.com/t/comply-users/shared_invite/zt-4k3f46wy-Cs1DceznNvAL~lnW9_HjIA)

VERSION

@@ -1 +1 @@
-1.6.0
+1.5.1

build/Dockerfile

@@ -1,10 +1,29 @@
-FROM pandoc/ubuntu
+FROM haskell:latest
 
+# based on implementation by James Gregory <james@jagregory.com>
+MAINTAINER Comply <comply@strongdm.com>
+
+# install latex packages
 RUN apt-get update -y \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y -o Acquire::Retries=10 --no-install-recommends \
-  texlive-latex-base \
-  texlive-latex-extra \
-  texlive-plain-generic \
-  lmodern
+  && apt-get install -y -o Acquire::Retries=10 --no-install-recommends \
+    texlive-latex-base \
+    texlive-xetex \
+    texlive-fonts-recommended \
+    latex-xcolor \
+    texlive-latex-extra \
+    fontconfig \
+    unzip \
+    lmodern
+
+# will ease up the update process
+# updating this env variable will trigger the automatic build of the Docker image
+ENV PANDOC_VERSION "2.2.1"
+
+# install pandoc
+RUN cabal update && cabal install pandoc-${PANDOC_VERSION}
 
 WORKDIR /source
+
+ENTRYPOINT ["/root/.cabal/bin/pandoc"]
+
+CMD ["--help"]

comply.go

@@ -1,17 +1,7 @@
 package main
 
-import (
-	"fmt"
-	"path/filepath"
-	"runtime"
-
-	"github.com/joho/godotenv"
-	"github.com/strongdm/comply/internal/cli"
-)
+import "github.com/strongdm/comply/internal/cli"
 
 func main() {
-	_, b, _, _ := runtime.Caller(0)
-	basepath := filepath.Dir(b)
-	godotenv.Load(fmt.Sprintf("%s/.env", basepath))
 	cli.Main()
 }

example/README.md

@@ -20,7 +20,7 @@ Assets are built using [`comply`](https://comply.strongdm.com), which can be ins
 
 # Publishing
 
-The `output/` directory contains all generated assets. Links in the HTML dashboard are relative, and all dependencies are included via direct CDN references. The entire `output/` directory, therefore, may be uploaded to an S3 bucket or another static asset host without further modification.
+The `output/` directory contains all generated assets. Links in the HTML dashboard a relative, and all dependencies are included via direct CDN references. The entire `output/` directory therefore may be uploaded to an S3 bucket or other static asset host without further modification.
 
 # Dashboard Status
 
@@ -57,4 +57,4 @@ comply build
 
 # publish static site from output/ directory
 upload.sh output/
-```
+```

example/controls/README.md

@@ -0,0 +1,33 @@
+# Controls
+
+Controls explicitly state a specific action that the organization will take to enforce a Policy goal.
+
+## Format
+```
+name: Access Control Procedures
+family: Access Control
+identifier: AC-2
+governingPolicy:
+  - policyName: Access Onboarding and Termination
+    policyID: SDM-AOTP
+    policyClause: 1.1
+owner: Director, Security & Compliance
+published: 2020-01-01
+targets:
+  TSC 2017:
+    - CC6.1
+    - CC6.2
+    - CC6.3
+  NIST 800-53:
+    - AC-1
+revisions:
+  - date: Sep 1 2020
+    comment: Initial documentation of control
+---
+1. Develop, document, and disseminate to all employees:
+
+    1. Organizational access control policy that:
+
+        1. Addresses purpose, scope, roles, responsibilities, management commitment, coordination among organizational entities, and compliance; and
+
+```

example/policies/conduct.md

@@ -16,7 +16,7 @@ majorRevisions:
 
   a. This policy applies to all employees and contractors. They are bound by their Employment Offer Letter or Independent Contractor Agreement to follow the Code of Conduct Policy while performing their duties. The Code of Conduct is outlined below: 
 
-# Policy
+#Policy
 
   a. *Compliance with law*
       

example/templates/index.ace

@@ -66,7 +66,7 @@ html lang=en
                   a onclick="javascript:show('procedures')" Procedures
               li.top-nav.standards
                 strong
-                  a onclick="javascript:show('standards')" Standards
+                  a onclick="javascript:show('frameworks')" Frameworks
               / li.top-nav.evidence
               /   a onclick="javascript:show('evidence')" Evidence Vault
     #overview.section.top-nav.container.content
@@ -76,17 +76,17 @@ html lang=en
       .columns.is-vcentered
         .column.is-one-third
           div
-            p.subtitle.is-3.has-text-centered Control Tracking
+            p.subtitle.is-3.has-text-centered CriterionTracking
         .column.has-text-centered
           div
-            p.heading Satisfied Controls
+            p.heading Satisfied Criteria
             p.title
-              {{.Stats.ControlsSatisfied}}
+              {{.Stats.CriteriaSatisfied}}
         .column.has-text-centered
           div
             p.heading Total Controls
             p.title
-              {{.Stats.ControlsTotal}}
+              {{.Stats.CriteriaTotal}}
       .columns.is-vcentered
         .column.is-one-third
           div
@@ -191,19 +191,19 @@ html lang=en
       blockquote
         h3
           p
-            strong Standards
-            | specify the controls satisfied by the compliance program.
+            strong Frameworks
+            | specify the Framework Criteria satisfied by the compliance program.
       table.table.is-size-4.is-fullwidth
         thead
           tr
-            th Control Key
+            th CriterionKey
             th Name
             th Satisfied?
             th Satisfied By
         tbody
-          {{range .Controls }}
+          {{range .Criteria}}
           tr
-            td {{.ControlKey}}
+            td {{.criteriaKey}}
             td
               strong {{.Name}}
               .subtitle {{.Description}}
@@ -234,4 +234,4 @@ html lang=en
           show(destination)
         }
       }
-    }
+    }

fixtures/narratives/invalid-control.md

@@ -1,94 +0,0 @@
-name: Control Environment Narrative
-acronym: CEN
-satisfies:
-  TSC:
-- CC2.1
-    - CC2.2
-    - CC2.3
-    - CC4.1
-    - CC4.2
-    - CC5.1
-    - CC5.2
-    - CC5.3
-majorRevisions:
-  - date: Jun 1 2018
-    comment: Initial document
----
-
-# Control Environment Narrative
-
-The following provides a description of the control structure of {{.Name}}.
-
-The intent of this description is to enumerate the logical, policy, and procedural controls that serve to monitor {{.Name}}'s application and data security. Changes uncovered by these procedures in the logical, policy, procedural, or customer environment are addressed by remediations specific to the noted change.
-
-# Logical Controls
-
-{{.Name}} employs several logical controls to protect confidential data and ensure normal operation of its core product.
-
-- Mandatory data encryption at rest and in motion
-- Multi-factor authentication for access to cloud infrastructure
-- Activity and anomaly monitoring on production systems
-- Vulnerability management program
-
-# Policy Controls
-
-{{.Name}} employs several policy controls to protect confidential data and ensure normal operation of its core product. These policies include, but are not limited to:
-
-- Access Control Policy
-- Encryption Policy
-- Office Security Policy
-- Password Policy
-- Policy Training Policy
-- Vendor Policy
-- Workstation Policy
-
-# Procedural Controls
-
-{{.Name}} has numerous scheduled procedures to monitor and tune the effectiveness of ongoing security controls, and a series of event-driven procedures to respond to security-related events.
-
-TODO: Finalize these lists
-
-## Scheduled Security and Audit Procedures
-
-- Review Access [quarterly]
-- Review Security Logs [weekly]
-- Review Cyber Risk Assessment (enumerate possible compromise scenarios) [quarterly]
-- Review Data Classification [quarterly]
-- Backup Testing [quarterly]
-- Disaster Recovery Testing [semi-annual]
-- Review Devices & Workstations [quarterly]
-- Review & Clear Low-Priority Alerts [weekly]
-- Apply OS Patches [monthly]
-- Verify Data Disposal per Retention Policy [quarterly]
-- Conduct Security Training [annual]
-- Review Security Monitoring and Alerting Configuration [quarterly]
-- Penetration Test [annual]
-- Whitebox Security Review [annual]
-- SOC2 Audit [annual]
-
-## Event-Driven Security and Audit Procedures
-
-- Onboard Employee
-- Offboard Employee
-- Investigate Security Alert
-- Investigate Security Incident
-
-# Remediations
-
-{{.Name}} uses the outcomes of the aforementioned controls and procedures to identify shortcomings in the existing control environment. Once identified, these shortcomes are remediated by improving existing controls and procedures, and creating new controls and procedures as needed.
-
-# Communications
-
-{{.Name}} communicates relevant information regarding the functioning of the above controls with internal and external parties on an as-needed basis and according to statutory requirements.
-
-## Internal
-
-{{.Name}} communicates control outcomes, anomalies, and remediations internally using the following channels:
-
-- Slack
-- Email
-- Github ticketing
-
-## External
-
-{{.Name}} communicates relevant control-related information to external parties including shareholders, customers, contractors, regulators, and government entities as needed according to contractual and regulatory/statutory obligation.

fixtures/policies/invalid-access.md

@@ -1,55 +0,0 @@
-name: Access Onboarding and Termination Policy
-acronym: AOTP
-satisfies:
-TSC:
-- CC6.1
-  - CC6.2
-  - CC6.3 
-majorRevisions:
-- date: Jun 1 2018
-   comment: Initial document
----
-# Purpose and Scope
-
-a. The purpose of this policy is to define procedures to onboard and offboard users to technical infrastructure in a manner that minimizes the risk of information loss or exposure.
-
-a. This policy applies to all technical infrastructure within the organization.
-
-a. This policy applies to all full-time and part-time employees and contractors.
-
-# Background
-
-a. In order to minimize the risk of information loss or exposure (from both inside and outside the organization), the organization is reliant on the principle of least privilege. Account creation and permission levels are restricted to only the resources absolutely needed to perform each person’s job duties. When a user’s role within the organization changes, those accounts and permission levels are changed/revoked to fit the new role and disabled when the user leaves the organization altogether.
-
-# Policy
-
-a. *During onboarding:*
-
-    i. Hiring Manager informs HR upon hire of a new employee.
-
-    i. HR emails IT to inform them of a new hire and their role. 
-
-    i. IT creates a checklist of accounts and permission levels needed for that role. 
-
-    i. The owner of each resource reviews and approves account creation and the 
-associated permissions.
-
-    i. IT works with the owner of each resource to set up the user. 
-
-a. *During offboarding:*
-
-    i. Hiring Manager notifies HR when an employee has been terminated. 
-
-    i. HR sends a weekly email report to IT summarizing list of users terminated and instructs IT to disable their access. 
-
-    i. IT terminates access within five business days from receipt of notification. 
-
-a. *When an employee changes roles within the organization:*
-
-    i. Hiring Manager will inform HR of a change in role.
-    
-    i. HR and IT will follow the same steps as outlined in the onboarding and offboarding procedures. 
-
-a. *Review of accounts and permissions:*
-
-    i. Each month, IT and HR will review accounts and permission levels for accuracy. 

fixtures/procedures/invalid-workstation.md

@@ -1,39 +0,0 @@
-id: "workstation"
-name: "Collect Workstation Details"cron: "0 0 0 15 4 *"
----
-
-Resolve this ticket by executing the following steps:
-
-- [ ] Send the communications below
-- [ ] For any email replies, attach content to this ticket
-- [ ] Validate responses are received from each
-
-
-```
-To: Desktop support
-Subject: Annual workstation inventory
-
-Please attach the current workstation inventory to the following ticket: [REPLACE WITH URL TO THIS TICKET]
-
-The workstation inventory shall include the following fields:
-    * Serial number
-    * Custodian
-    * Full disk encryption status
-    * Malware protection status
-```
-
-
-```
-To: Outsourced Call Center IT
-Subject: Annual workstation inventory
-
-As part of our ongoing compliance efforts and per our services agreement, we require a current inventory of workstations in use in the service of our account.
-
-Please respond to this message with the current inventory.
-
-The workstation inventory shall include the following fields:
-    * Serial number
-    * Custodian
-    * Full disk encryption status
-    * Malware protection status
-```

fixtures/standards/invalid-standard.yml

@@ -1,245 +0,0 @@
-name: TSC
-***CC1.1:
-  family: CC1
-  name: Integrity and Ethics
-  description: The entity demonstrates a commitment to integrity and ethical values
-CC1.2:
-  family: CC1
-  name: Board Independence
-  description: The board of directors demonstrates independence from management and exercises oversight of the development and performance of internal control
-CC1.3:
-  family: CC1
-  name: Organizational Structure
-  description: Management establishes, with board oversight, structures, reporting lines, and appropriate authorities and responsibilities in the pursuit of objectives
-CC1.4:
-  family: CC1
-  name: Hiring, Training and Retention
-  description: The entity demonstrates a commitment to attract, develop, and retain competent individuals in alignment with objectives
-CC1.5:
-  family: CC1
-  name: Individual Accountability
-  description: The entity holds individuals accountable for their internal control responsibilities in the pursuit of objectives.
-CC2.1:
-  family: CC2
-  name: Use of Information Systems
-  description: The entity obtains or generates and uses relevant, quality information to support the functioning of internal control
-CC2.2:
-  family: CC2
-  name: Use of Communication Systems, Internal
-  description: The entity internally communicates information, including objectives and responsibilities for internal control, necessary to support the functioning of internal control
-CC2.3:
-  family: CC2
-  name: Use of Communication Systems, External
-  description: The entity communicates with external parties regarding matters affecting the functioning of internal control
-CC3.1:
-  family: CC3
-  name: Objectives
-  description: The entity specifies objectives with sufficient clarity to enable the identification and assessment of risks relating to objectives
-CC3.2:
-  family: CC3
-  name: Risk to Objectives
-  description: The entity identifies risks to the achievement of its objectives across the entity and analyzes risks as a basis for determining how the risks should be managed
-CC3.3:
-  family: CC3
-  name: Fraud Risk to Objectives
-  description: The entity considers the potential for fraud in assessing risks to the achievement of objectives
-CC3.4:
-  family: CC3
-  name: Impact of Changes
-  description: The entity identifies and assesses changes that could significantly impact the system of internal control
-CC4.1:
-  family: CC4
-  name: Monitoring
-  description: The entity selects, develops, and performs ongoing and/or separate evaluations to ascertain whether the components of internal control are present and functioning
-CC4.2:
-  family: CC4
-  name: Remediation
-  description: The entity evaluates and communicates internal control deficiencies in a timely manner to those parties responsible for taking corrective action, including senior management and the board of directors, as appropriate
-CC5.1:
-  family: CC5
-  name: Objective Risk Mitigation
-  description: The entity selects and develops control activities that contribute to the mitigation of risks to the achievement of objectives to acceptable levels
-CC5.2:
-  family: CC5
-  name: Technology Controls
-  description: The entity also selects and develops general control activities over technology to support the achievement of objectives
-CC5.3:
-  family: CC5
-  name: Established Policies
-  description: The entity deploys control activities through policies that establish what is expected and in procedures that put policies into action
-CC6.1:
-  family: CC6
-  name: Logical Access
-  description: The entity implements logical access security software, infrastructure, and architectures over protected information assets to protect them from security events to meet the entity’s objectives
-CC6.2:
-  family: CC6
-  name: User Access
-  description: Prior to issuing system credentials and granting system access, the entity registers and authorizes new internal and external users whose access is administered by the entity. For those users whose access is administered by the entity, user system credentials are removed when user access is no longer authorized
-CC6.3:
-  family: CC6
-  name: Role-Based Access
-  description: The entity authorizes, modifies, or removes access to data, software, functions, and other protected information assets based on roles, responsibilities, or the system design and changes, giving consideration to the concepts of least privilege and segregation of duties, to meet the entity’s objectives
-CC6.4:
-  family: CC6
-  name: Physical Access
-  description: The entity restricts physical access to facilities and protected information assets (for example, data center facilities, back-up media storage, and other sensitive locations) to authorized personnel to meet the entity’s objectives
-CC6.5:
-  family: CC6
-  name: Data Disposal
-  description: The entity discontinues logical and physical protections over physical assets only after the ability to read or recover data and software from those assets has been diminished and is no longer required to meet the entity’s objectives
-CC6.6:
-  family: CC6
-  name: External Threats
-  description: The entity implements logical access security measures to protect against threats from sources outside its system boundaries
-CC6.7:
-  family: CC6
-  name: Data Custody and Transmission
-  description: The entity restricts the transmission, movement, and removal of information to authorized internal and external users and processes, and protects it during transmission, movement, or removal to meet the entity’s objectives
-CC6.8:
-  family: CC6
-  name: Malware Detection
-  description: The entity implements controls to prevent or detect and act upon the introduction of unauthorized or malicious software to meet the entity’s objectives
-CC7.1:
-  family: CC7
-  name: Vulnerability Detection
-  description: To meet its objectives, the entity uses detection and monitoring procedures to identify (1) changes to configurations that result in the introduction of new vulnerabilities, and (2) susceptibilities to newly discovered vulnerabilities
-CC7.2:
-  family: CC7
-  name: Anomaly Detection
-  description: The entity monitors system components and the operation of those components for anomalies that are indicative of malicious acts, natural disasters, and errors affecting the entity’s ability to meet its objectives; anomalies are analyzed to determine whether they represent security events
-CC7.3:
-  family: CC7
-  name: Security Incident Evaluation
-  description: The entity evaluates security events to determine whether they could or have resulted in a failure of the entity to meet its objectives (security incidents) and, if so, takes actions to prevent or address such failures
-CC7.4:
-  family: CC7
-  name: Security Incident Response Plan
-  description: The entity responds to identified security incidents by executing a defined incident response program to understand, contain, remediate, and communicate security incidents, as appropriate
-CC7.5:
-  family: CC7
-  name: Security Incident Response Execution
-  description: The entity identifies, develops, and implements activities to recover from identified security incidents
-CC8.1:
-  family: CC8
-  name: Change Control
-  description: The entity authorizes, designs, develops or acquires, configures, documents, tests, approves, and implements changes to infrastructure, data, software, and procedures to meet its objectives
-CC9.1:
-  family: CC9
-  name: Disruption Risk Mitigation
-  description: The entity identifies, selects, and develops risk mitigation activities for risks arising from potential business disruptions
-CC9.2:
-  family: CC9
-  name: Vendor Risk Management
-  description: The entity assesses and manages risks associated with vendors and business partners
-A1.1:
-  family: A1
-  name: Capacity Planning
-  description: The entity maintains, monitors, and evaluates current processing capacity and use of system components (infrastructure, data, and software) to manage capacity demand and to enable the implementation of additional capacity to help meet its objectives
-A1.2:
-  family: A1
-  name: Backup and Recovery
-  description: The entity authorizes, designs, develops or acquires, implements, operates, approves, maintains, and monitors environmental protections, software, data back-up processes, and recovery infrastructure to meet its objectives
-A1.3:
-  family: A1
-  name: Recovery Testing
-  description: The entity tests recovery plan procedures supporting system recovery to meet its objectives
-C1.1:
-  family: C1
-  name: Confidential Information Identification
-  description: The entity identifies and maintains confidential information to meet the entity’s objectives related to confidentiality
-C1.2:
-  family: C1
-  name: Confidential Information Disposal
-  description: The entity disposes of confidential information to meet the entity’s objectives related to confidentiality.
-PI1.1:
-  family: PI1
-  name: Processing Integrity Monitoring
-  description: The entity obtains or generates, uses, and communicates relevant, quality information regarding the objectives related to processing, including definitions of data processed and product and service speci cations, to support the use of products and services
-PI1.2:
-  family: PI1
-  name: Processing Integrity Accuracy
-  description: The entity implements policies and procedures over system inputs, including controls over completeness and accuracy, to result in products, services, and reporting to meet the entity’s objectives
-PI1.3:
-  family: PI1
-  name: Processing Integrity Operations
-  description: The entity implements policies and procedures over system processing to result in products, services, and reporting to meet the entity’s objectives
-PI1.4:
-  family: PI1
-  name: Processing Integrity Outputs
-  description: The entity implements policies and procedures to make available or deliver output completely, accurately, and timely in accordance with specifications to meet the entity’s objectives
-PI1.5:
-  family: PI1
-  name: Processing Integrity Backups
-  description: The entity implements policies and procedures to store inputs, items in processing, and outputs completely, accurately, and timely in accordance with system specifications to meet the entity’s objectives
-P1.1:
-  family: P1
-  name: Privacy Notification
-  description: The entity provides notice to data subjects about its privacy practices to meet the entity’s objectives related to privacy. The notice is updated and communicated to data subjects in a timely manner for changes to the entity’s privacy practices, including changes in the use of personal information, to meet the entity’s objectives related to privacy
-P2.1:
-  family: P2
-  name: Privacy Consent and Choice
-  description: The entity communicates choices available regarding the collection, use, retention, disclosure, and disposal of personal information to the data subjects and the consequences, if any, of each choice. Explicit consent for the collection, use, retention, disclosure, and disposal of personal information is obtained from data subjects or other authorized persons, if required. Such consent is obtained only for the intended purpose of the information to meet the entity’s objectives related to privacy. The entity’s basis for determining implicit consent for the collection, use, retention, disclosure, and disposal of personal information is documented
-P3.1:
-  family: P3
-  name: Personal Information Collection
-  description: Personal information is collected consistent with the entity’s objectives related to privacy
-P3.2:
-  family: P3
-  name: Explicit Consent
-  description: For information requiring explicit consent, the entity communicates the need for such consent, as well as the consequences of a failure to provide consent for the request for personal information, and obtains the consent prior to the collection of the information to meet the entity’s objectives related to privacy
-P4.1:
-  family: P4
-  name: Proper Use of Personal Information
-  description: The entity limits the use of personal information to the purposes identified in the entity’s objectives related to privacy
-P4.2:
-  family: P4
-  name: Personal Information Retention
-  description: The entity retains personal information consistent with the entity’s objectives related to privacy
-P4.3:
-  family: P4
-  name: Personal Information Disposal
-  description: The entity securely disposes of personal information to meet the entity’s objectives related to privacy
-P5.1:
-  family: P5
-  name: Data Subject Access
-  description: The entity grants identified and authenticated data subjects the ability to access their stored personal information for review and, upon request, provides physical or electronic copies of that information to data subjects to meet the entity’s objectives related to privacy. If access is denied, data subjects are informed of the denial and reason for such denial, as required, to meet the entity’s objectives related to privacy
-P5.2:
-  family: P5
-  name: Data Subject Amendment
-  description: The entity corrects, amends, or appends personal information based on information provided by data subjects and communicates such information to third parties, as committed or required, to meet the entity’s objectives related to privacy. If a request for correction is denied, data subjects are informed of the denial and reason for such denial to meet the entity’s objectives related to privacy
-P6.1:
-  family: P6
-  name: Consent for Third Party Disclosure
-  description: The entity discloses personal information to third parties with the explicit consent of data subjects, and such consent is obtained prior to disclosure to meet the entity’s objectives related to privacy
-P6.2:
-  family: P6
-  name: Authorized Disclosures
-  description: The entity creates and retains a complete, accurate, and timely record of authorized disclosures of personal information to meet the entity’s objectives related to privacy
-P6.3:
-  family: P6
-  name: Unauthorized Disclosures
-  description: The entity creates and retains a complete, accurate, and timely record of detected or reported unauthorized disclosures (including breaches) of personal information to meet the entity’s objectives related to privacy
-P6.4:
-  family: P6
-  name: Appropriate Third Party Disclosure
-  description: The entity obtains privacy commitments from vendors and other third parties who have access to personal information to meet the entity’s objectives related to privacy. The entity assesses those parties’ compliance on a periodic and as-needed basis and takes corrective action, if necessary
-P6.5:
-  family: P6
-  name: Unauthorized Third Party Disclosure
-  description: The entity obtains commitments from vendors and other third parties with access to personal information to notify the entity in the event of actual or suspected unauthorized disclosures of personal information. Such notifications are reported to appropriate personnel and acted on in accordance with established incident response procedures to meet the entity’s objectives related to privacy
-P6.6:
-  family: P6
-  name: Notification of Unauthorized Third Party Disclosure
-  description: The entity provides notification of breaches and incidents to affected data subjects, regulators, and others to meet the entity’s objectives related to privacy
-P6.7:
-  family: P6
-  name: Accounting of Personal Information
-  description: The entity provides data subjects with an accounting of the personal information held and disclosure of the data subjects’ personal information, upon the data subjects’ request, to meet the entity’s objectives related to privacy
-P7.1:
-  family: P7
-  name: Accuracy of Personal Information
-  description: The entity collects and maintains accurate, up-to-date, complete, and relevant personal information to meet the entity’s objectives related to privacy
-P8.1:
-  family: P8
-  name: Personal Information Dispute Resolution
-  description: The entity implements a process for receiving, addressing, resolving, and communicating the resolution of inquiries, complaints, and disputes from data subjects and others and periodically monitors compliance to meet the entity’s objectives related to privacy. Corrections and other necessary actions related to identified deficiencies are made or taken in a timely manner

go.mod

@@ -1,73 +1,50 @@
 module github.com/strongdm/comply
 
-go 1.17
+go 1.12
 
 require (
-	github.com/Clever/gitsem v1.1.0
-	github.com/Microsoft/go-winio v0.5.0 // indirect
-	github.com/aktau/github-release v0.10.0
-	github.com/andygrunwald/go-jira v1.14.0
-	github.com/containerd/containerd v1.5.10 // indirect
+	github.com/Clever/gitsem v1.0.4
+	github.com/Microsoft/go-winio v0.4.14 // indirect
+	github.com/aktau/github-release v0.8.1
+	github.com/andygrunwald/go-jira v1.12.0
 	github.com/containous/go-bindata v1.0.0
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/davecgh/go-spew v1.1.1
-	github.com/docker/docker v20.10.9+incompatible
+	github.com/docker/distribution v2.7.1+incompatible // indirect
+	github.com/docker/docker v1.13.1
 	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
 	github.com/elazarl/go-bindata-assetfs v1.0.1
-	github.com/fatih/color v1.13.0
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/github-release/github-release v0.10.0 // indirect
-	github.com/gohugoio/hugo v0.88.1
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/fatih/color v1.9.0
+	github.com/fatih/structs v1.1.0 // indirect
+	github.com/github-release/github-release v0.8.1 // indirect
+	github.com/gohugoio/hugo v0.75.0
 	github.com/google/go-github v17.0.0+incompatible
-	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/gorilla/websocket v1.4.2
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+	github.com/hashicorp/go-retryablehttp v0.6.7 // indirect
+	github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1 // indirect
 	github.com/jcelliott/lumber v0.0.0-20160324203708-dd349441af25 // indirect
-	github.com/joho/godotenv v1.4.0
-	github.com/juju/ansiterm v0.0.0-20210929141451-8b71cc96ebdc // indirect
-	github.com/kevinburke/rest v0.0.0-20210506044642-5611499aa33c // indirect
-	github.com/manifoldco/promptui v0.8.0
-	github.com/mattn/go-colorable v0.1.11 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/kevinburke/rest v0.0.0-20200429221318-0d2892b400f8 // indirect
+	github.com/lunixbochs/vtclean v1.0.0 // indirect
+	github.com/manifoldco/promptui v0.7.0
+	github.com/mattn/go-colorable v0.1.7 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/nanobox-io/golang-scribble v0.0.0-20190309225732-aa3e7c118975
-	github.com/olekukonko/tablewriter v0.0.5
+	github.com/olekukonko/tablewriter v0.0.4
+	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/robfig/cron v1.2.0
+	github.com/russross/blackfriday/v2 v2.0.1
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
-	github.com/urfave/cli v1.22.5
-	github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
-	github.com/xanzy/go-gitlab v0.51.1
-	github.com/yosssi/ace v0.0.5
-	golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b // indirect
-	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
-	golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e // indirect
-	google.golang.org/grpc v1.41.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0
-)
-
-require (
-	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
-	github.com/docker/distribution v2.8.0+incompatible // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/fatih/structs v1.1.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/lunixbochs/vtclean v1.0.0 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.2 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/trivago/tgo v1.0.7 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	github.com/urfave/cli v1.22.4
+	github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
+	github.com/xanzy/go-gitlab v0.30.1
+	github.com/yosssi/ace v0.0.5
+	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
+	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
+	golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
 	gopkg.in/blang/semver.v1 v1.1.0 // indirect
+	gopkg.in/yaml.v2 v2.3.0
 )

internal/cli/app.go

@@ -135,12 +135,12 @@ func notifyVersion(c *cli.Context) error {
 }
 
 func pandocMustExist(c *cli.Context) error {
-	eitherMustExistErr := fmt.Errorf("\n\nPlease install either Docker or the pandoc package and re-run `%s`. Find OS-specific pandoc installation instructions at: https://pandoc.org/installing.html", c.Command.Name)
+	eitherMustExistErr := fmt.Errorf("\n\nPlease install either Docker or the pandoc package and re-run `%s`. Find OS-specific pandoc installation instructions at: [TODO]", c.Command.Name)
 
-	pandocBinaryExistErr, found, goodVersion, pdfLatex := pandocBinaryMustExist(c)
+	pandocExistErr, found, goodVersion, pdfLatex := pandocBinaryMustExist(c)
 	dockerExistErr, inPath, isRunning := dockerMustExist(c)
 
-	config.SetPandoc(pandocBinaryExistErr == nil, dockerExistErr == nil)
+	config.SetPandoc(pandocExistErr == nil, dockerExistErr == nil)
 	check := func(b bool) string {
 		if b {
 			return "✔"
@@ -150,7 +150,7 @@ func pandocMustExist(c *cli.Context) error {
 
 	}
 
-	if pandocBinaryExistErr != nil && dockerExistErr != nil {
+	if pandocExistErr != nil && dockerExistErr != nil {
 
 		fmt.Printf(`
 [%s] pandoc binary installed and in PATH
@@ -165,20 +165,14 @@ func pandocMustExist(c *cli.Context) error {
 	}
 
 	// if we don't have pandoc, but we do have docker, execute a pull
-	if !pandocImageExists(context.Background()) && ((pandocBinaryExistErr != nil && dockerExistErr == nil) || config.WhichPandoc() == config.UseDocker) {
-		canPullPandoc := strings.TrimSpace(strings.ToLower(os.Getenv("COMPLY_USE_LOCAL_PANDOC"))) != "true"
-		if canPullPandoc {
-			fmt.Println("Pulling docker image")
-			dockerPull(c)
-		} else {
-			return fmt.Errorf("Local Pandoc not found. Please set COMPLY_USE_LOCAL_PANDOC to false")
-		}
+	if (pandocExistErr != nil && dockerExistErr == nil) || config.WhichPandoc() == config.UseDocker {
+		dockerPull(c)
 	}
 
 	return nil
 }
 
-var pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
+func pandocBinaryMustExist(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
 	cmd := exec.Command("pandoc", "-v")
 	outputRaw, err := cmd.Output()
 
@@ -236,7 +230,7 @@ var pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, p
 	return e, found, goodVersion, pdfLatex
 }
 
-var dockerMustExist = func(c *cli.Context) (e error, inPath, isRunning bool) {
+func dockerMustExist(c *cli.Context) (e error, inPath, isRunning bool) {
 	dockerErr := fmt.Errorf("Docker must be available in order to run `%s`", c.Command.Name)
 
 	inPath = true
@@ -263,26 +257,7 @@ var dockerMustExist = func(c *cli.Context) (e error, inPath, isRunning bool) {
 	return nil, inPath, isRunning
 }
 
-var pandocImageExists = func(ctx context.Context) bool {
-	cli, err := client.NewEnvClient()
-	if err != nil {
-		return false
-	}
-	options := types.ImageListOptions{All: true}
-	imageList, err := cli.ImageList(ctx, options)
-	if err != nil {
-		return false
-	}
-	for _, image := range imageList {
-		if len(image.RepoTags) > 0 && strings.Contains(image.RepoTags[0], "strongdm/pandoc:edge") {
-			return true
-		}
-	}
-
-	return false
-}
-
-var dockerPull = func(c *cli.Context) error {
+func dockerPull(c *cli.Context) error {
 	dockerErr := fmt.Errorf("Docker must be available in order to run `%s`", c.Command.Name)
 
 	ctx := context.Background()
@@ -300,7 +275,7 @@ var dockerPull = func(c *cli.Context) error {
 
 		select {
 		case <-longishPull:
-			fmt.Print("Pulling strongdm/pandoc:edge Docker image (this will take some time) ")
+			fmt.Print("Pulling strongdm/pandoc:latest Docker image (this will take some time) ")
 
 			go func() {
 				for {
@@ -319,7 +294,7 @@ var dockerPull = func(c *cli.Context) error {
 		}
 	}()
 
-	r, err := cli.ImagePull(ctx, "strongdm/pandoc:edge", types.ImagePullOptions{})
+	r, err := cli.ImagePull(ctx, "strongdm/pandoc:latest", types.ImagePullOptions{})
 	if err != nil {
 		return dockerErr
 	}
@@ -352,7 +327,7 @@ func cleanContainers(c *cli.Context) error {
 
 	for _, c := range containers {
 		// assume this container was leftover from previous aborted run
-		if strings.HasPrefix(c.Image, "strongdm/pandoc:edge") {
+		if strings.HasPrefix(c.Image, "strongdm/pandoc") {
 			d := time.Second * 2
 			err = cli.ContainerStop(ctx, c.ID, &d)
 			if err != nil {

internal/cli/app_test.go

@@ -1,189 +0,0 @@
-package cli
-
-import (
-	"context"
-	"errors"
-	"os"
-	"reflect"
-	"testing"
-
-	"github.com/strongdm/comply/internal/util"
-	"github.com/urfave/cli"
-)
-
-type PandocMustExist struct{}
-
-func TestPandocMustExist(t *testing.T) {
-	util.ExecuteTests(t, reflect.TypeOf(PandocMustExist{}), beforeEach, nil)
-}
-
-func beforeEach() {
-	util.MockConfig()
-}
-
-func (tg PandocMustExist) WhenBinaryExists(t *testing.T) {
-	dockerPullCalled := false
-
-	pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
-		return nil, true, true, true
-	}
-
-	dockerMustExist = func(c *cli.Context) (e error, inPath bool, isRunning bool) {
-		return errors.New("docker doesn't exist"), false, false
-	}
-
-	pandocImageExists = func(ctx context.Context) bool {
-		return false
-	}
-
-	dockerPull = func(c *cli.Context) error {
-		dockerPullCalled = true
-		return nil
-	}
-
-	pandocMustExist(&cli.Context{})
-
-	if dockerPullCalled != false {
-		t.Fatal("Docker was pulled")
-	}
-}
-
-func (tg PandocMustExist) WhenImageExists(t *testing.T) {
-	dockerPullCalled := false
-
-	pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
-		return errors.New("binary doesn't exist"), false, true, true
-	}
-
-	dockerMustExist = func(c *cli.Context) (e error, inPath bool, isRunning bool) {
-		return errors.New("docker doesn't exist"), false, false
-	}
-
-	pandocImageExists = func(ctx context.Context) bool {
-		return true
-	}
-
-	dockerPull = func(c *cli.Context) error {
-		dockerPullCalled = true
-		return nil
-	}
-
-	pandocMustExist(&cli.Context{})
-
-	if dockerPullCalled != false {
-		t.Fatal("Docker was pulled")
-	}
-}
-
-func (tg PandocMustExist) WhenBinaryAndImageDontExists(t *testing.T) {
-	dockerPullCalled := false
-
-	pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
-		return errors.New("binary doesn't exist"), false, false, false
-	}
-
-	dockerMustExist = func(c *cli.Context) (e error, inPath bool, isRunning bool) {
-		return nil, true, false
-	}
-
-	pandocImageExists = func(ctx context.Context) bool {
-		return false
-	}
-
-	dockerPull = func(c *cli.Context) error {
-		dockerPullCalled = true
-		return nil
-	}
-
-	pandocMustExist(&cli.Context{})
-
-	if dockerPullCalled != true {
-		t.Fatal("Docker wasn't pulled")
-	}
-}
-
-func (tg PandocMustExist) WhenCannotPullPandoc(t *testing.T) {
-	dockerPullCalled := false
-
-	pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
-		return errors.New("binary doesn't exist"), false, false, false
-	}
-
-	dockerMustExist = func(c *cli.Context) (e error, inPath bool, isRunning bool) {
-		return errors.New("docker doesn't exist"), false, false
-	}
-
-	pandocImageExists = func(ctx context.Context) bool {
-		return false
-	}
-
-	dockerPull = func(c *cli.Context) error {
-		dockerPullCalled = true
-		return nil
-	}
-
-	pandocMustExist(&cli.Context{})
-
-	if dockerPullCalled != false {
-		t.Fatal("Docker was pulled")
-	}
-}
-
-func (tg PandocMustExist) WhenMustUseLocalPandoc(t *testing.T) {
-	os.Setenv("COMPLY_USE_LOCAL_PANDOC", "true")
-	dockerPullCalled := false
-
-	pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
-		return errors.New("binary doesn't exist"), false, false, false
-	}
-
-	dockerMustExist = func(c *cli.Context) (e error, inPath bool, isRunning bool) {
-		return errors.New("docker doesn't exist"), false, false
-	}
-
-	pandocImageExists = func(ctx context.Context) bool {
-		return true
-	}
-
-	dockerPull = func(c *cli.Context) error {
-		dockerPullCalled = true
-		return nil
-	}
-
-	pandocMustExist(&cli.Context{})
-
-	if dockerPullCalled != false {
-		t.Fatal("Docker was pulled")
-	}
-
-	os.Clearenv()
-}
-
-func (tg PandocMustExist) WhenPandocDontExistsAndCannotPull(t *testing.T) {
-	os.Setenv("COMPLY_USE_LOCAL_PANDOC", "true")
-	dockerPullCalled := false
-
-	pandocBinaryMustExist = func(c *cli.Context) (e error, found, goodVersion, pdfLatex bool) {
-		return errors.New("binary doesn't exist"), false, false, false
-	}
-
-	dockerMustExist = func(c *cli.Context) (e error, inPath bool, isRunning bool) {
-		return nil, true, false
-	}
-
-	pandocImageExists = func(ctx context.Context) bool {
-		return false
-	}
-
-	dockerPull = func(c *cli.Context) error {
-		dockerPullCalled = true
-		return nil
-	}
-
-	pandocMustExist(&cli.Context{})
-
-	if dockerPullCalled != false {
-		t.Fatal("Docker was pulled")
-	}
-	os.Clearenv()
-}

internal/cli/todo.go

@@ -12,7 +12,7 @@ import (
 
 var todoCommand = cli.Command{
 	Name:   "todo",
-	Usage:  "list declared vs satisfied compliance controls",
+	Usage:  "list declared vs satisfied compliance criteria",
 	Action: todoAction,
 	Before: projectMustExist,
 }
@@ -24,42 +24,42 @@ func todoAction(c *cli.Context) error {
 	}
 
 	w := tablewriter.NewWriter(os.Stdout)
-	w.SetHeader([]string{"Standard", "Control", "Satisfied?", "Name"})
+	w.SetHeader([]string{"Framework", "Criterion", "Satisfied?", "Name"})
 
 	type row struct {
-		standard    string
-		controlKey  string
+		framework    string
+		criterionKey  string
 		satisfied   string
-		controlName string
+		criterionName string
 	}
 
-	satisfied := model.ControlsSatisfied(d)
+	satisfied := model.CriteriaSatisfied(d)
 
 	var rows []row
-	for _, std := range d.Standards {
-		for id, c := range std.Controls {
+	for _, std := range d.Frameworks {
+		for id, c := range std.Criteria{
 			sat := "NO"
 			if _, ok := satisfied[id]; ok {
 				sat = color.GreenString("YES")
 			}
 
 			rows = append(rows, row{
-				standard:    std.Name,
-				controlKey:  id,
+				framework:    std.Name,
+				criterionKey:  id,
 				satisfied:   sat,
-				controlName: c.Name,
+				criterionName: c.Name,
 			})
 		}
 	}
 
 	sort.Slice(rows, func(i, j int) bool {
-		return rows[i].controlKey < rows[j].controlKey
+		return rows[i].criterionKey < rows[j].criterionKey
 	})
 
 	w.SetAutoWrapText(false)
 
 	for _, r := range rows {
-		w.Append([]string{r.standard, r.controlKey, r.satisfied, r.controlName})
+		w.Append([]string{r.framework, r.criterionKey, r.satisfied, r.criterionName})
 	}
 
 	w.Render()

internal/config/config.go

@@ -82,7 +82,7 @@ func Exists() bool {
 }
 
 // Config is the parsed contents of ProjectRoot()/config.yml.
-var Config = func() *Project {
+func Config() *Project {
 	p := Project{}
 	cfgBytes, err := ioutil.ReadFile(filepath.Join(ProjectRoot(), "comply.yml"))
 	if err != nil {

internal/gitlab/gitlab.go

@@ -46,8 +46,8 @@ func (g *gitlabPlugin) api() *gitlab.Client {
 	defer g.clientMu.Unlock()
 	if g.client == nil {
 		// get go-gitlab client
-		// TODO: see if it's necessary to verify the error
-		gl, _ := gitlab.NewClient(g.token, gitlab.WithBaseURL(g.domain))
+		gl := gitlab.NewClient(nil, g.token)
+		gl.SetBaseURL(g.domain)
 		g.client = gl
 	}
 	return g.client
@@ -160,7 +160,7 @@ func (g *gitlabPlugin) Create(ticket *model.Ticket, labels []string) error {
 	options := &gitlab.CreateIssueOptions{
 		Title:       gitlab.String(ticket.Name),
 		Description: gitlab.String(ticket.Body),
-		Labels:      l,
+		Labels:      &l,
 	}
 	_, _, err := g.api().Issues.CreateIssue(g.reponame, options)
 	return err

internal/model/control.go

@@ -0,0 +1,24 @@
+package model
+
+import (
+  "time"
+	"html/template"
+)
+
+type Control struct {
+	Name            string      `yaml:"name"`
+	ID              string      `yaml:"identifier"`
+  Family          string      `yaml:"family"`
+  Owner           string      `yaml:"owner"`
+  GoverningPolicy []Policy    `yaml:"governingPolicy"`
+  Revisions       []Revision  `yaml:"revisions"`
+  Targets         Target      `yaml:"targets"`
+  Published       string      `yaml:"published"`
+
+  FullPath       string
+	OutputFilename string
+	ModifiedAt     time.Time
+
+	Body            string
+  BodyHTML        template.HTML
+}

internal/model/document.go

@@ -8,6 +8,7 @@ type Document struct {
 
 	Revisions      []Revision   `yaml:"majorRevisions"`
 	Satisfies      Satisfaction `yaml:"satisfies"`
+	Targets        Target       `yaml:"targets"`
 	FullPath       string
 	OutputFilename string
 	ModifiedAt     time.Time

internal/model/framework.go

@@ -1,18 +1,23 @@
 package model
 
-type Control struct {
+type Criterion struct {
 	Family      string `yaml:"family"`
 	Name        string `yaml:"name"`
 	Description string `yaml:"description"`
+
+	Satisfied   bool 
+	SatisfiedBy []string
 }
 
-type Standard struct {
+type Framework struct {
 	Name     string             `yaml:"name"`
-	Controls map[string]Control `yaml:",inline"`
+	Criteria map[string]Criterion `yaml:",inline"`
 }
 
-// ControlsSatisfied determines the unique controls currently satisfied by all Narratives, Policies, and Procedures
-func ControlsSatisfied(data *Data) map[string][]string {
+type Target map[string][]string
+
+// CriteriaSatisfied determines the unique criteria currently satisfied by all Narratives, Policies, and Procedures
+func CriteriaSatisfied(data *Data) map[string][]string {
 	satisfied := make(map[string][]string)
 
 	appendSatisfaction := func(in map[string][]string, k string, v string) []string {
@@ -25,22 +30,29 @@ func ControlsSatisfied(data *Data) map[string][]string {
 	}
 
 	for _, n := range data.Narratives {
-		for _, controlKeys := range n.Satisfies {
-			for _, key := range controlKeys {
+		for _, criteriaKeys := range n.Satisfies {
+			for _, key := range criteriaKeys {
 				satisfied[key] = appendSatisfaction(satisfied, key, n.OutputFilename)
 			}
 		}
 	}
 	for _, n := range data.Policies {
-		for _, controlKeys := range n.Satisfies {
-			for _, key := range controlKeys {
+		for _, criteriaKeys := range n.Satisfies {
+			for _, key := range criteriaKeys {
+				satisfied[key] = appendSatisfaction(satisfied, key, n.OutputFilename)
+			}
+		}
+	}
+	for _, n := range data.Controls {
+		for _, criteriaKeys := range n.Targets {
+			for _, key := range criteriaKeys {
 				satisfied[key] = appendSatisfaction(satisfied, key, n.OutputFilename)
 			}
 		}
 	}
 	for _, n := range data.Procedures {
-		for _, controlKeys := range n.Satisfies {
-			for _, key := range controlKeys {
+		for _, criteriaKeys := range n.Satisfies {
+			for _, key := range criteriaKeys {
 				satisfied[key] = appendSatisfaction(satisfied, key, n.OutputFilename)
 			}
 		}

internal/model/fs.go

@@ -26,11 +26,15 @@ func ReadData() (*Data, error) {
 	if err != nil {
 		return nil, err
 	}
+	controls, err := ReadControls()
+	if err != nil {
+		return nil, err
+	}
 	procedures, err := ReadProcedures()
 	if err != nil {
 		return nil, err
 	}
-	standards, err := ReadStandards()
+	frameworks, err := ReadFrameworks()
 	if err != nil {
 		return nil, err
 	}
@@ -39,8 +43,9 @@ func ReadData() (*Data, error) {
 		Tickets:    tickets,
 		Narratives: narratives,
 		Policies:   policies,
+		Controls: 	controls,
 		Procedures: procedures,
-		Standards:  standards,
+		Frameworks: frameworks,
 	}, nil
 }
 
@@ -67,30 +72,27 @@ func tickets(rawTickets []string) ([]*Ticket, error) {
 	return tickets, nil
 }
 
-// ReadStandards loads standard definitions from the filesystem.
-func ReadStandards() ([]*Standard, error) {
-	var standards []*Standard
+// ReadFrameworks loads standard definitions from the filesystem.
+func ReadFrameworks() ([]*Framework, error) {
+	var frameworks []*Framework
 
-	files, err := path.Standards()
+	files, err := path.Frameworks()
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to enumerate paths")
 	}
 
 	for _, f := range files {
-		s := &Standard{}
+		s := &Framework{}
 		sBytes, err := ioutil.ReadFile(f.FullPath)
 		if err != nil {
 			return nil, errors.Wrap(err, "unable to read "+f.FullPath)
 		}
 
-		err = yaml.Unmarshal(sBytes, &s)
-		if err != nil {
-			return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
-		}
-		standards = append(standards, s)
+		yaml.Unmarshal(sBytes, &s)
+		frameworks = append(frameworks, s)
 	}
 
-	return standards, nil
+	return frameworks, nil
 }
 
 // ReadNarratives loads narrative descriptions from the filesystem.
@@ -104,10 +106,7 @@ func ReadNarratives() ([]*Document, error) {
 
 	for _, f := range files {
 		n := &Document{}
-		mdmd, err := loadMDMD(f.FullPath)
-		if err != nil {
-			return nil, err
-		}
+		mdmd := loadMDMD(f.FullPath)
 		err = yaml.Unmarshal([]byte(mdmd.yaml), &n)
 		if err != nil {
 			return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
@@ -126,17 +125,13 @@ func ReadNarratives() ([]*Document, error) {
 func ReadProcedures() ([]*Procedure, error) {
 	var procedures []*Procedure
 	files, err := path.Procedures()
-
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to enumerate paths")
 	}
 
 	for _, f := range files {
 		p := &Procedure{}
-		mdmd, err := loadMDMD(f.FullPath)
-		if err != nil {
-			return nil, err
-		}
+		mdmd := loadMDMD(f.FullPath)
 		err = yaml.Unmarshal([]byte(mdmd.yaml), &p)
 		if err != nil {
 			return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
@@ -161,10 +156,7 @@ func ReadPolicies() ([]*Document, error) {
 
 	for _, f := range files {
 		p := &Document{}
-		mdmd, err := loadMDMD(f.FullPath)
-		if err != nil {
-			return nil, err
-		}
+		mdmd := loadMDMD(f.FullPath)
 		err = yaml.Unmarshal([]byte(mdmd.yaml), &p)
 		if err != nil {
 			return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
@@ -179,25 +171,48 @@ func ReadPolicies() ([]*Document, error) {
 	return policies, nil
 }
 
+// ReadControls loads control documents from the filesystem
+func ReadControls() ([]*Control, error) {
+	var controls []*Control
+
+	files, err := path.Controls()
+	if err != nil {
+		return nil, errors.Wrap(err, "unable to enumerate paths")
+	}
+
+	for _, f := range files {
+		c := &Control{}
+		mdmd := loadMDMD(f.FullPath)
+		err = yaml.Unmarshal([]byte(mdmd.yaml), &c)
+		if err != nil {
+			return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
+		}
+		c.Body = mdmd.body
+		c.FullPath = f.FullPath
+		c.ModifiedAt = f.Info.ModTime()
+		c.OutputFilename = fmt.Sprintf("%s-%s.pdf", config.Config().FilePrefix, c.ID)
+		controls = append(controls, c)
+	}
+		return controls, nil
+}
+
 type metadataMarkdown struct {
 	yaml string
 	body string
 }
 
-func loadMDMD(path string) (*metadataMarkdown, error) {
+func loadMDMD(path string) metadataMarkdown {
 	bytes, err := ioutil.ReadFile(path)
 	if err != nil {
 		panic(err)
 	}
+
 	content := string(bytes)
 	components := strings.Split(content, "---")
-	if components[0] == "" && (len(components) > 1) {
-		components = components[1:]
-	}
 	if len(components) == 1 {
-		return nil, errors.New(fmt.Sprintf("Malformed metadata markdown in %s, must be of the form: YAML\\n---\\nmarkdown content", path))
+		panic(fmt.Sprintf("Malformed metadata markdown in %s, must be of the form: YAML\\n---\\nmarkdown content", path))
 	}
-	item := components[0]
+	yaml := components[0]
 	body := strings.Join(components[1:], "---")
-	return &metadataMarkdown{item, body}, nil
+	return metadataMarkdown{yaml, body}
 }

internal/model/fs_test.go

@@ -1,238 +0,0 @@
-package model
-
-import (
-	"fmt"
-	"os"
-	"reflect"
-	"testing"
-
-	"github.com/strongdm/comply/internal/path"
-	"github.com/strongdm/comply/internal/util"
-)
-
-type ReadFiles struct{}
-
-func beforeEach() {
-	util.MockConfig()
-}
-
-func TestReadFiles(t *testing.T) {
-	util.ExecuteTests(t, reflect.TypeOf(ReadFiles{}), beforeEach, nil)
-}
-
-// TestReadNarratives calls model.ReadNarratives checking for a valid return value.
-func (tg ReadFiles) TestReadNarratives(t *testing.T) {
-	filePath := fmt.Sprintf("%s/narratives/control.md", util.GetRootPath())
-	fileInfo, _ := os.Lstat(filePath)
-	path.Narratives = func() ([]path.File, error) {
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	documents, err := ReadNarratives()
-	if err != nil {
-		t.Fatalf(`ReadNarratives() returned an error %v`, err)
-	}
-	if len(documents) != 1 {
-		t.Fatal(`Invalid number of documents`)
-	}
-	if documents[0].FullPath != filePath {
-		t.Fatalf(`Invalid document path %s`, documents[0].FullPath)
-	}
-}
-
-// TestReadNarrativesWhenThereAreNoNarratives calls model.ReadNarratives checking for a valid return when
-// there are no narratives to process
-func (tg ReadFiles) TestReadNarrativesWhenThereAreNoNarratives(t *testing.T) {
-	path.Narratives = func() ([]path.File, error) {
-		return []path.File{}, nil
-	}
-
-	documents, err := ReadNarratives()
-	if err != nil {
-		t.Fatalf(`ReadNarratives() returned an error %v`, err)
-	}
-	if len(documents) != 0 {
-		t.Fatal(`Invalid number of documents`)
-	}
-}
-
-// TestReadNarrativesFailsWhenInvalidNarrative calls model.ReadNarratives checking for an error return when
-// there is an invalid narrative
-func (tg ReadFiles) TestReadNarrativesFailsWhenInvalidNarrative(t *testing.T) {
-	path.Narratives = func() ([]path.File, error) {
-		filePath := fmt.Sprintf("%s/../fixtures/narratives/invalid-control.md", util.GetRootPath())
-		fileInfo, _ := os.Lstat(filePath)
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	_, err := ReadNarratives()
-	if err == nil {
-		t.Fatal(`ReadNarratives() was expected to fail`)
-	}
-}
-
-// TestReadProcedures calls model.ReadProcedures checking for a valid return value.
-func (tg ReadFiles) TestReadProcedures(t *testing.T) {
-	filePath := fmt.Sprintf("%s/procedures/workstation.md", util.GetRootPath())
-	fileInfo, _ := os.Lstat(filePath)
-	path.Procedures = func() ([]path.File, error) {
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	documents, err := ReadProcedures()
-	if err != nil {
-		t.Fatalf(`ReadProcedures() returned an error %v`, err)
-	}
-	if len(documents) != 1 {
-		t.Fatal(`Invalid number of documents`)
-	}
-	if documents[0].FullPath != filePath {
-		t.Fatalf(`Invalid document path %s`, documents[0].FullPath)
-	}
-}
-
-// TestReadProceduresWhenThereAreNoProcedures calls model.ReadProcedures checking for a valid return when
-// there are no procedures to process
-func (tg ReadFiles) TestReadProceduresWhenThereAreNoProcedures(t *testing.T) {
-	path.Procedures = func() ([]path.File, error) {
-		return []path.File{}, nil
-	}
-
-	documents, err := ReadProcedures()
-	if err != nil {
-		t.Fatalf(`ReadProcedures() returned an error %v`, err)
-	}
-	if len(documents) != 0 {
-		t.Fatal(`Invalid number of documents`)
-	}
-}
-
-// TestReadProceduresFailsWhenInvalidProcedure calls model.ReadProcedures checking for an error return when
-// there is an invalid procedure
-func (tg ReadFiles) TestReadProceduresFailsWhenInvalidProcedure(t *testing.T) {
-	path.Procedures = func() ([]path.File, error) {
-		filePath := fmt.Sprintf("%s/../fixtures/procedures/invalid-workstation.md", util.GetRootPath())
-		fileInfo, _ := os.Lstat(filePath)
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	_, err := ReadProcedures()
-	if err == nil {
-		t.Fatal(`ReadProcedures() was expected to fail`, err)
-	}
-}
-
-// TestReadPolicies calls model.ReadPolicies checking for a valid return value.
-func (tg ReadFiles) TestReadPolicies(t *testing.T) {
-	filePath := fmt.Sprintf("%s/policies/access.md", util.GetRootPath())
-	fileInfo, _ := os.Lstat(filePath)
-	path.Policies = func() ([]path.File, error) {
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	documents, err := ReadPolicies()
-	if err != nil {
-		t.Fatalf(`ReadPolicies() returned an error %v`, err)
-	}
-	if len(documents) != 1 {
-		t.Fatal(`Invalid number of documents`)
-	}
-	if documents[0].FullPath != filePath {
-		t.Fatalf(`Invalid document path %s`, documents[0].FullPath)
-	}
-}
-
-// TestReadPoliciesWhenThereAreNoPolicies calls model.ReadPolicies checking for a valid return when
-// there are no policies to process
-func (tg ReadFiles) TestReadPoliciesWhenThereAreNoPolicies(t *testing.T) {
-	path.Policies = func() ([]path.File, error) {
-		return []path.File{}, nil
-	}
-
-	documents, err := ReadPolicies()
-	if err != nil {
-		t.Fatalf(`ReadPolicies() returned an error %v`, err)
-	}
-	if len(documents) != 0 {
-		t.Fatal(`Invalid number of documents`)
-	}
-}
-
-// TestReadPoliciesFailsWhenInvalidPolicy calls model.ReadPolicies checking for an error return when
-// there is an invalid policy
-func (tg ReadFiles) TestReadPoliciesFailsWhenInvalidPolicy(t *testing.T) {
-	path.Policies = func() ([]path.File, error) {
-		filePath := fmt.Sprintf("%s/../fixtures/policies/invalid-access.md", util.GetRootPath())
-		fileInfo, _ := os.Lstat(filePath)
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	_, err := ReadPolicies()
-	if err == nil {
-		t.Fatal(`ReadPolicies() was expected to fail`, err)
-	}
-}
-
-// TestReadStandards calls model.ReadStandards checking for a valid return value.
-func (tg ReadFiles) TestReadStandards(t *testing.T) {
-	filePath := fmt.Sprintf("%s/standards/TSC-2017.yml", util.GetRootPath())
-	fileInfo, _ := os.Lstat(filePath)
-	path.Standards = func() ([]path.File, error) {
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	documents, err := ReadStandards()
-	if err != nil {
-		t.Fatalf(`ReadStandards() returned an error %v`, err)
-	}
-	if len(documents) != 1 {
-		t.Fatal(`Invalid number of documents`)
-	}
-}
-
-// TestReadStandardsWhenThereAreNoStandards calls model.ReadStandards checking for a valid return when
-// there are no standards to process
-func (tg ReadFiles) TestReadStandardsWhenThereAreNoStandards(t *testing.T) {
-	path.Standards = func() ([]path.File, error) {
-		return []path.File{}, nil
-	}
-
-	documents, err := ReadStandards()
-	if err != nil {
-		t.Fatalf(`ReadStandards() returned an error %v`, err)
-	}
-	if len(documents) != 0 {
-		t.Fatal(`Invalid number of documents`)
-	}
-}
-
-// TestReadStandardsFailsWhenInvalidStandard calls model.ReadStandards checking for an error return when
-// there is an invalid standard
-func (tg ReadFiles) TestReadStandardsFailsWhenInvalidStandard(t *testing.T) {
-	path.Standards = func() ([]path.File, error) {
-		filePath := fmt.Sprintf("%s/../fixtures/standards/invalid-standard.yml", util.GetRootPath())
-		fileInfo, _ := os.Lstat(filePath)
-		return []path.File{
-			{FullPath: filePath, Info: fileInfo},
-		}, nil
-	}
-
-	_, err := ReadStandards()
-	if err == nil {
-		t.Fatal(`ReadStandards() was expected to fail`, err)
-	}
-}

internal/model/model.go

@@ -1,12 +1,13 @@
 package model
 
 type Data struct {
-	Standards  []*Standard
-	Narratives []*Document
-	Policies   []*Document
-	Procedures []*Procedure
-	Tickets    []*Ticket
-	Audits     []*Audit
+	Frameworks	[]*Framework
+	Narratives 	[]*Document
+	Policies   	[]*Document
+	Controls 		[]*Control
+	Procedures 	[]*Procedure
+	Tickets    	[]*Ticket
+	Audits     	[]*Audit
 }
 
 type Revision struct {

internal/model/model_test.go

@@ -9,32 +9,36 @@ import (
 func TestMarshal(t *testing.T) {
 	d := Data{
 		Tickets: []*Ticket{
-			{
+			&Ticket{
 				ID: "t1",
 			},
 		},
 		Audits: []*Audit{
-			{
+			&Audit{
 				ID: "a1",
 			},
 		},
 		Procedures: []*Procedure{
-			{
-				ID: "pro1",
+			&Procedure{
+				Code: "pro1",
 			},
 		},
-		Policies: []*Document{
-			{
+		Policies: []*Policy{
+			&Policy{
 				Name: "pol1",
 			},
 		},
 	}
+
 	m, _ := json.Marshal(d)
+
 	encoded := string(m)
+
 	if !strings.Contains(encoded, "t1") ||
 		!strings.Contains(encoded, "a1") ||
 		!strings.Contains(encoded, "pro1") ||
 		!strings.Contains(encoded, "pol1") {
 		t.Error("identifier not found in marshalled string")
 	}
+
 }

internal/model/policy.go

@@ -0,0 +1,7 @@
+package model
+
+type Policy struct {
+  Name    string `yaml:"policyName"`
+  ID      string `yaml:"policyID"`
+  Clause  string `yaml:"policyClause"`
+}

internal/model/procedure.go

@@ -9,6 +9,7 @@ type Procedure struct {
 
 	Revisions      []Revision   `yaml:"majorRevisions"`
 	Satisfies      Satisfaction `yaml:"satisfies"`
+	Targets        Target      `yaml:"targets"`
 	FullPath       string
 	OutputFilename string
 	ModifiedAt     time.Time

internal/path/path.go

@@ -15,23 +15,28 @@ type File struct {
 	Info     os.FileInfo
 }
 
-// Standards lists all standard files.
-var Standards = func() ([]File, error) {
-	return filesFor("standards", "yml")
+// Frameworks lists all standard files.
+func Frameworks() ([]File, error) {
+	return filesFor("frameworks", "yaml")
 }
 
 // Narratives lists all narrative files.
-var Narratives = func() ([]File, error) {
+func Narratives() ([]File, error) {
 	return filesFor("narratives", "md")
 }
 
 // Policies lists all policy files.
-var Policies = func() ([]File, error) {
+func Policies() ([]File, error) {
 	return filesFor("policies", "md")
 }
 
+// Controls lists all control files.
+func Controls() ([]File, error) {
+	return filesFor("controls", "md")
+}
+
 // Procedures lists all procedure files.
-var Procedures = func() ([]File, error) {
+func Procedures() ([]File, error) {
 	return filesFor("procedures", "md")
 }
 

internal/render/controller.go

@@ -2,12 +2,14 @@ package render
 
 import (
 	"fmt"
-	"sort"
 	"time"
+	"html/template"
 
 	"github.com/pkg/errors"
 	"github.com/strongdm/comply/internal/config"
 	"github.com/strongdm/comply/internal/model"
+
+	"github.com/russross/blackfriday/v2"
 )
 
 type project struct {
@@ -16,8 +18,10 @@ type project struct {
 }
 
 type stats struct {
-	ControlsTotal     int
-	ControlsSatisfied int
+	ControlsTotal 		int
+
+	CriteriaTotal     int
+	CriteriaSatisfied int
 
 	ProcedureTotal      int
 	ProcedureOpen       int
@@ -30,21 +34,21 @@ type stats struct {
 
 type renderData struct {
 	// duplicates Project.OrganizationName
-	Name       string
-	Project    *project
-	Stats      *stats
-	Narratives []*model.Document
-	Policies   []*model.Document
-	Procedures []*model.Procedure
-	Standards  []*model.Standard
-	Tickets    []*model.Ticket
-	Controls   []*control
-	Links      *model.TicketLinks
+	Name       	string
+	Project    	*project
+	Stats      	*stats
+	Narratives 	[]*model.Document
+	Policies   	[]*model.Document
+	Controls		[]*model.Control
+	Procedures 	[]*model.Procedure
+	Frameworks	[]*model.Framework
+	Tickets    	[]*model.Ticket
+	Links      	*model.TicketLinks
 }
 
-type control struct {
-	Standard    string
-	ControlKey  string
+type criterion struct {
+	Framework    string
+	CriteriaKey  string
 	Name        string
 	Description string
 	Satisfied   bool
@@ -63,36 +67,27 @@ func load() (*model.Data, *renderData, error) {
 		Name:             fmt.Sprintf("%s Compliance Program", cfg.Name),
 	}
 
-	satisfied := model.ControlsSatisfied(modelData)
-	controls := make([]*control, 0)
-	for _, standard := range modelData.Standards {
-		for key, c := range standard.Controls {
+	satisfied := model.CriteriaSatisfied(modelData)
+	for _, framework := range modelData.Frameworks {
+		for key, c := range framework.Criteria{
 			satisfactions, ok := satisfied[key]
 			satisfied := ok && len(satisfactions) > 0
-			controls = append(controls, &control{
-				Standard:    standard.Name,
-				ControlKey:  key,
-				Name:        c.Name,
-				Description: c.Description,
-				Satisfied:   satisfied,
-				SatisfiedBy: satisfactions,
-			})
+			c.Satisfied = satisfied
+			c.SatisfiedBy = satisfactions
+			framework.Criteria[key] = c
 		}
 	}
-	sort.Slice(controls, func(i, j int) bool {
-		return controls[i].ControlKey < controls[j].ControlKey
-	})
 
 	rd := &renderData{}
 	rd.Narratives = modelData.Narratives
 	rd.Policies = modelData.Policies
+	rd.Controls = modelData.Controls
 	rd.Procedures = modelData.Procedures
-	rd.Standards = modelData.Standards
+	rd.Frameworks = modelData.Frameworks
 	rd.Tickets = modelData.Tickets
 	rd.Links = &model.TicketLinks{}
 	rd.Project = project
 	rd.Name = project.OrganizationName
-	rd.Controls = controls
 
 	ts, err := config.Config().TicketSystem()
 	if err != nil {
@@ -114,6 +109,12 @@ func loadWithStats() (*model.Data, *renderData, error) {
 		return nil, nil, err
 	}
 
+	// Convert the markdown body of each control to HTML
+	for _, n := range modelData.Controls {
+		b := []byte(n.Body)
+		n.BodyHTML = template.HTML(blackfriday.Run(b))
+	}
+
 	addStats(modelData, renderData)
 	return modelData, renderData, nil
 }
@@ -121,13 +122,14 @@ func loadWithStats() (*model.Data, *renderData, error) {
 func addStats(modelData *model.Data, renderData *renderData) {
 	stats := &stats{}
 
-	satisfied := model.ControlsSatisfied(modelData)
+	satisfied := model.CriteriaSatisfied(modelData)
+	stats.ControlsTotal += len(renderData.Controls)
 
-	for _, std := range renderData.Standards {
-		stats.ControlsTotal += len(std.Controls)
-		for controlKey := range std.Controls {
-			if _, ok := satisfied[controlKey]; ok {
-				stats.ControlsSatisfied++
+	for _, std := range renderData.Frameworks {
+		stats.CriteriaTotal += len(std.Criteria)
+		for criteriaKey := range std.Criteria{
+			if _, ok := satisfied[criteriaKey]; ok {
+				stats.CriteriaSatisfied++
 			}
 		}
 	}

internal/render/document.go

@@ -114,7 +114,7 @@ func preprocessDoc(data *renderData, pol *model.Document, fullPath string) error
 		for standard, keys := range pol.Satisfies {
 			rows += fmt.Sprintf("| %s | %s |\n", standard, strings.Join(keys, ", "))
 		}
-		satisfiesTable = fmt.Sprintf("|Standard|Controls Satisfied|\n|-------+--------------------------------------------|\n%s\nTable: Control satisfaction\n", rows)
+		satisfiesTable = fmt.Sprintf("|Framework|Criteria Satisfied|\n|-------+--------------------------------------------|\n%s\nTable: Criterion satisfaction\n", rows)
 	}
 
 	if len(pol.Revisions) > 0 {
@@ -135,12 +135,9 @@ func preprocessDoc(data *renderData, pol *model.Document, fullPath string) error
 %% %s
 
 ---
-header-includes: |
-	\usepackage{fancyhdr}
-	\pagestyle{fancy}
-	\fancyhead{}
-	\fancyhead[RO,RE]{%s}
-	\fancyfoot[LO,LE]{%s confidential %d}
+header-includes: yes
+head-content: "%s"
+foot-content: "%s confidential %d"
 ---
 
 %s

internal/render/pandoc.go

@@ -18,7 +18,10 @@ var pandocArgs = []string{"-f", "markdown+smart", "--toc", "-N", "--template", "
 
 func pandoc(outputFilename string, errOutputCh chan error) {
 	if config.WhichPandoc() == config.UsePandoc {
-		pandocPandoc(outputFilename, errOutputCh)
+		err := pandocPandoc(outputFilename)
+		if err != nil {
+			errOutputCh <- err
+		}
 	} else {
 		dockerPandoc(outputFilename, errOutputCh)
 	}
@@ -44,9 +47,9 @@ func dockerPandoc(outputFilename string, errOutputCh chan error) {
 	}
 
 	resp, err := cli.ContainerCreate(ctx, &container.Config{
-		Image: "strongdm/pandoc:edge",
+		Image: "strongdm/pandoc",
 		Cmd:   pandocCmd},
-		hc, nil, nil, "")
+		hc, nil, "")
 
 	if err != nil {
 		errOutputCh <- errors.Wrap(err, "unable to create Docker container")
@@ -61,20 +64,15 @@ func dockerPandoc(outputFilename string, errOutputCh chan error) {
 			errOutputCh <- errors.Wrap(err, "unable to remove container")
 			return
 		}
-		errOutputCh <- nil
 	}()
 
-	err = cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
-	if err != nil {
+	if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
 		errOutputCh <- errors.Wrap(err, "unable to start Docker container")
 		return
 	}
 
-	chanResult, chanErr := cli.ContainerWait(ctx, resp.ID, "not-running")
-	resultValue := <-chanResult
-
-	if resultValue.StatusCode != 0 {
-		err = <-chanErr
+	_, err = cli.ContainerWait(ctx, resp.ID)
+	if err != nil {
 		errOutputCh <- errors.Wrap(err, "error awaiting Docker container")
 		return
 	}
@@ -92,14 +90,12 @@ func dockerPandoc(outputFilename string, errOutputCh chan error) {
 }
 
 // 🐼
-func pandocPandoc(outputFilename string, errOutputCh chan error) error {
+func pandocPandoc(outputFilename string) error {
 	cmd := exec.Command("pandoc", append(pandocArgs, fmt.Sprintf("output/%s", outputFilename), fmt.Sprintf("output/%s.md", outputFilename))...)
 	outputRaw, err := cmd.CombinedOutput()
 	if err != nil {
 		fmt.Println(string(outputRaw))
-		errOutputCh <- errors.Wrap(err, "error calling pandoc")
-	} else {
-		errOutputCh <- nil
+		return errors.Wrap(err, "error calling pandoc")
 	}
 	return nil
 }

internal/render/pdf.go

@@ -26,12 +26,6 @@ func pdf(output string, live bool, errCh chan error, wg *sync.WaitGroup) {
 		}
 		for _, policy := range policies {
 			renderToFilesystem(&pdfWG, errOutputCh, data, policy, live)
-			err = <-errOutputCh
-			if err != nil {
-				errCh <- err
-				wg.Done()
-				return
-			}
 		}
 
 		narratives, err := model.ReadNarratives()
@@ -42,12 +36,6 @@ func pdf(output string, live bool, errCh chan error, wg *sync.WaitGroup) {
 
 		for _, narrative := range narratives {
 			renderToFilesystem(&pdfWG, errOutputCh, data, narrative, live)
-			err = <-errOutputCh
-			if err != nil {
-				errCh <- err
-				wg.Done()
-				return
-			}
 		}
 
 		pdfWG.Wait()

internal/render/site.go

@@ -13,8 +13,6 @@ import (
 	"github.com/yosssi/ace"
 )
 
-const BindAddress = "0.0.0.0"
-
 var ServePort int
 
 var upgrader = websocket.Upgrader{
@@ -96,13 +94,13 @@ func Build(output string, live bool) error {
 
 		go func() {
 			http.Handle("/", http.FileServer(http.Dir(filepath.Join(".", "output"))))
-			err := http.ListenAndServe(fmt.Sprintf("%s:%d", BindAddress, ServePort), nil)
+			err := http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", ServePort), nil)
 			if err != nil {
 				panic(err)
 			}
 		}()
 
-		fmt.Printf("Serving content of output/ at http://%s:%d (ctrl-c to quit)\n", BindAddress, ServePort)
+		fmt.Printf("Serving content of output/ at http://127.0.0.1:%d (ctrl-c to quit)\n", ServePort)
 	}
 	// PDF
 	wg.Add(1)

internal/render/watch.go

@@ -8,8 +8,7 @@ import (
 )
 
 func watch(errCh chan error) {
-	// TODO: study about the poll duration
-	b, err := watcher.New(300 * time.Millisecond, 0, false)
+	b, err := watcher.New(300 * time.Millisecond)
 	if err != nil {
 		errCh <- err
 		return
@@ -17,6 +16,7 @@ func watch(errCh chan error) {
 	b.Add("./templates/")
 	b.Add("./narratives/")
 	b.Add("./policies/")
+	b.Add("./controls/")
 	b.Add("./procedures/")
 
 	b.Add("./.comply/")
@@ -26,7 +26,7 @@ func watch(errCh chan error) {
 	go func() {
 		for {
 			select {
-			case e := <-b.Errors():
+			case e := <-b.Errors:
 				errCh <- e
 			case <-b.Events:
 				broadcast()

internal/theme/theme.go

@@ -29,8 +29,7 @@ func SaveTo(themeName string, replace map[string]string, saveDir string) error {
 				rootMdFile := string(MustAsset(name))
 
 				var w bytes.Buffer
-				var rootMdFileTemplate *template.Template
-				rootMdFileTemplate, err = template.New("rootMdFile").Parse(rootMdFile)
+				rootMdFileTemplate, err := template.New("rootMdFile").Parse(rootMdFile)
 				if err != nil {
 					w.WriteString(fmt.Sprintf("# Error processing template:\n\n%s\n", err.Error()))
 				} else {

internal/util/test_utils.go

@@ -1,52 +0,0 @@
-package util
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"github.com/strongdm/comply/internal/config"
-	"gopkg.in/yaml.v2"
-)
-
-type TestFixture func()
-
-func ExecuteTests(t *testing.T, testGroupType reflect.Type, beforeEach TestFixture, afterEach TestFixture) {
-	testGroup := reflect.New(testGroupType).Elem().Interface()
-	for i := 0; i < testGroupType.NumMethod(); i++ {
-		m := testGroupType.Method(i)
-		t.Run(m.Name, func(t *testing.T) {
-			if beforeEach != nil {
-				beforeEach()
-			}
-
-			in := []reflect.Value{reflect.ValueOf(testGroup), reflect.ValueOf(t)}
-			m.Func.Call(in)
-
-			if afterEach != nil {
-				afterEach()
-			}
-		})
-	}
-}
-
-func MockConfig() {
-	config.Config = func() *config.Project {
-		p := config.Project{}
-		cfgBytes, _ := ioutil.ReadFile(filepath.Join(GetRootPath(), "comply.yml.example"))
-		err := yaml.Unmarshal(cfgBytes, &p)
-		if err != nil {
-			return nil
-		}
-		return &p
-	}
-}
-
-func GetRootPath() string {
-	_, fileName, _, _ := runtime.Caller(0)
-	fileDir := filepath.Dir(fileName)
-	return fmt.Sprintf("%s/../../example", fileDir)
-}

themes/comply-blank/README.md

@@ -20,7 +20,7 @@ Assets are built using [`comply`](https://comply.strongdm.com), which can be ins
 
 # Publishing
 
-The `output/` directory contains all generated assets. Links in the HTML dashboard are relative, and all dependencies are included via direct CDN references. The entire `output/` directory, therefore, may be uploaded to an S3 bucket or another static asset host without further modification.
+The `output/` directory contains all generated assets. Links in the HTML dashboard a relative, and all dependencies are included via direct CDN references. The entire `output/` directory therefore may be uploaded to an S3 bucket or other static asset host without further modification.
 
 # Dashboard Status
 
@@ -57,4 +57,4 @@ comply build
 
 # publish static site from output/ directory
 upload.sh output/
-```
+```

themes/comply-blank/controls/README.md

@@ -0,0 +1,33 @@
+# Controls
+
+Controls explicitly state a specific action that the organization will take to enforce a Policy goal.
+
+## Format
+```
+name: Access Control Procedures
+family: Access Control
+identifier: AC-2
+governingPolicy:
+  - policyName: Access Onboarding and Termination
+    policyID: SDM-AOTP
+    policyClause: 1.1
+owner: Director, Security & Compliance
+published: 2020-01-01
+targets:
+  TSC 2017:
+    - CC6.1
+    - CC6.2
+    - CC6.3
+  NIST 800-53:
+    - AC-1
+revisions:
+  - date: Sep 1 2020
+    comment: Initial documentation of control
+---
+1. Develop, document, and disseminate to all employees:
+
+    1. Organizational access control policy that:
+
+        1. Addresses purpose, scope, roles, responsibilities, management commitment, coordination among organizational entities, and compliance; and
+
+```

themes/comply-blank/templates/index.ace

@@ -66,7 +66,7 @@ html lang=en
                   a onclick="javascript:show('procedures')" Procedures
               li.top-nav.standards
                 strong
-                  a onclick="javascript:show('standards')" Standards
+                  a onclick="javascript:show('frameworks')" Frameworks
               / li.top-nav.evidence
               /   a onclick="javascript:show('evidence')" Evidence Vault
     #overview.section.top-nav.container.content
@@ -76,17 +76,17 @@ html lang=en
       .columns.is-vcentered
         .column.is-one-third
           div
-            p.subtitle.is-3.has-text-centered Control Tracking
+            p.subtitle.is-3.has-text-centered CriterionTracking
         .column.has-text-centered
           div
-            p.heading Satisfied Controls
+            p.heading Satisfied Criteria
             p.title
-              {{.Stats.ControlsSatisfied}}
+              {{.Stats.CriteriaSatisfied}}
         .column.has-text-centered
           div
             p.heading Total Controls
             p.title
-              {{.Stats.ControlsTotal}}
+              {{.Stats.CriteriaTotal}}
       .columns.is-vcentered
         .column.is-one-third
           div
@@ -187,23 +187,23 @@ html lang=en
             td On demand
             {{end}}
           {{end}}
-    #standards.section.top-nav.container.content
+    #frameworks.section.top-nav.container.content
       blockquote
         h3
           p
-            strong Standards
-            | specify the controls satisfied by the compliance program.
+            strong Framework Targets
+            | specify the Frameworks and Framework Criteria targeted by the compliance program.
       table.table.is-size-4.is-fullwidth
         thead
           tr
-            th Control Key
+            th CriterionKey
             th Name
             th Satisfied?
             th Satisfied By
         tbody
-          {{range .Controls }}
+          {{range .Criteria}}
           tr
-            td {{.ControlKey}}
+            td {{.criteriaKey}}
             td
               strong {{.Name}}
               .subtitle {{.Description}}
@@ -234,4 +234,4 @@ html lang=en
           show(destination)
         }
       }
-    }
+    }

themes/comply-soc2/README.md

@@ -10,7 +10,7 @@ Compliance documents are organized as follows:
 narratives/     Narratives provide an overview of the organization and the compliance environment.
 policies/       Policies govern the behavior of employees and contractors.
 procedures/     Procedures prescribe specific steps that are taken in response to key events.
-standards/      Standards specify the controls satisfied by the compliance program.
+frameworks/     Frameworks specify the control criteria targeted by the compliance program.
 templates/      Templates control the output format of the HTML Dashboard and PDF assets.
 ```
 
@@ -20,7 +20,7 @@ Assets are built using [`comply`](https://comply.strongdm.com), which can be ins
 
 # Publishing
 
-The `output/` directory contains all generated assets. Links in the HTML dashboard are relative, and all dependencies are included via direct CDN references. The entire `output/` directory, therefore, may be uploaded to an S3 bucket or another static asset host without further modification.
+The `output/` directory contains all generated assets. Links in the HTML dashboard a relative, and all dependencies are included via direct CDN references. The entire `output/` directory therefore may be uploaded to an S3 bucket or other static asset host without further modification.
 
 # Dashboard Status
 

themes/comply-soc2/controls/README.md

@@ -0,0 +1,33 @@
+# Controls
+
+Controls explicitly state a specific action that the organization will take to enforce a Policy goal.
+
+## Format
+```
+name: Access Control Procedures
+family: Access Control
+identifier: AC-2
+governingPolicy:
+  - policyName: Access Onboarding and Termination
+    policyID: SDM-AOTP
+    policyClause: 1.1
+owner: Director, Security & Compliance
+published: 2020-01-01
+targets:
+  TSC 2017:
+    - CC6.1
+    - CC6.2
+    - CC6.3
+  NIST 800-53:
+    - AC-1
+revisions:
+  - date: Sep 1 2020
+    comment: Initial documentation of control
+---
+1. Develop, document, and disseminate to all employees:
+
+    1. Organizational access control policy that:
+
+        1. Addresses purpose, scope, roles, responsibilities, management commitment, coordination among organizational entities, and compliance; and
+
+```

themes/comply-soc2/frameworks/README.md

@@ -1,5 +1,5 @@
-# Standards
+# Frameworks
 
 All `yaml` files in this directory are assumed to conform to https://github.com/opencontrol/schemas/tree/master/kwalify/standard
 
-Adjust the target standard for this project by adding or removing line-items within each file, or adding/removing a standard file entirely.
+Adjust the target standard for this project by adding or removing line-items within each file, or adding/removing a standard file entirely.

themes/comply-soc2/frameworks/TSC-2017.yml

@@ -154,7 +154,7 @@ C1.2:
 PI1.1:
   family: PI1
   name: Processing Integrity Monitoring
-  description: The entity obtains or generates, uses, and communicates relevant, quality information regarding the objectives related to processing, including definitions of data processed and product and service speci cations, to support the use of products and services
+  description: The entity obtains or generates, uses, and communicates relevant, quality information regarding the objectives related to processing, including de nitions of data processed and product and service speci cations, to support the use of products and services
 PI1.2:
   family: PI1
   name: Processing Integrity Accuracy
@@ -166,11 +166,11 @@ PI1.3:
 PI1.4:
   family: PI1
   name: Processing Integrity Outputs
-  description: The entity implements policies and procedures to make available or deliver output completely, accurately, and timely in accordance with specifications to meet the entity’s objectives
+  description: The entity implements policies and procedures to make available or deliver output completely, accurately, and timely in accordance with speci cations to meet the entity’s objectives
 PI1.5:
   family: PI1
   name: Processing Integrity Backups
-  description: The entity implements policies and procedures to store inputs, items in processing, and outputs completely, accurately, and timely in accordance with system specifications to meet the entity’s objectives
+  description: The entity implements policies and procedures to store inputs, items in processing, and outputs completely, accurately, and timely in accordance with system speci cations to meet the entity’s objectives
 P1.1:
   family: P1
   name: Privacy Notification

themes/comply-soc2/narratives/control.md

@@ -1,4 +1,4 @@
-name: Control Environment Narrative
+name: CriterionEnvironment Narrative
 acronym: CEN
 satisfies:
   TSC:
@@ -15,7 +15,7 @@ majorRevisions:
     comment: Initial document
 ---
 
-# Control Environment Narrative
+# CriterionEnvironment Narrative
 
 The following provides a description of the control structure of {{.Name}}.
 
@@ -34,7 +34,7 @@ The intent of this description is to enumerate the logical, policy, and procedur
 
 {{.Name}} employs several policy controls to protect confidential data and ensure normal operation of its core product. These policies include, but are not limited to:
 
-- Access Control Policy
+- Access CriterionPolicy
 - Encryption Policy
 - Office Security Policy
 - Password Policy
@@ -75,7 +75,7 @@ TODO: Finalize these lists
 
 # Remediations
 
-{{.Name}} uses the outcomes of the aforementioned controls and procedures to identify shortcomings in the existing control environment. Once identified, these shortcomings are remediated by improving existing controls and procedures, and creating new controls and procedures as needed.
+{{.Name}} uses the outcomes of the aforementioned controls and procedures to identify shortcomings in the existing control environment. Once identified, these shortcomes are remediated by improving existing controls and procedures, and creating new controls and procedures as needed.
 
 # Communications
 
@@ -87,7 +87,7 @@ TODO: Finalize these lists
 
 - Slack
 - Email
-- GitHub ticketing
+- Github ticketing
 
 ## External
 

themes/comply-soc2/policies/classification.md

@@ -66,7 +66,7 @@ a. When classifying information, the level of confidentiality is determined by:
 +-------------------+------------------+---------------------------+---------------------------+
 | Restricted        | Restricted       | Unauthorized access to    | Information is available  |
 |                   |                  | information may cause     | to a specific group of    |
-|                   |                  | considerable damage to    | employees and authorized |
+|                   |                  | considerable damage to    | employees and authhorized |
 |                   |                  | the business and/or       | third parties.            |
 |                   |                  | the organization's        |                           |
 |                   |                  | reputation.               |                           |           

themes/comply-soc2/policies/datacenter.md

@@ -22,7 +22,7 @@ a. This policy defines the policies and rules governing data centers and secure
 
 # Policy
 
-a. The following locations are classified by the organization as secure areas and are governed by this policy:
+a. The following locations are classified by the organization as secure areas and are goverened by this policy:
 
     i. [list all data center locations and secure areas under the organization’s control]
 

themes/comply-soc2/policies/disaster.md

@@ -8,8 +8,7 @@ majorRevisions:
   - date: Jun 1 2018
     comment: Initial document
 ---
-
-# Purpose and Scope
+#Purpose and Scope 
 
 a. The purpose of this policy is to define the organization’s procedures to recover Information Technology (IT) infrastructure and IT services within set deadlines in the case of a disaster or other disruptive incident. The objective of this plan is to complete the recovery of IT infrastructure and IT services within a set Recovery Time Objective (RTO).
 

themes/comply-soc2/policies/retention.md

@@ -10,14 +10,14 @@ majorRevisions:
     comment: Initial document
 ---
 
-# Appendices
+#Appendices
 Appendix A: Retention Periods
 
 # Purpose and Scope
 
 a. This data retention policy defines the objectives and requirements for data retention within the organization.
 
-a. This policy covers all data within the organization’s custody or control, regardless of the medium the data is stored in (electronic form, paper form, etc.) Within this policy, the medium which holds data is referred to as information, no matter what form it is in.
+a. This policy covers all data within the organization’s custody or control, irregardless of the medium the data is stored in (electronic form, paper form, etc.) Within this policy, the medium which holds data is referred to as information, no matter what form it is in.
 
 a. This policy applies to all users of information systems within the organization. This typically includes employees and contractors, as well as any external parties that come into contact with systems and information the organization owns or controls (hereinafter referred to as “users”). This policy must be made readily available to all users.
 

themes/comply-soc2/policies/risk.md

@@ -87,13 +87,13 @@ Table 3: Description of Consequence Levels and Criteria
 | Moderate        | 1               | Either existing security controls have most provided an      |     
 |                 |                 | adequate level of protection or the probability of the risk  |                    
 |                 |                 | being realized is moderate. Some minor incidents may have    |
-|                 |                 | occurred. New incidents are possible, but not highly likely.  |
+|                 |                 | occured. New incidents are possible, but not highly likely.  |
 +-----------------+-----------------+--------------------------------------------------------------+
 |                 |                 |                                                              |  
 +-----------------+-----------------+--------------------------------------------------------------+
 | High            | 2               | Either existing security controls are not in place or        |
 |                 |                 | ineffective; there is a high probability of the risk being   |                    
-|                 |                 | realized. Incidents have a high likelihood of occurring in the|
+|                 |                 | realized. Incidents have a high likelihood of occuring in the|
 |                 |                 | future.                                             |
 +-----------------+-----------------+--------------------------------------------------------------+
 |                 |                 |                                                              |  

themes/comply-soc2/templates/index.ace

@@ -66,7 +66,7 @@ html lang=en
                   a onclick="javascript:show('procedures')" Procedures
               li.top-nav.standards
                 strong
-                  a onclick="javascript:show('standards')" Standards
+                  a onclick="javascript:show('frameworks')" Frameworks
               / li.top-nav.evidence
               /   a onclick="javascript:show('evidence')" Evidence Vault
     #overview.section.top-nav.container.content
@@ -76,17 +76,17 @@ html lang=en
       .columns.is-vcentered
         .column.is-one-third
           div
-            p.subtitle.is-3.has-text-centered Control Tracking
+            p.subtitle.is-3.has-text-centered CriterionTracking
         .column.has-text-centered
           div
-            p.heading Satisfied Controls
+            p.heading Satisfied Criteria
             p.title
-              {{.Stats.ControlsSatisfied}}
+              {{.Stats.CriteriaSatisfied}}
         .column.has-text-centered
           div
             p.heading Total Controls
             p.title
-              {{.Stats.ControlsTotal}}
+              {{.Stats.CriteriaTotal}}
       .columns.is-vcentered
         .column.is-one-third
           div
@@ -187,23 +187,23 @@ html lang=en
             td On demand
             {{end}}
           {{end}}
-    #standards.section.top-nav.container.content
+    #frameworks.section.top-nav.container.content
       blockquote
         h3
           p
-            strong Standards
-            | specify the controls satisfied by the compliance program.
+            strong Framework Targets
+            | specify the Frameworks and Framework Criteria targeted by the compliance program.
       table.table.is-size-4.is-fullwidth
         thead
           tr
-            th Control Key
+            th CriterionKey
             th Name
             th Satisfied?
             th Satisfied By
         tbody
-          {{range .Controls }}
+          {{range .Criteria}}
           tr
-            td {{.ControlKey}}
+            td {{.criteriaKey}}
             td
               strong {{.Name}}
               .subtitle {{.Description}}
@@ -234,4 +234,4 @@ html lang=en
           show(destination)
         }
       }
-    }
+    }

vendor/github.com/Clever/gitsem/.drone.yml

@@ -0,0 +1,24 @@
+image: bradrydzewski/go:1.3
+script:
+  - make test
+notify:
+  email:
+    recipients:
+      - drone@clever.com
+  hipchat:
+    room: Clever-Dev-CI
+    token: {{hipchat_token}}
+    on_started: true
+    on_success: true
+    on_failure: true
+publish:
+  github:
+    branch: master
+    script:
+      - make release
+    artifacts:
+      - release
+    tag: v$(cat VERSION)
+    token: {{github_token}}
+    user: Clever
+    repo: gitsem

vendor/github.com/Clever/gitsem/LICENSE

@@ -1,190 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2014 Clever, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

vendor/github.com/Clever/gitsem/Makefile

@@ -1,11 +1,8 @@
-include golang.mk
-.DEFAULT_GOAL := test # override default goal set in library makefile
-
 SHELL := /bin/bash
-PKG := github.com/Clever/gitsem
-PKGS := $(shell go list ./... | grep -v /vendor)
-EXECUTABLE := gitsem
+PKG = github.com/Clever/gitsem
+PKGS = $(PKG)
 VERSION := $(shell cat VERSION)
+EXECUTABLE := gitsem
 BUILDS := \
 	build/$(EXECUTABLE)-v$(VERSION)-darwin-amd64 \
 	build/$(EXECUTABLE)-v$(VERSION)-linux-amd64 \
@@ -13,22 +10,32 @@ BUILDS := \
 COMPRESSED_BUILDS := $(BUILDS:%=%.tar.gz)
 RELEASE_ARTIFACTS := $(COMPRESSED_BUILDS:build/%=release/%)
 
-.PHONY: test golint build vendor
+.PHONY: test golint
 
-$(eval $(call golang-version-check,1.13))
+golint:
+	@go get github.com/golang/lint/golint
 
 test: $(PKGS)
 
-$(PKGS): golang-test-all-strict-deps
-	$(call golang-test-all-strict,$@)
-
+$(PKGS): golint
+	@go get -d -t $@
+	@gofmt -w=true $(GOPATH)/src/$@*/**.go
+ifneq ($(NOLINT),1)
+	@echo "LINTING..."
+	@PATH=$(PATH):$(GOPATH)/bin golint $(GOPATH)/src/$@*/**.go
+	@echo ""
+endif
+ifeq ($(COVERAGE),1)
+	@go test -cover -coverprofile=$(GOPATH)/src/$@/c.out $@ -test.v
+	@go tool cover -html=$(GOPATH)/src/$@/c.out
+else
+	@echo "TESTING..."
+	@go test $@ -test.v
+endif
 
 run:
 	@go run main.go
 
-build:
-	go build -o bin/$(EXECUTABLE) $(PKG)
-
 build/$(EXECUTABLE)-v$(VERSION)-darwin-amd64:
 	GOARCH=amd64 GOOS=darwin go build -o "$@/$(EXECUTABLE)"
 build/$(EXECUTABLE)-v$(VERSION)-linux-amd64:
@@ -45,7 +52,3 @@ release: $(RELEASE_ARTIFACTS)
 
 clean:
 	rm -rf build release
-
-
-install_deps:
-	go mod vendor

vendor/github.com/Clever/gitsem/README.md

@@ -32,8 +32,3 @@ In the second case, the existing version will be incremented by 1 in the specifi
 ### Options
   - `m=%s` specifies a commit message to use when bumping the version. If %s appears, it will be replaced with the new version number.
   - `tag=true` whether or not to create a tag at the version commit
-
-
-## Vendoring
-
-Please view the [dev-handbook for instructions](https://github.com/Clever/dev-handbook/blob/master/golang/godep.md).

vendor/github.com/Clever/gitsem/VERSION

@@ -1 +1 @@
-1.1.0
+1.0.4

vendor/github.com/Clever/gitsem/git.go

@@ -7,7 +7,7 @@ import (
 )
 
 func isRepoClean() (bool, error) {
-	cmd := exec.Command("git", "status", "--porcelain")
+	cmd := exec.Command("git", "status", "-s")
 	result := &bytes.Buffer{}
 	cmd.Stdout = result
 	if err := cmd.Run(); err != nil {

vendor/github.com/Clever/gitsem/golang.mk

@@ -1,156 +0,0 @@
-# This is the default Clever Golang Makefile.
-# It is stored in the dev-handbook repo, github.com/Clever/dev-handbook
-# Please do not alter this file directly.
-GOLANG_MK_VERSION := 1.0.0
-
-SHELL := /bin/bash
-SYSTEM := $(shell uname -a | cut -d" " -f1 | tr '[:upper:]' '[:lower:]')
-.PHONY: golang-test-deps golang-ensure-curl-installed
-
-# set timezone to UTC for golang to match circle and deploys
-export TZ=UTC
-
-# go build flags for use across all commands which accept them
-GO_BUILD_FLAGS := "-mod=vendor"
-
-# if the gopath includes several directories, use only the first
-GOPATH=$(shell echo $$GOPATH | cut -d: -f1)
-
-# This block checks and confirms that the proper Go toolchain version is installed.
-# It uses ^ matching in the semver sense -- you can be ahead by a minor
-# version, but not a major version (patch is ignored).
-# arg1: golang version
-define golang-version-check
-_ := $(if  \
-		$(shell  \
-			expr >/dev/null  \
-				`go version | cut -d" " -f3 | cut -c3- | cut -d. -f2 | sed -E 's/beta[0-9]+//'`  \
-				\>= `echo $(1) | cut -d. -f2`  \
-				\&  \
-				`go version | cut -d" " -f3 | cut -c3- | cut -d. -f1`  \
-				= `echo $(1) | cut -d. -f1`  \
-			&& echo 1),  \
-		@echo "",  \
-		$(error must be running Go version ^$(1) - you are running $(shell go version | cut -d" " -f3 | cut -c3-)))
-endef
-
-# FGT is a utility that exits with 1 whenever any stderr/stdout output is recieved.
-# We pin its version since its a simple tool that does its job as-is;
-# so we're defended against it breaking or changing in the future.
-FGT := $(GOPATH)/bin/fgt
-$(FGT):
-	go get github.com/GeertJohan/fgt@262f7b11eec07dc7b147c44641236f3212fee89d
-
-golang-ensure-curl-installed:
-	@command -v curl >/dev/null 2>&1 || { echo >&2 "curl not installed. Please install curl."; exit 1; }
-
-# Golint is a tool for linting Golang code for common errors.
-# We pin its version because an update could add a new lint check which would make
-# previously passing tests start failing without changing our code.
-GOLINT := $(GOPATH)/bin/golint
-$(GOLINT):
-	go get golang.org/x/lint/golint@738671d3881b9731cc63024d5d88cf28db875626
-
-# golang-fmt-deps requires the FGT tool for checking output
-golang-fmt-deps: $(FGT)
-
-# golang-fmt checks that all golang files in the pkg are formatted correctly.
-# arg1: pkg path
-define golang-fmt
-@echo "FORMATTING $(1)..."
-@PKG_PATH=$$(go list -f '{{.Dir}}' $(1)); $(FGT) gofmt -l=true $${PKG_PATH}/*.go
-endef
-
-# golang-lint-deps requires the golint tool for golang linting.
-golang-lint-deps: $(GOLINT)
-
-# golang-lint calls golint on all golang files in the pkg.
-# arg1: pkg path
-define golang-lint
-@echo "LINTING $(1)..."
-@PKG_PATH=$$(go list -f '{{.Dir}}' $(1)); find $${PKG_PATH}/*.go -type f | grep -v gen_ | xargs $(GOLINT)
-endef
-
-# golang-lint-deps-strict requires the golint tool for golang linting.
-golang-lint-deps-strict: $(GOLINT) $(FGT)
-
-# golang-lint-strict calls golint on all golang files in the pkg and fails if any lint
-# errors are found.
-# arg1: pkg path
-define golang-lint-strict
-@echo "LINTING $(1)..."
-@PKG_PATH=$$(go list -f '{{.Dir}}' $(1)); find $${PKG_PATH}/*.go -type f | grep -v gen_ | xargs $(FGT) $(GOLINT)
-endef
-
-# golang-test-deps is here for consistency
-golang-test-deps:
-
-# golang-test uses the Go toolchain to run all tests in the pkg.
-# arg1: pkg path
-define golang-test
-@echo "TESTING $(1)..."
-@go test $(GO_BUILD_FLAGS) -v $(1)
-endef
-
-# golang-test-strict-deps is here for consistency
-golang-test-strict-deps:
-
-# golang-test-strict uses the Go toolchain to run all tests in the pkg with the race flag
-# arg1: pkg path
-define golang-test-strict
-@echo "TESTING $(1)..."
-@go test -v $(GO_BUILD_FLAGS) -race $(1)
-endef
-
-# golang-vet-deps is here for consistency
-golang-vet-deps:
-
-# golang-vet uses the Go toolchain to vet all the pkg for common mistakes.
-# arg1: pkg path
-define golang-vet
-@echo "VETTING $(1)..."
-@go vet $(GO_BUILD_FLAGS) $(1)
-endef
-
-# golang-test-all-deps installs all dependencies needed for different test cases.
-golang-test-all-deps: golang-fmt-deps golang-lint-deps golang-test-deps golang-vet-deps
-
-# golang-test-all calls fmt, lint, vet and test on the specified pkg.
-# arg1: pkg path
-define golang-test-all
-$(call golang-fmt,$(1))
-$(call golang-lint,$(1))
-$(call golang-vet,$(1))
-$(call golang-test,$(1))
-endef
-
-# golang-test-all-strict-deps: installs all dependencies needed for different test cases.
-golang-test-all-strict-deps: golang-fmt-deps golang-lint-deps-strict golang-test-strict-deps golang-vet-deps
-
-# golang-test-all-strict calls fmt, lint, vet and test on the specified pkg with strict
-# requirements that no errors are thrown while linting.
-# arg1: pkg path
-define golang-test-all-strict
-$(call golang-fmt,$(1))
-$(call golang-lint-strict,$(1))
-$(call golang-vet,$(1))
-$(call golang-test-strict,$(1))
-endef
-
-# golang-build: builds a golang binary. ensures CGO build is done during CI. This is needed to make a binary that works with a Docker alpine image.
-# arg1: pkg path
-# arg2: executable name
-define golang-build
-@echo "BUILDING..."
-@if [ -z "$$CI" ]; then \
-	go build $(GO_BUILD_FLAGS) -o bin/$(2) $(1); \
-else \
-	echo "-> Building CGO binary"; \
-	CGO_ENABLED=0 go build $(GO_BUILD_FLAGS) -installsuffix cgo -o bin/$(2) $(1); \
-fi;
-endef
-
-# golang-update-makefile downloads latest version of golang.mk
-golang-update-makefile:
-	@wget https://raw.githubusercontent.com/Clever/dev-handbook/master/make/golang-v1.mk -O /tmp/golang.mk 2>/dev/null
-	@if ! grep -q $(GOLANG_MK_VERSION) /tmp/golang.mk; then cp /tmp/golang.mk golang.mk && echo "golang.mk updated"; else echo "golang.mk is up-to-date"; fi

vendor/github.com/Microsoft/go-winio/CODEOWNERS

@@ -1 +0,0 @@
-  * @microsoft/containerplat

vendor/github.com/Microsoft/go-winio/README.md

@@ -1,4 +1,4 @@
-# go-winio [![Build Status](https://github.com/microsoft/go-winio/actions/workflows/ci.yml/badge.svg)](https://github.com/microsoft/go-winio/actions/workflows/ci.yml)
+# go-winio
 
 This repository contains utilities for efficiently performing Win32 IO operations in
 Go. Currently, this is focused on accessing named pipes and other file handles, and

vendor/github.com/Microsoft/go-winio/fileinfo.go

@@ -5,14 +5,21 @@ package winio
 import (
 	"os"
 	"runtime"
+	"syscall"
 	"unsafe"
+)
 
-	"golang.org/x/sys/windows"
+//sys getFileInformationByHandleEx(h syscall.Handle, class uint32, buffer *byte, size uint32) (err error) = GetFileInformationByHandleEx
+//sys setFileInformationByHandle(h syscall.Handle, class uint32, buffer *byte, size uint32) (err error) = SetFileInformationByHandle
+
+const (
+	fileBasicInfo = 0
+	fileIDInfo    = 0x12
 )
 
 // FileBasicInfo contains file access time and file attributes information.
 type FileBasicInfo struct {
-	CreationTime, LastAccessTime, LastWriteTime, ChangeTime windows.Filetime
+	CreationTime, LastAccessTime, LastWriteTime, ChangeTime syscall.Filetime
 	FileAttributes                                          uint32
 	pad                                                     uint32 // padding
 }
@@ -20,7 +27,7 @@ type FileBasicInfo struct {
 // GetFileBasicInfo retrieves times and attributes for a file.
 func GetFileBasicInfo(f *os.File) (*FileBasicInfo, error) {
 	bi := &FileBasicInfo{}
-	if err := windows.GetFileInformationByHandleEx(windows.Handle(f.Fd()), windows.FileBasicInfo, (*byte)(unsafe.Pointer(bi)), uint32(unsafe.Sizeof(*bi))); err != nil {
+	if err := getFileInformationByHandleEx(syscall.Handle(f.Fd()), fileBasicInfo, (*byte)(unsafe.Pointer(bi)), uint32(unsafe.Sizeof(*bi))); err != nil {
 		return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err}
 	}
 	runtime.KeepAlive(f)
@@ -29,32 +36,13 @@ func GetFileBasicInfo(f *os.File) (*FileBasicInfo, error) {
 
 // SetFileBasicInfo sets times and attributes for a file.
 func SetFileBasicInfo(f *os.File, bi *FileBasicInfo) error {
-	if err := windows.SetFileInformationByHandle(windows.Handle(f.Fd()), windows.FileBasicInfo, (*byte)(unsafe.Pointer(bi)), uint32(unsafe.Sizeof(*bi))); err != nil {
+	if err := setFileInformationByHandle(syscall.Handle(f.Fd()), fileBasicInfo, (*byte)(unsafe.Pointer(bi)), uint32(unsafe.Sizeof(*bi))); err != nil {
 		return &os.PathError{Op: "SetFileInformationByHandle", Path: f.Name(), Err: err}
 	}
 	runtime.KeepAlive(f)
 	return nil
 }
 
-// FileStandardInfo contains extended information for the file.
-// FILE_STANDARD_INFO in WinBase.h
-// https://docs.microsoft.com/en-us/windows/win32/api/winbase/ns-winbase-file_standard_info
-type FileStandardInfo struct {
-	AllocationSize, EndOfFile int64
-	NumberOfLinks             uint32
-	DeletePending, Directory  bool
-}
-
-// GetFileStandardInfo retrieves ended information for the file.
-func GetFileStandardInfo(f *os.File) (*FileStandardInfo, error) {
-	si := &FileStandardInfo{}
-	if err := windows.GetFileInformationByHandleEx(windows.Handle(f.Fd()), windows.FileStandardInfo, (*byte)(unsafe.Pointer(si)), uint32(unsafe.Sizeof(*si))); err != nil {
-		return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err}
-	}
-	runtime.KeepAlive(f)
-	return si, nil
-}
-
 // FileIDInfo contains the volume serial number and file ID for a file. This pair should be
 // unique on a system.
 type FileIDInfo struct {
@@ -65,7 +53,7 @@ type FileIDInfo struct {
 // GetFileID retrieves the unique (volume, file ID) pair for a file.
 func GetFileID(f *os.File) (*FileIDInfo, error) {
 	fileID := &FileIDInfo{}
-	if err := windows.GetFileInformationByHandleEx(windows.Handle(f.Fd()), windows.FileIdInfo, (*byte)(unsafe.Pointer(fileID)), uint32(unsafe.Sizeof(*fileID))); err != nil {
+	if err := getFileInformationByHandleEx(syscall.Handle(f.Fd()), fileIDInfo, (*byte)(unsafe.Pointer(fileID)), uint32(unsafe.Sizeof(*fileID))); err != nil {
 		return nil, &os.PathError{Op: "GetFileInformationByHandleEx", Path: f.Name(), Err: err}
 	}
 	runtime.KeepAlive(f)

vendor/github.com/Microsoft/go-winio/go.mod

@@ -0,0 +1,9 @@
+module github.com/Microsoft/go-winio
+
+go 1.12
+
+require (
+	github.com/pkg/errors v0.8.1
+	github.com/sirupsen/logrus v1.4.1
+	golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b
+)

vendor/github.com/Microsoft/go-winio/go.sum

@@ -0,0 +1,16 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b h1:ag/x1USPSsqHud38I9BAC88qdNLDHHtQ4mlgQIZPPNA=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

vendor/github.com/Microsoft/go-winio/hvsock.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package winio
 
 import (

vendor/github.com/Microsoft/go-winio/pipe.go

@@ -182,14 +182,13 @@ func (s pipeAddress) String() string {
 }
 
 // tryDialPipe attempts to dial the pipe at `path` until `ctx` cancellation or timeout.
-func tryDialPipe(ctx context.Context, path *string, access uint32) (syscall.Handle, error) {
+func tryDialPipe(ctx context.Context, path *string) (syscall.Handle, error) {
 	for {
-
 		select {
 		case <-ctx.Done():
 			return syscall.Handle(0), ctx.Err()
 		default:
-			h, err := createFile(*path, access, 0, nil, syscall.OPEN_EXISTING, syscall.FILE_FLAG_OVERLAPPED|cSECURITY_SQOS_PRESENT|cSECURITY_ANONYMOUS, 0)
+			h, err := createFile(*path, syscall.GENERIC_READ|syscall.GENERIC_WRITE, 0, nil, syscall.OPEN_EXISTING, syscall.FILE_FLAG_OVERLAPPED|cSECURITY_SQOS_PRESENT|cSECURITY_ANONYMOUS, 0)
 			if err == nil {
 				return h, nil
 			}
@@ -198,7 +197,7 @@ func tryDialPipe(ctx context.Context, path *string, access uint32) (syscall.Hand
 			}
 			// Wait 10 msec and try again. This is a rather simplistic
 			// view, as we always try each 10 milliseconds.
-			time.Sleep(10 * time.Millisecond)
+			time.Sleep(time.Millisecond * 10)
 		}
 	}
 }
@@ -211,7 +210,7 @@ func DialPipe(path string, timeout *time.Duration) (net.Conn, error) {
 	if timeout != nil {
 		absTimeout = time.Now().Add(*timeout)
 	} else {
-		absTimeout = time.Now().Add(2 * time.Second)
+		absTimeout = time.Now().Add(time.Second * 2)
 	}
 	ctx, _ := context.WithDeadline(context.Background(), absTimeout)
 	conn, err := DialPipeContext(ctx, path)
@@ -224,15 +223,9 @@ func DialPipe(path string, timeout *time.Duration) (net.Conn, error) {
 // DialPipeContext attempts to connect to a named pipe by `path` until `ctx`
 // cancellation or timeout.
 func DialPipeContext(ctx context.Context, path string) (net.Conn, error) {
-	return DialPipeAccess(ctx, path, syscall.GENERIC_READ|syscall.GENERIC_WRITE)
-}
-
-// DialPipeAccess attempts to connect to a named pipe by `path` with `access` until `ctx`
-// cancellation or timeout.
-func DialPipeAccess(ctx context.Context, path string, access uint32) (net.Conn, error) {
 	var err error
 	var h syscall.Handle
-	h, err = tryDialPipe(ctx, &path, access)
+	h, err = tryDialPipe(ctx, &path)
 	if err != nil {
 		return nil, err
 	}
@@ -429,10 +422,10 @@ type PipeConfig struct {
 	// when the pipe is in message mode.
 	MessageMode bool
 
-	// InputBufferSize specifies the size of the input buffer, in bytes.
+	// InputBufferSize specifies the size the input buffer, in bytes.
 	InputBufferSize int32
 
-	// OutputBufferSize specifies the size of the output buffer, in bytes.
+	// OutputBufferSize specifies the size the input buffer, in bytes.
 	OutputBufferSize int32
 }
 

vendor/github.com/Microsoft/go-winio/pkg/guid/guid.go

@@ -1,5 +1,3 @@
-// +build windows
-
 // Package guid provides a GUID type. The backing structure for a GUID is
 // identical to that used by the golang.org/x/sys/windows GUID type.
 // There are two main binary encodings used for a GUID, the big-endian encoding,

vendor/github.com/Microsoft/go-winio/privilege.go

@@ -28,9 +28,8 @@ const (
 
 	ERROR_NOT_ALL_ASSIGNED syscall.Errno = 1300
 
-	SeBackupPrivilege   = "SeBackupPrivilege"
-	SeRestorePrivilege  = "SeRestorePrivilege"
-	SeSecurityPrivilege = "SeSecurityPrivilege"
+	SeBackupPrivilege  = "SeBackupPrivilege"
+	SeRestorePrivilege = "SeRestorePrivilege"
 )
 
 const (

vendor/github.com/Microsoft/go-winio/syscall.go

@@ -1,3 +1,3 @@
 package winio
 
-//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go file.go pipe.go sd.go fileinfo.go privilege.go backup.go hvsock.go
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go file.go pipe.go sd.go fileinfo.go privilege.go backup.go hvsock.go

vendor/github.com/aktau/github-release/Gopkg.lock

@@ -10,15 +10,44 @@
   version = "v1.0.0"
 
 [[projects]]
-  digest = "1:7462b19f7e4adb24e966b77213c693dad09c04d58ac8d29ddf449ff1b1c91d11"
-  name = "github.com/kevinburke/rest"
-  packages = [
-    "restclient",
-    "resterror",
-  ]
+  digest = "1:586ea76dbd0374d6fb649a91d70d652b7fe0ccffb8910a77468e7702e7901f3d"
+  name = "github.com/go-stack/stack"
+  packages = ["."]
   pruneopts = "UT"
-  revision = "22cd0577e450f2fa21313f7eaf42b41a178291c1"
-  version = "2.5"
+  revision = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"
+  version = "v1.8.0"
+
+[[projects]]
+  digest = "1:5c56664d98f37f0ee54bf572b0b189a3910c34c31052fc7d58b282c449b079fb"
+  name = "github.com/inconshreveable/log15"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "b30bc20e4fd12cec79a9aae62e91cfcf458bd253"
+  version = "v2.15"
+
+[[projects]]
+  digest = "1:de0adde670b2119824a1252b61a0e989669f8b24af874e399bec0e0538b2f928"
+  name = "github.com/kevinburke/rest"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "0d2892b400f81cdfb979e2f718e6070fae17a507"
+  version = "2.2"
+
+[[projects]]
+  digest = "1:0109cf4321a15313ec895f42e723e1f76121c6975ea006abfa20012272ec0937"
+  name = "github.com/mattn/go-colorable"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "68e95eba382c972aafde02ead2cd2426a8a92480"
+  version = "v0.1.6"
+
+[[projects]]
+  digest = "1:0c58d31abe2a2ccb429c559b6292e7df89dcda675456fecc282fa90aa08273eb"
+  name = "github.com/mattn/go-isatty"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "7b513a986450394f7bbf1476909911b3aa3a55ce"
+  version = "v0.0.12"
 
 [[projects]]
   branch = "master"
@@ -36,12 +65,23 @@
   revision = "26cb8b04692384f4dc269de3b5fcf3e2ef78573e"
   version = "2.5.11"
 
+[[projects]]
+  branch = "master"
+  digest = "1:8cab10971112233c82c83683a517378038eba1c20e71b29c592b73fa212437b3"
+  name = "golang.org/x/sys"
+  packages = [
+    "internal/unsafeheader",
+    "unix",
+  ]
+  pruneopts = "UT"
+  revision = "bc7a7d42d5c30f4d0fe808715c002826ce2c624e"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
   input-imports = [
     "github.com/dustin/go-humanize",
-    "github.com/kevinburke/rest/restclient",
+    "github.com/kevinburke/rest",
     "github.com/tomnomnom/linkheader",
     "github.com/voxelbrain/goptions",
   ]

vendor/github.com/aktau/github-release/Gopkg.toml

@@ -9,7 +9,7 @@
 
 [[constraint]]
   name = "github.com/kevinburke/rest"
-  version = "2.5.0"
+  version = "2.2.0"
 
 [[constraint]]
   name = "github.com/tomnomnom/linkheader"

vendor/github.com/aktau/github-release/Makefile

@@ -91,9 +91,6 @@ clean:
 	rm $(EXECUTABLE) || true
 	rm -rf bin/
 
-lint:
-	go vet ./...
-
 test:
 	go test ./...
 

vendor/github.com/aktau/github-release/README.md

@@ -101,13 +101,6 @@ $ github-release delete \
     --tag v0.1.0
 ```
 
-Errata
-======
-
-The `release` command does not have an `--auth-user` flag because in practice,
-Github ignores the `--auth-user` flag when validating releases. The only thing
-that matters is passing a token that has permission to create the release.
-
 GitHub Enterprise Support
 =========================
 You can point to a different GitHub API endpoint via the environment variable ```GITHUB_API```:

vendor/github.com/aktau/github-release/cmd.go

@@ -354,17 +354,10 @@ func releasecmd(opt Options) error {
 	}
 	reader := bytes.NewReader(payload)
 
-	// NB: Github appears to ignore the user here - the only thing that seems to
-	// matter is that the token is valid.
-	client := github.NewClient(user, token, nil)
-	client.SetBaseURL(EnvApiEndpoint)
-	req, err := client.NewRequest("POST", fmt.Sprintf("/repos/%s/%s/releases", user, repo), reader)
+	URL := nvls(EnvApiEndpoint, github.DefaultBaseURL) + fmt.Sprintf("/repos/%s/%s/releases", user, repo)
+	resp, err := github.DoAuthRequest("POST", URL, "application/json", token, nil, reader)
 	if err != nil {
-		return fmt.Errorf("while submitting %v: %w", string(payload), err)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return fmt.Errorf("while submitting %v: %w", string(payload), err)
+		return fmt.Errorf("while submitting %v, %v", string(payload), err)
 	}
 	defer resp.Body.Close()
 

vendor/github.com/andygrunwald/go-jira/.travis.yml

@@ -0,0 +1,20 @@
+language: go
+
+sudo: false
+
+go:
+  - "1.9.x"
+  - "1.10.x"
+  - "1.11.x"
+  - "1.12.x"
+  - "1.13.x"
+
+before_install:
+  - go get -t ./...
+
+matrix:
+  allow_failures:
+    - go: 1.13.x
+
+script:
+  - GOMAXPROCS=4 GORACE="halt_on_error=1" go test -race -v ./...

vendor/github.com/andygrunwald/go-jira/CHANGELOG.md

@@ -2,32 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [1.13.0](https://github.com/andygrunwald/go-jira/compare/v1.11.1...v1.13.0) (2020-10-25)
-
-
-### Features
-
-* add AddRemoteLink method ([f200e15](https://github.com/andygrunwald/go-jira/commit/f200e158b997a303db081cbbc5a9d8ad5d89566d)), closes [/developer.atlassian.com/cloud/jira/platform/rest/v2/#api-rest-api-2](https://github.com/andygrunwald//developer.atlassian.com/cloud/jira/platform/rest/v2//issues/api-rest-api-2)
-* Add Names support on Issue struct ([#278](https://github.com/andygrunwald/go-jira/issues/278)) ([1fc10e0](https://github.com/andygrunwald/go-jira/commit/1fc10e0606784f745673ccc4d8d706c36f385a7a))
-* Extend Makefile for more source code quality targets ([5e52236](https://github.com/andygrunwald/go-jira/commit/5e5223631a29d10a13e598318a6abe47384e2982))
-* **context:** Add support for context package ([e1f4265](https://github.com/andygrunwald/go-jira/commit/e1f4265e2b467b938fe0c095caf6d36f3136d2ff))
-* **issues:** Add GetEditMeta on issue ([a783764](https://github.com/andygrunwald/go-jira/commit/a783764b52dc890773658ddd0483a9d0393e385d)), closes [/docs.atlassian.com/DAC/rest/jira/6.1.html#d2e1364](https://github.com/andygrunwald//docs.atlassian.com/DAC/rest/jira/6.1.html/issues/d2e1364)
-* **IssueService:** allow empty JQL ([#268](https://github.com/andygrunwald/go-jira/issues/268)) ([4b91cf2](https://github.com/andygrunwald/go-jira/commit/4b91cf2b135355de7ecee41727c3e65f4e7067bc))
-* **project:** Add cronjob to check for stale issues ([#287](https://github.com/andygrunwald/go-jira/issues/287)) ([2096b04](https://github.com/andygrunwald/go-jira/commit/2096b04e52b434c1fb1c841bab487a94674a271e))
-* **project:** Add GitHub Actions testing workflow ([#289](https://github.com/andygrunwald/go-jira/issues/289)) ([80c0282](https://github.com/andygrunwald/go-jira/commit/80c02828ca9e4eb0e4a1877275baae14d330a2d9)), closes [#290](https://github.com/andygrunwald/go-jira/issues/290)
-* **project:** Add workflow to greet new contributors ([#288](https://github.com/andygrunwald/go-jira/issues/288)) ([c357b61](https://github.com/andygrunwald/go-jira/commit/c357b61a40f62a919ebd94a555390958f99c8db7))
-
-
-### Bug Fixes
-
-* change millisecond time format ([8c77107](https://github.com/andygrunwald/go-jira/commit/8c77107df3757c4ec5eae6e9d7c018618e708bfa))
-* paging with load balancer going to endless loop ([19d3fc0](https://github.com/andygrunwald/go-jira/commit/19d3fc0aecde547ffe1ab547c5ffb6c7972d387c)), closes [#260](https://github.com/andygrunwald/go-jira/issues/260)
-* **issue:** IssueService.Search() with a not empty JQL triggers 400 bad request ([#292](https://github.com/andygrunwald/go-jira/issues/292)) ([8b64c7f](https://github.com/andygrunwald/go-jira/commit/8b64c7f005fbceb11fa43a7aff3de61eb3166fca)), closes [#291](https://github.com/andygrunwald/go-jira/issues/291)
-* **IssueService.GetWatchers:** UserService.GetByAccountID support accountId params ([436469b](https://github.com/andygrunwald/go-jira/commit/436469b62d4d62037f380b38c918a13f4a5f0ab2))
-* **product:** Make product naming consistent, rename JIRA to Jira ([#286](https://github.com/andygrunwald/go-jira/issues/286)) ([146229d](https://github.com/andygrunwald/go-jira/commit/146229d2ab58a3fb128ddc8dcbe03aff72e20857)), closes [#284](https://github.com/andygrunwald/go-jira/issues/284)
-* **tests:** Fix TestIssueService_PostAttachment unit test ([f6b1dca](https://github.com/andygrunwald/go-jira/commit/f6b1dcafcfdd8fe69f842b1053c4030da6c97c7f))
-* removing the use of username field in searching for users ([#297](https://github.com/andygrunwald/go-jira/issues/297)) ([f50cb07](https://github.com/andygrunwald/go-jira/commit/f50cb07b297d79138b13e5ab49ea33965d32f5c1))
-
 ## [1.12.0](https://github.com/andygrunwald/go-jira/compare/v1.11.1...v1.12.0) (2019-12-14)
 
 
@@ -102,3 +76,6 @@ All notable changes to this project will be documented in this file. See [standa
 * Add ResolutionService to retrieve resolutions ([fb1ce22](https://github.com/andygrunwald/go-jira/commit/fb1ce22))
 * Add status category constants ([6223ddd](https://github.com/andygrunwald/go-jira/commit/6223ddd))
 * Add StatusCategory GetList ([049a756](https://github.com/andygrunwald/go-jira/commit/049a756))
+
+
+

vendor/github.com/andygrunwald/go-jira/Makefile

@@ -1,25 +1,2 @@
-.DEFAULT_GOAL := help
-
-.PHONY: help
-help: ## Outputs the help.
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-.PHONY: test
-test: ## Runs all unit, integration and example tests.
-	go test -race -v ./...
-
-.PHONY: vet
-vet: ## Runs go vet (to detect suspicious constructs).
-	go vet ./...
-
-.PHONY: fmt
-fmt: ## Runs go fmt (to check for go coding guidelines).
-	gofmt -d -s .
-
-.PHONY: staticcheck
-staticcheck: ## Runs static analysis to prevend bugs, foster code simplicity, performance and editor integration.
-	go get -u honnef.co/go/tools/cmd/staticcheck
-	staticcheck ./...
-
-.PHONY: all
-all: test vet fmt staticcheck ## Runs all source code quality targets (like test, vet, fmt, staticcheck)
+test:
+	go test -v ./...

vendor/github.com/andygrunwald/go-jira/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+# PR Description
+
+_What does this fix or add?_
+
+# Checklist
+
+* [ ] Tests added
+  * [ ] Good Path
+  * [ ] Error Path
+* [ ] Commits follow conventions described here:
+  * [ ] [https://conventionalcommits.org/en/v1.0.0-beta.4/#summary](https://conventionalcommits.org/en/v1.0.0-beta.4/#summary)
+  * [ ] [https://chris.beams.io/posts/git-commit/#seven-rules](https://chris.beams.io/posts/git-commit/#seven-rules)
+* [ ] Commits are squashed such that
+  * [ ] There is 1 commit per isolated change
+* [ ] I've not made extraneous commits/changes that are unrelated to my change.

vendor/github.com/andygrunwald/go-jira/README.md

@@ -1,29 +1,26 @@
 # go-jira
 
 [![GoDoc](https://godoc.org/github.com/andygrunwald/go-jira?status.svg)](https://godoc.org/github.com/andygrunwald/go-jira)
-[![Build Status](https://github.com/andygrunwald/go-jira/actions/workflows/testing.yml/badge.svg)](https://github.com/andygrunwald/go-jira/actions/workflows/testing.yml)
+[![Build Status](https://travis-ci.org/andygrunwald/go-jira.svg?branch=master)](https://travis-ci.org/andygrunwald/go-jira)
 [![Go Report Card](https://goreportcard.com/badge/github.com/andygrunwald/go-jira)](https://goreportcard.com/report/github.com/andygrunwald/go-jira)
 
-[Go](https://golang.org/) client library for [Atlassian Jira](https://www.atlassian.com/software/jira).
+[Go](https://golang.org/) client library for [Atlassian JIRA](https://www.atlassian.com/software/jira).
 
-![Go client library for Atlassian Jira](./img/logo_small.png "Go client library for Atlassian Jira.")
+![Go client library for Atlassian JIRA](./img/logo_small.png "Go client library for Atlassian JIRA.")
 
 ## Features
 
 * Authentication (HTTP Basic, OAuth, Session Cookie)
 * Create and retrieve issues
 * Create and retrieve issue transitions (status updates)
-* Call every API endpoint of the Jira, even if it is not directly implemented in this library
+* Call every API endpoint of the JIRA, even if it is not directly implemented in this library
 
-This package is not Jira API complete (yet), but you can call every API endpoint you want. See [Call a not implemented API endpoint](#call-a-not-implemented-api-endpoint) how to do this. For all possible API endpoints of Jira have a look at [latest Jira REST API documentation](https://docs.atlassian.com/jira/REST/latest/).
+This package is not JIRA API complete (yet), but you can call every API endpoint you want. See [Call a not implemented API endpoint](#call-a-not-implemented-api-endpoint) how to do this. For all possible API endpoints of JIRA have a look at [latest JIRA REST API documentation](https://docs.atlassian.com/jira/REST/latest/).
 
 ## Requirements
 
-* Go >= 1.14
-* Jira v6.3.4 & v7.1.2.
-
-Note that we also run our tests against 1.13, though only the last two versions
-of Go are officially supported.
+* Go >= 1.8
+* JIRA v6.3.4 & v7.1.2.
 
 ## Installation
 
@@ -55,7 +52,7 @@ go test -v ./...
 
 Please have a look at the [GoDoc documentation](https://godoc.org/github.com/andygrunwald/go-jira) for a detailed API description.
 
-The [latest Jira REST API documentation](https://docs.atlassian.com/jira/REST/latest/) was the base document for this package.
+The [latest JIRA REST API documentation](https://docs.atlassian.com/jira/REST/latest/) was the base document for this package.
 
 ## Examples
 
@@ -95,11 +92,9 @@ an `http.Client`.  That client can then be passed into the `NewClient` function
 
 For convenience, capability for basic and cookie-based authentication is included in the main library.
 
-#### Token (Jira on Atlassian Cloud)
+#### Basic auth example
 
-Token-based authentication uses the basic authentication scheme, with a user-generated API token in place of a user's password. You can generate a token for your user [here](https://id.atlassian.com/manage-profile/security/api-tokens). Additional information about Atlassian Cloud API tokens can be found [here](https://confluence.atlassian.com/cloud/api-tokens-938839638.html).
-
-A more thorough, [runnable example](examples/basicauth/main.go) is provided in the examples directory.
+A more thorough, [runnable example](examples/basicauth/main.go) is provided in the examples directory. **It's worth noting that using passwords in basic auth is now deprecated and will be removed.** Jira gives you the ability to [create tokens now.](https://confluence.atlassian.com/cloud/api-tokens-938839638.html)
 
 ```go
 func main() {
@@ -116,15 +111,14 @@ func main() {
 }
 ```
 
-#### Basic (self-hosted Jira)
+#### Authenticate with session cookie [DEPRECATED]
 
-Password-based API authentication works for self-hosted Jira **only**, and has been [deprecated for users of Atlassian Cloud](https://developer.atlassian.com/cloud/jira/platform/deprecation-notice-basic-auth-and-cookie-based-auth/).
+JIRA [deprecated this authentication method.](https://developer.atlassian.com/cloud/jira/platform/deprecation-notice-basic-auth-and-cookie-based-auth/)  It's not longer available for use.
 
-The above token authentication example may be used, substituting a user's password for a generated token.
 
 #### Authenticate with OAuth
 
-If you want to connect via OAuth to your Jira Cloud instance checkout the [example of using OAuth authentication with Jira in Go](https://gist.github.com/Lupus/edafe9a7c5c6b13407293d795442fe67) by [@Lupus](https://github.com/Lupus).
+If you want to connect via OAuth to your JIRA Cloud instance checkout the [example of using OAuth authentication with JIRA in Go](https://gist.github.com/Lupus/edafe9a7c5c6b13407293d795442fe67) by [@Lupus](https://github.com/Lupus).
 
 For more details have a look at the [issue #56](https://github.com/andygrunwald/go-jira/issues/56).
 
@@ -179,62 +173,11 @@ func main() {
 }
 ```
 
-### Change an issue status
-
-This is how one can change an issue status. In this example, we change the issue from "To Do" to "In Progress."
-
-```go
-package main
-
-import (
-	"fmt"
-	"github.com/andygrunwald/go-jira"
-)
-
-func main() {
-	base := "https://my.jira.com"
-	tp := jira.BasicAuthTransport{
-		Username: "username",
-		Password: "token",
-	}
-
-	jiraClient, err := jira.NewClient(tp.Client(), base)
-	if err != nil {
-		panic(err)
-	}
-
-	issue, _, _ := jiraClient.Issue.Get("FART-1", nil)
-	currentStatus := issue.Fields.Status.Name
-	fmt.Printf("Current status: %s\n", currentStatus)
-
-	var transitionID string
-	possibleTransitions, _, _ := jiraClient.Issue.GetTransitions("FART-1")
-	for _, v := range possibleTransitions {
-		if v.Name == "In Progress" {
-			transitionID = v.ID
-			break
-		}
-	}
-
-	jiraClient.Issue.DoTransition("FART-1", transitionID)
-	issue, _, _ = jiraClient.Issue.Get(testIssueID, nil)
-	fmt.Printf("Status after transition: %+v\n", issue.Fields.Status.Name)
-}
-```
-### Get all the issues for JQL with Pagination
-Jira API has limit on maxResults it can return. You may have a usecase where you need to get all issues for given JQL.
-This example shows reference implementation of GetAllIssues function which does pagination on Jira API to get all the issues for given JQL
-
-please look at [Pagination Example](https://github.com/andygrunwald/go-jira/blob/master/examples/pagination/main.go)
-
-
-
-
 ### Call a not implemented API endpoint
 
-Not all API endpoints of the Jira API are implemented into *go-jira*.
+Not all API endpoints of the JIRA API are implemented into *go-jira*.
 But you can call them anyway:
-Lets get all public projects of [Atlassian`s Jira instance](https://jira.atlassian.com/).
+Lets get all public projects of [Atlassian`s JIRA instance](https://jira.atlassian.com/).
 
 ```go
 package main
@@ -266,7 +209,7 @@ func main() {
 
 	// ...
 	// BAM: Bamboo
-	// BAMJ: Bamboo Jira Plugin
+	// BAMJ: Bamboo JIRA Plugin
 	// CLOV: Clover
 	// CONF: Confluence
 	// ...
@@ -275,7 +218,7 @@ func main() {
 
 ## Implementations
 
-* [andygrunwald/jitic](https://github.com/andygrunwald/jitic) - The Jira Ticket Checker
+* [andygrunwald/jitic](https://github.com/andygrunwald/jitic) - The JIRA Ticket Checker
 
 ## Code structure
 
@@ -283,7 +226,7 @@ The code structure of this package was inspired by [google/go-github](https://gi
 
 There is one main part (the client).
 Based on this main client the other endpoints, like Issues or Authentication are extracted in services. E.g. `IssueService` or `AuthenticationService`.
-These services own a responsibility of the single endpoints / usecases of Jira.
+These services own a responsibility of the single endpoints / usecases of JIRA.
 
 ## Contribution
 
@@ -315,7 +258,7 @@ You can read more about them at https://developer.atlassian.com/blog/2016/04/clo
 
 ## Releasing
 
-Install [standard-version](https://github.com/conventional-changelog/standard-version)
+Install `standard-version`
 ```bash
 npm i -g standard-version
 ```

vendor/github.com/andygrunwald/go-jira/authentication.go

@@ -1,7 +1,6 @@
 package jira
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -15,9 +14,9 @@ const (
 	authTypeSession = 2
 )
 
-// AuthenticationService handles authentication for the Jira instance / API.
+// AuthenticationService handles authentication for the JIRA instance / API.
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/latest/#authentication
+// JIRA API docs: https://docs.atlassian.com/jira/REST/latest/#authentication
 type AuthenticationService struct {
 	client *Client
 
@@ -31,7 +30,7 @@ type AuthenticationService struct {
 	password string
 }
 
-// Session represents a Session JSON response by the Jira API.
+// Session represents a Session JSON response by the JIRA API.
 type Session struct {
 	Self    string `json:"self,omitempty"`
 	Name    string `json:"name,omitempty"`
@@ -48,16 +47,16 @@ type Session struct {
 	Cookies []*http.Cookie
 }
 
-// AcquireSessionCookieWithContext creates a new session for a user in Jira.
-// Once a session has been successfully created it can be used to access any of Jira's remote APIs and also the web UI by passing the appropriate HTTP Cookie header.
+// AcquireSessionCookie creates a new session for a user in JIRA.
+// Once a session has been successfully created it can be used to access any of JIRA's remote APIs and also the web UI by passing the appropriate HTTP Cookie header.
 // The header will by automatically applied to every API request.
 // Note that it is generally preferrable to use HTTP BASIC authentication with the REST API.
-// However, this resource may be used to mimic the behaviour of Jira's log-in page (e.g. to display log-in errors to a user).
+// However, this resource may be used to mimic the behaviour of JIRA's log-in page (e.g. to display log-in errors to a user).
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/latest/#auth/1/session
+// JIRA API docs: https://docs.atlassian.com/jira/REST/latest/#auth/1/session
 //
 // Deprecated: Use CookieAuthTransport instead
-func (s *AuthenticationService) AcquireSessionCookieWithContext(ctx context.Context, username, password string) (bool, error) {
+func (s *AuthenticationService) AcquireSessionCookie(username, password string) (bool, error) {
 	apiEndpoint := "rest/auth/1/session"
 	body := struct {
 		Username string `json:"username"`
@@ -67,7 +66,7 @@ func (s *AuthenticationService) AcquireSessionCookieWithContext(ctx context.Cont
 		password,
 	}
 
-	req, err := s.client.NewRequestWithContext(ctx, "POST", apiEndpoint, body)
+	req, err := s.client.NewRequest("POST", apiEndpoint, body)
 	if err != nil {
 		return false, err
 	}
@@ -80,10 +79,10 @@ func (s *AuthenticationService) AcquireSessionCookieWithContext(ctx context.Cont
 	}
 
 	if err != nil {
-		return false, fmt.Errorf("auth at Jira instance failed (HTTP(S) request). %s", err)
+		return false, fmt.Errorf("Auth at JIRA instance failed (HTTP(S) request). %s", err)
 	}
 	if resp != nil && resp.StatusCode != 200 {
-		return false, fmt.Errorf("auth at Jira instance failed (HTTP(S) request). Status code: %d", resp.StatusCode)
+		return false, fmt.Errorf("Auth at JIRA instance failed (HTTP(S) request). Status code: %d", resp.StatusCode)
 	}
 
 	s.client.session = session
@@ -92,14 +91,7 @@ func (s *AuthenticationService) AcquireSessionCookieWithContext(ctx context.Cont
 	return true, nil
 }
 
-// AcquireSessionCookie wraps AcquireSessionCookieWithContext using the background context.
-//
-// Deprecated: Use CookieAuthTransport instead
-func (s *AuthenticationService) AcquireSessionCookie(username, password string) (bool, error) {
-	return s.AcquireSessionCookieWithContext(context.Background(), username, password)
-}
-
-// SetBasicAuth sets username and password for the basic auth against the Jira instance.
+// SetBasicAuth sets username and password for the basic auth against the JIRA instance.
 //
 // Deprecated: Use BasicAuthTransport instead
 func (s *AuthenticationService) SetBasicAuth(username, password string) {
@@ -108,7 +100,7 @@ func (s *AuthenticationService) SetBasicAuth(username, password string) {
 	s.authType = authTypeBasic
 }
 
-// Authenticated reports if the current Client has authentication details for Jira
+// Authenticated reports if the current Client has authentication details for JIRA
 func (s *AuthenticationService) Authenticated() bool {
 	if s != nil {
 		if s.authType == authTypeSession {
@@ -121,29 +113,29 @@ func (s *AuthenticationService) Authenticated() bool {
 	return false
 }
 
-// LogoutWithContext logs out the current user that has been authenticated and the session in the client is destroyed.
+// Logout logs out the current user that has been authenticated and the session in the client is destroyed.
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/latest/#auth/1/session
+// JIRA API docs: https://docs.atlassian.com/jira/REST/latest/#auth/1/session
 //
 // Deprecated: Use CookieAuthTransport to create base client.  Logging out is as simple as not using the
 // client anymore
-func (s *AuthenticationService) LogoutWithContext(ctx context.Context) error {
+func (s *AuthenticationService) Logout() error {
 	if s.authType != authTypeSession || s.client.session == nil {
 		return fmt.Errorf("no user is authenticated")
 	}
 
 	apiEndpoint := "rest/auth/1/session"
-	req, err := s.client.NewRequestWithContext(ctx, "DELETE", apiEndpoint, nil)
+	req, err := s.client.NewRequest("DELETE", apiEndpoint, nil)
 	if err != nil {
-		return fmt.Errorf("creating the request to log the user out failed : %s", err)
+		return fmt.Errorf("Creating the request to log the user out failed : %s", err)
 	}
 
 	resp, err := s.client.Do(req, nil)
 	if err != nil {
-		return fmt.Errorf("error sending the logout request: %s", err)
+		return fmt.Errorf("Error sending the logout request: %s", err)
 	}
 	if resp.StatusCode != 204 {
-		return fmt.Errorf("the logout was unsuccessful with status %d", resp.StatusCode)
+		return fmt.Errorf("The logout was unsuccessful with status %d", resp.StatusCode)
 	}
 
 	// If logout successful, delete session
@@ -153,56 +145,43 @@ func (s *AuthenticationService) LogoutWithContext(ctx context.Context) error {
 
 }
 
-// Logout wraps LogoutWithContext using the background context.
+// GetCurrentUser gets the details of the current user.
 //
-// Deprecated: Use CookieAuthTransport to create base client.  Logging out is as simple as not using the
-// client anymore
-func (s *AuthenticationService) Logout() error {
-	return s.LogoutWithContext(context.Background())
-}
-
-// GetCurrentUserWithContext gets the details of the current user.
-//
-// Jira API docs: https://docs.atlassian.com/jira/REST/latest/#auth/1/session
-func (s *AuthenticationService) GetCurrentUserWithContext(ctx context.Context) (*Session, error) {
+// JIRA API docs: https://docs.atlassian.com/jira/REST/latest/#auth/1/session
+func (s *AuthenticationService) GetCurrentUser() (*Session, error) {
 	if s == nil {
-		return nil, fmt.Errorf("authentication Service is not instantiated")
+		return nil, fmt.Errorf("AUthenticaiton Service is not instantiated")
 	}
 	if s.authType != authTypeSession || s.client.session == nil {
-		return nil, fmt.Errorf("no user is authenticated yet")
+		return nil, fmt.Errorf("No user is authenticated yet")
 	}
 
 	apiEndpoint := "rest/auth/1/session"
-	req, err := s.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := s.client.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
-		return nil, fmt.Errorf("could not create request for getting user info : %s", err)
+		return nil, fmt.Errorf("Could not create request for getting user info : %s", err)
 	}
 
 	resp, err := s.client.Do(req, nil)
 	if err != nil {
-		return nil, fmt.Errorf("error sending request to get user info : %s", err)
+		return nil, fmt.Errorf("Error sending request to get user info : %s", err)
 	}
 	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("getting user info failed with status : %d", resp.StatusCode)
+		return nil, fmt.Errorf("Getting user info failed with status : %d", resp.StatusCode)
 	}
 
 	defer resp.Body.Close()
 	ret := new(Session)
 	data, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return nil, fmt.Errorf("couldn't read body from the response : %s", err)
+		return nil, fmt.Errorf("Couldn't read body from the response : %s", err)
 	}
 
 	err = json.Unmarshal(data, &ret)
 
 	if err != nil {
-		return nil, fmt.Errorf("could not unmarshall received user info : %s", err)
+		return nil, fmt.Errorf("Could not unmarshall received user info : %s", err)
 	}
 
 	return ret, nil
 }
-
-// GetCurrentUser wraps GetCurrentUserWithContext using the background context.
-func (s *AuthenticationService) GetCurrentUser() (*Session, error) {
-	return s.GetCurrentUserWithContext(context.Background())
-}

vendor/github.com/andygrunwald/go-jira/board.go

@@ -1,15 +1,14 @@
 package jira
 
 import (
-	"context"
 	"fmt"
 	"strconv"
 	"time"
 )
 
-// BoardService handles Agile Boards for the Jira instance / API.
+// BoardService handles Agile Boards for the JIRA instance / API.
 //
-// Jira API docs: https://docs.atlassian.com/jira-software/REST/server/
+// JIRA API docs: https://docs.atlassian.com/jira-software/REST/server/
 type BoardService struct {
 	client *Client
 }
@@ -23,7 +22,7 @@ type BoardsList struct {
 	Values     []Board `json:"values" structs:"values"`
 }
 
-// Board represents a Jira agile board
+// Board represents a JIRA agile board
 type Board struct {
 	ID       int    `json:"id,omitempty" structs:"id,omitempty"`
 	Self     string `json:"self,omitempty" structs:"self,omitempty"`
@@ -63,7 +62,7 @@ type SprintsList struct {
 	Values     []Sprint `json:"values" structs:"values"`
 }
 
-// Sprint represents a sprint on Jira agile board
+// Sprint represents a sprint on JIRA agile board
 type Sprint struct {
 	ID            int        `json:"id" structs:"id"`
 	Name          string     `json:"name" structs:"name"`
@@ -125,16 +124,16 @@ type BoardConfigurationColumnStatus struct {
 	Self string `json:"self"`
 }
 
-// GetAllBoardsWithContext will returns all boards. This only includes boards that the user has permission to view.
+// GetAllBoards will returns all boards. This only includes boards that the user has permission to view.
 //
-// Jira API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-getAllBoards
-func (s *BoardService) GetAllBoardsWithContext(ctx context.Context, opt *BoardListOptions) (*BoardsList, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-getAllBoards
+func (s *BoardService) GetAllBoards(opt *BoardListOptions) (*BoardsList, *Response, error) {
 	apiEndpoint := "rest/agile/1.0/board"
 	url, err := addOptions(apiEndpoint, opt)
 	if err != nil {
 		return nil, nil, err
 	}
-	req, err := s.client.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := s.client.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -149,18 +148,13 @@ func (s *BoardService) GetAllBoardsWithContext(ctx context.Context, opt *BoardLi
 	return boards, resp, err
 }
 
-// GetAllBoards wraps GetAllBoardsWithContext using the background context.
-func (s *BoardService) GetAllBoards(opt *BoardListOptions) (*BoardsList, *Response, error) {
-	return s.GetAllBoardsWithContext(context.Background(), opt)
-}
-
-// GetBoardWithContext will returns the board for the given boardID.
+// GetBoard will returns the board for the given boardID.
 // This board will only be returned if the user has permission to view it.
 //
-// Jira API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-getBoard
-func (s *BoardService) GetBoardWithContext(ctx context.Context, boardID int) (*Board, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-getBoard
+func (s *BoardService) GetBoard(boardID int) (*Board, *Response, error) {
 	apiEndpoint := fmt.Sprintf("rest/agile/1.0/board/%v", boardID)
-	req, err := s.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := s.client.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -175,22 +169,17 @@ func (s *BoardService) GetBoardWithContext(ctx context.Context, boardID int) (*B
 	return board, resp, nil
 }
 
-// GetBoard wraps GetBoardWithContext using the background context.
-func (s *BoardService) GetBoard(boardID int) (*Board, *Response, error) {
-	return s.GetBoardWithContext(context.Background(), boardID)
-}
-
-// CreateBoardWithContext creates a new board. Board name, type and filter Id is required.
+// CreateBoard creates a new board. Board name, type and filter Id is required.
 // name - Must be less than 255 characters.
 // type - Valid values: scrum, kanban
 // filterId - Id of a filter that the user has permissions to view.
 // Note, if the user does not have the 'Create shared objects' permission and tries to create a shared board, a private
 // board will be created instead (remember that board sharing depends on the filter sharing).
 //
-// Jira API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-createBoard
-func (s *BoardService) CreateBoardWithContext(ctx context.Context, board *Board) (*Board, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-createBoard
+func (s *BoardService) CreateBoard(board *Board) (*Board, *Response, error) {
 	apiEndpoint := "rest/agile/1.0/board"
-	req, err := s.client.NewRequestWithContext(ctx, "POST", apiEndpoint, board)
+	req, err := s.client.NewRequest("POST", apiEndpoint, board)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -205,17 +194,12 @@ func (s *BoardService) CreateBoardWithContext(ctx context.Context, board *Board)
 	return responseBoard, resp, nil
 }
 
-// CreateBoard wraps CreateBoardWithContext using the background context.
-func (s *BoardService) CreateBoard(board *Board) (*Board, *Response, error) {
-	return s.CreateBoardWithContext(context.Background(), board)
-}
-
-// DeleteBoardWithContext will delete an agile board.
+// DeleteBoard will delete an agile board.
 //
-// Jira API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-deleteBoard
-func (s *BoardService) DeleteBoardWithContext(ctx context.Context, boardID int) (*Board, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board-deleteBoard
+func (s *BoardService) DeleteBoard(boardID int) (*Board, *Response, error) {
 	apiEndpoint := fmt.Sprintf("rest/agile/1.0/board/%v", boardID)
-	req, err := s.client.NewRequestWithContext(ctx, "DELETE", apiEndpoint, nil)
+	req, err := s.client.NewRequest("DELETE", apiEndpoint, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -227,16 +211,11 @@ func (s *BoardService) DeleteBoardWithContext(ctx context.Context, boardID int)
 	return nil, resp, err
 }
 
-// DeleteBoard wraps DeleteBoardWithContext using the background context.
-func (s *BoardService) DeleteBoard(boardID int) (*Board, *Response, error) {
-	return s.DeleteBoardWithContext(context.Background(), boardID)
-}
-
-// GetAllSprintsWithContext will return all sprints from a board, for a given board Id.
+// GetAllSprints will return all sprints from a board, for a given board Id.
 // This only includes sprints that the user has permission to view.
 //
-// Jira API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board/{boardId}/sprint
-func (s *BoardService) GetAllSprintsWithContext(ctx context.Context, boardID string) ([]Sprint, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board/{boardId}/sprint
+func (s *BoardService) GetAllSprints(boardID string) ([]Sprint, *Response, error) {
 	id, err := strconv.Atoi(boardID)
 	if err != nil {
 		return nil, nil, err
@@ -250,22 +229,17 @@ func (s *BoardService) GetAllSprintsWithContext(ctx context.Context, boardID str
 	return result.Values, response, nil
 }
 
-// GetAllSprints wraps GetAllSprintsWithContext using the background context.
-func (s *BoardService) GetAllSprints(boardID string) ([]Sprint, *Response, error) {
-	return s.GetAllSprintsWithContext(context.Background(), boardID)
-}
-
-// GetAllSprintsWithOptionsWithContext will return sprints from a board, for a given board Id and filtering options
+// GetAllSprintsWithOptions will return sprints from a board, for a given board Id and filtering options
 // This only includes sprints that the user has permission to view.
 //
-// Jira API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board/{boardId}/sprint
-func (s *BoardService) GetAllSprintsWithOptionsWithContext(ctx context.Context, boardID int, options *GetAllSprintsOptions) (*SprintsList, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira-software/REST/cloud/#agile/1.0/board/{boardId}/sprint
+func (s *BoardService) GetAllSprintsWithOptions(boardID int, options *GetAllSprintsOptions) (*SprintsList, *Response, error) {
 	apiEndpoint := fmt.Sprintf("rest/agile/1.0/board/%d/sprint", boardID)
 	url, err := addOptions(apiEndpoint, options)
 	if err != nil {
 		return nil, nil, err
 	}
-	req, err := s.client.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := s.client.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -279,17 +253,12 @@ func (s *BoardService) GetAllSprintsWithOptionsWithContext(ctx context.Context,
 	return result, resp, err
 }
 
-// GetAllSprintsWithOptions wraps GetAllSprintsWithOptionsWithContext using the background context.
-func (s *BoardService) GetAllSprintsWithOptions(boardID int, options *GetAllSprintsOptions) (*SprintsList, *Response, error) {
-	return s.GetAllSprintsWithOptionsWithContext(context.Background(), boardID, options)
-}
-
-// GetBoardConfigurationWithContext will return a board configuration for a given board Id
+// GetBoardConfiguration will return a board configuration for a given board Id
 // Jira API docs:https://developer.atlassian.com/cloud/jira/software/rest/#api-rest-agile-1-0-board-boardId-configuration-get
-func (s *BoardService) GetBoardConfigurationWithContext(ctx context.Context, boardID int) (*BoardConfiguration, *Response, error) {
+func (s *BoardService) GetBoardConfiguration(boardID int) (*BoardConfiguration, *Response, error) {
 	apiEndpoint := fmt.Sprintf("rest/agile/1.0/board/%d/configuration", boardID)
 
-	req, err := s.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := s.client.NewRequest("GET", apiEndpoint, nil)
 
 	if err != nil {
 		return nil, nil, err
@@ -304,8 +273,3 @@ func (s *BoardService) GetBoardConfigurationWithContext(ctx context.Context, boa
 	return result, resp, err
 
 }
-
-// GetBoardConfiguration wraps GetBoardConfigurationWithContext using the background context.
-func (s *BoardService) GetBoardConfiguration(boardID int) (*BoardConfiguration, *Response, error) {
-	return s.GetBoardConfigurationWithContext(context.Background(), boardID)
-}

vendor/github.com/andygrunwald/go-jira/component.go

@@ -1,14 +1,13 @@
 package jira
 
-import "context"
-
-// ComponentService handles components for the Jira instance / API.//
-// Jira API docs: https://docs.atlassian.com/software/jira/docs/api/REST/7.10.1/#api/2/component
+// ComponentService handles components for the JIRA instance / API.
+//
+// JIRA API docs: https://docs.atlassian.com/software/jira/docs/api/REST/7.10.1/#api/2/component
 type ComponentService struct {
 	client *Client
 }
 
-// CreateComponentOptions are passed to the ComponentService.Create function to create a new Jira component
+// CreateComponentOptions are passed to the ComponentService.Create function to create a new JIRA component
 type CreateComponentOptions struct {
 	Name         string `json:"name,omitempty" structs:"name,omitempty"`
 	Description  string `json:"description,omitempty" structs:"description,omitempty"`
@@ -20,10 +19,10 @@ type CreateComponentOptions struct {
 	ProjectID    int    `json:"projectId,omitempty" structs:"projectId,omitempty"`
 }
 
-// CreateWithContext creates a new Jira component based on the given options.
-func (s *ComponentService) CreateWithContext(ctx context.Context, options *CreateComponentOptions) (*ProjectComponent, *Response, error) {
+// Create creates a new JIRA component based on the given options.
+func (s *ComponentService) Create(options *CreateComponentOptions) (*ProjectComponent, *Response, error) {
 	apiEndpoint := "rest/api/2/component"
-	req, err := s.client.NewRequestWithContext(ctx, "POST", apiEndpoint, options)
+	req, err := s.client.NewRequest("POST", apiEndpoint, options)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -37,8 +36,3 @@ func (s *ComponentService) CreateWithContext(ctx context.Context, options *Creat
 
 	return component, resp, nil
 }
-
-// Create wraps CreateWithContext using the background context.
-func (s *ComponentService) Create(options *CreateComponentOptions) (*ProjectComponent, *Response, error) {
-	return s.CreateWithContext(context.Background(), options)
-}

vendor/github.com/andygrunwald/go-jira/error.go

@@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-// Error message from Jira
+// Error message from JIRA
 // See https://docs.atlassian.com/jira/REST/cloud/#error-responses
 type Error struct {
 	HTTPError     error
@@ -34,13 +34,13 @@ func NewJiraError(resp *Response, httpError error) error {
 	if strings.HasPrefix(contentType, "application/json") {
 		err = json.Unmarshal(body, &jerr)
 		if err != nil {
-			httpError = errors.Wrap(errors.New("could not parse JSON"), httpError.Error())
+			httpError = errors.Wrap(errors.New("Could not parse JSON"), httpError.Error())
 			return errors.Wrap(err, httpError.Error())
 		}
 	} else {
-		if httpError == nil {
-			return fmt.Errorf("got response status %s:%s", resp.Status, string(body))
-		}
+        if httpError == nil {
+            return fmt.Errorf("Got Response Status %s:%s", resp.Status, string(body))
+        }
 		return errors.Wrap(httpError, fmt.Sprintf("%s: %s", resp.Status, string(body)))
 	}
 

vendor/github.com/andygrunwald/go-jira/field.go

@@ -1,15 +1,13 @@
 package jira
 
-import "context"
-
-// FieldService handles fields for the Jira instance / API.
+// FieldService handles fields for the JIRA instance / API.
 //
-// Jira API docs: https://developer.atlassian.com/cloud/jira/platform/rest/#api-Field
+// JIRA API docs: https://developer.atlassian.com/cloud/jira/platform/rest/#api-Field
 type FieldService struct {
 	client *Client
 }
 
-// Field represents a field of a Jira issue.
+// Field represents a field of a JIRA issue.
 type Field struct {
 	ID          string      `json:"id,omitempty" structs:"id,omitempty"`
 	Key         string      `json:"key,omitempty" structs:"key,omitempty"`
@@ -21,22 +19,17 @@ type Field struct {
 	Schema      FieldSchema `json:"schema,omitempty" structs:"schema,omitempty"`
 }
 
-// FieldSchema represents a schema of a Jira field.
-// Documentation: https://developer.atlassian.com/cloud/jira/platform/rest/v2/api-group-issue-fields/#api-rest-api-2-field-get
 type FieldSchema struct {
-	Type     string `json:"type,omitempty" structs:"type,omitempty"`
-	Items    string `json:"items,omitempty" structs:"items,omitempty"`
-	Custom   string `json:"custom,omitempty" structs:"custom,omitempty"`
-	System   string `json:"system,omitempty" structs:"system,omitempty"`
-	CustomID int64  `json:"customId,omitempty" structs:"customId,omitempty"`
+	Type   string `json:"type,omitempty" structs:"type,omitempty"`
+	System string `json:"system,omitempty" structs:"system,omitempty"`
 }
 
-// GetListWithContext gets all fields from Jira
+// GetList gets all fields from JIRA
 //
-// Jira API docs: https://developer.atlassian.com/cloud/jira/platform/rest/#api-api-2-field-get
-func (s *FieldService) GetListWithContext(ctx context.Context) ([]Field, *Response, error) {
+// JIRA API docs: https://developer.atlassian.com/cloud/jira/platform/rest/#api-api-2-field-get
+func (s *FieldService) GetList() ([]Field, *Response, error) {
 	apiEndpoint := "rest/api/2/field"
-	req, err := s.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := s.client.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -48,8 +41,3 @@ func (s *FieldService) GetListWithContext(ctx context.Context) ([]Field, *Respon
 	}
 	return fieldList, resp, nil
 }
-
-// GetList wraps GetListWithContext using the background context.
-func (s *FieldService) GetList() ([]Field, *Response, error) {
-	return s.GetListWithContext(context.Background())
-}

vendor/github.com/andygrunwald/go-jira/filter.go

@@ -1,15 +1,11 @@
 package jira
 
-import (
-	"context"
-	"fmt"
+import "github.com/google/go-querystring/query"
+import "fmt"
 
-	"github.com/google/go-querystring/query"
-)
-
-// FilterService handles fields for the Jira instance / API.
+// FilterService handles fields for the JIRA instance / API.
 //
-// Jira API docs: https://developer.atlassian.com/cloud/jira/platform/rest/v3/#api-group-Filter
+// JIRA API docs: https://developer.atlassian.com/cloud/jira/platform/rest/v3/#api-group-Filter
 type FilterService struct {
 	client *Client
 }
@@ -120,21 +116,23 @@ type FilterSearchOptions struct {
 	Expand string `url:"expand,omitempty"`
 }
 
-// GetListWithContext retrieves all filters from Jira
-func (fs *FilterService) GetListWithContext(ctx context.Context) ([]*Filter, *Response, error) {
+// GetList retrieves all filters from Jira
+func (fs *FilterService) GetList() ([]*Filter, *Response, error) {
 
 	options := &GetQueryOptions{}
 	apiEndpoint := "rest/api/2/filter"
-	req, err := fs.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := fs.client.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	q, err := query.Values(options)
-	if err != nil {
-		return nil, nil, err
+	if options != nil {
+		q, err := query.Values(options)
+		if err != nil {
+			return nil, nil, err
+		}
+		req.URL.RawQuery = q.Encode()
 	}
-	req.URL.RawQuery = q.Encode()
 
 	filters := []*Filter{}
 	resp, err := fs.client.Do(req, &filters)
@@ -145,36 +143,26 @@ func (fs *FilterService) GetListWithContext(ctx context.Context) ([]*Filter, *Re
 	return filters, resp, err
 }
 
-// GetList wraps GetListWithContext using the background context.
-func (fs *FilterService) GetList() ([]*Filter, *Response, error) {
-	return fs.GetListWithContext(context.Background())
-}
-
-// GetFavouriteListWithContext retrieves the user's favourited filters from Jira
-func (fs *FilterService) GetFavouriteListWithContext(ctx context.Context) ([]*Filter, *Response, error) {
-	apiEndpoint := "rest/api/2/filter/favourite"
-	req, err := fs.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	filters := []*Filter{}
-	resp, err := fs.client.Do(req, &filters)
-	if err != nil {
-		jerr := NewJiraError(resp, err)
-		return nil, resp, jerr
-	}
-	return filters, resp, err
-}
-
-// GetFavouriteList wraps GetFavouriteListWithContext using the background context.
+// GetFavouriteList retrieves the user's favourited filters from Jira
 func (fs *FilterService) GetFavouriteList() ([]*Filter, *Response, error) {
-	return fs.GetFavouriteListWithContext(context.Background())
+	apiEndpoint := "rest/api/2/filter/favourite"
+	req, err := fs.client.NewRequest("GET", apiEndpoint, nil)
+	if err != nil {
+		return nil, nil, err
+	}
+	filters := []*Filter{}
+	resp, err := fs.client.Do(req, &filters)
+	if err != nil {
+		jerr := NewJiraError(resp, err)
+		return nil, resp, jerr
+	}
+	return filters, resp, err
 }
 
-// GetWithContext retrieves a single Filter from Jira
-func (fs *FilterService) GetWithContext(ctx context.Context, filterID int) (*Filter, *Response, error) {
+// Get retrieves a single Filter from Jira
+func (fs *FilterService) Get(filterID int) (*Filter, *Response, error) {
 	apiEndpoint := fmt.Sprintf("rest/api/2/filter/%d", filterID)
-	req, err := fs.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := fs.client.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -188,21 +176,16 @@ func (fs *FilterService) GetWithContext(ctx context.Context, filterID int) (*Fil
 	return filter, resp, err
 }
 
-// Get wraps GetWithContext using the background context.
-func (fs *FilterService) Get(filterID int) (*Filter, *Response, error) {
-	return fs.GetWithContext(context.Background(), filterID)
-}
-
-// GetMyFiltersWithContext retrieves the my Filters.
+// GetMyFilters retrieves the my Filters.
 //
 // https://developer.atlassian.com/cloud/jira/platform/rest/v3/#api-rest-api-3-filter-my-get
-func (fs *FilterService) GetMyFiltersWithContext(ctx context.Context, opts *GetMyFiltersQueryOptions) ([]*Filter, *Response, error) {
+func (fs *FilterService) GetMyFilters(opts *GetMyFiltersQueryOptions) ([]*Filter, *Response, error) {
 	apiEndpoint := "rest/api/3/filter/my"
 	url, err := addOptions(apiEndpoint, opts)
 	if err != nil {
 		return nil, nil, err
 	}
-	req, err := fs.client.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := fs.client.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -216,21 +199,16 @@ func (fs *FilterService) GetMyFiltersWithContext(ctx context.Context, opts *GetM
 	return filters, resp, nil
 }
 
-// GetMyFilters wraps GetMyFiltersWithContext using the background context.
-func (fs *FilterService) GetMyFilters(opts *GetMyFiltersQueryOptions) ([]*Filter, *Response, error) {
-	return fs.GetMyFiltersWithContext(context.Background(), opts)
-}
-
-// SearchWithContext will search for filter according to the search options
+// Search will search for filter according to the search options
 //
-// Jira API docs: https://developer.atlassian.com/cloud/jira/platform/rest/v3/#api-rest-api-3-filter-search-get
-func (fs *FilterService) SearchWithContext(ctx context.Context, opt *FilterSearchOptions) (*FiltersList, *Response, error) {
+// JIRA API docs: https://developer.atlassian.com/cloud/jira/platform/rest/v3/#api-rest-api-3-filter-search-get
+func (fs *FilterService) Search(opt *FilterSearchOptions) (*FiltersList, *Response, error) {
 	apiEndpoint := "rest/api/3/filter/search"
 	url, err := addOptions(apiEndpoint, opt)
 	if err != nil {
 		return nil, nil, err
 	}
-	req, err := fs.client.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := fs.client.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -244,8 +222,3 @@ func (fs *FilterService) SearchWithContext(ctx context.Context, opt *FilterSearc
 
 	return filters, resp, err
 }
-
-// Search wraps SearchWithContext using the background context.
-func (fs *FilterService) Search(opt *FilterSearchOptions) (*FiltersList, *Response, error) {
-	return fs.SearchWithContext(context.Background(), opt)
-}

vendor/github.com/andygrunwald/go-jira/go.mod

@@ -0,0 +1,13 @@
+module github.com/andygrunwald/go-jira
+
+go 1.12
+
+require (
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/fatih/structs v1.0.0
+	github.com/google/go-cmp v0.3.0
+	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135
+	github.com/pkg/errors v0.8.0
+	github.com/trivago/tgo v1.0.1
+	golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
+)

vendor/github.com/andygrunwald/go-jira/go.sum

@@ -0,0 +1,20 @@
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/fatih/structs v1.0.0 h1:BrX964Rv5uQ3wwS+KRUAJCBBw5PQmgJfJ6v4yly5QwU=
+github.com/fatih/structs v1.0.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
+github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/trivago/tgo v1.0.1 h1:bxatjJIXNIpV18bucU4Uk/LaoxvxuOlp/oowRHyncLQ=
+github.com/trivago/tgo v1.0.1/go.mod h1:w4dpD+3tzNIIiIfkWWa85w5/B77tlvdZckQ+6PkFnhc=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
+golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

vendor/github.com/andygrunwald/go-jira/group.go

@@ -1,14 +1,13 @@
 package jira
 
 import (
-	"context"
 	"fmt"
 	"net/url"
 )
 
-// GroupService handles Groups for the Jira instance / API.
+// GroupService handles Groups for the JIRA instance / API.
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/server/#api/2/group
+// JIRA API docs: https://docs.atlassian.com/jira/REST/server/#api/2/group
 type GroupService struct {
 	client *Client
 }
@@ -22,7 +21,7 @@ type groupMembersResult struct {
 	Members    []GroupMember `json:"values"`
 }
 
-// Group represents a Jira group
+// Group represents a JIRA group
 type Group struct {
 	ID                   string          `json:"id"`
 	Title                string          `json:"title"`
@@ -59,16 +58,16 @@ type GroupSearchOptions struct {
 	IncludeInactiveUsers bool
 }
 
-// GetWithContext returns a paginated list of users who are members of the specified group and its subgroups.
+// Get returns a paginated list of users who are members of the specified group and its subgroups.
 // Users in the page are ordered by user names.
 // User of this resource is required to have sysadmin or admin permissions.
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/server/#api/2/group-getUsersFromGroup
+// JIRA API docs: https://docs.atlassian.com/jira/REST/server/#api/2/group-getUsersFromGroup
 //
 // WARNING: This API only returns the first page of group members
-func (s *GroupService) GetWithContext(ctx context.Context, name string) ([]GroupMember, *Response, error) {
+func (s *GroupService) Get(name string) ([]GroupMember, *Response, error) {
 	apiEndpoint := fmt.Sprintf("/rest/api/2/group/member?groupname=%s", url.QueryEscape(name))
-	req, err := s.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := s.client.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -82,17 +81,12 @@ func (s *GroupService) GetWithContext(ctx context.Context, name string) ([]Group
 	return group.Members, resp, nil
 }
 
-// Get wraps GetWithContext using the background context.
-func (s *GroupService) Get(name string) ([]GroupMember, *Response, error) {
-	return s.GetWithContext(context.Background(), name)
-}
-
-// GetWithOptionsWithContext returns a paginated list of members of the specified group and its subgroups.
+// GetWithOptions returns a paginated list of members of the specified group and its subgroups.
 // Users in the page are ordered by user names.
 // User of this resource is required to have sysadmin or admin permissions.
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/server/#api/2/group-getUsersFromGroup
-func (s *GroupService) GetWithOptionsWithContext(ctx context.Context, name string, options *GroupSearchOptions) ([]GroupMember, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira/REST/server/#api/2/group-getUsersFromGroup
+func (s *GroupService) GetWithOptions(name string, options *GroupSearchOptions) ([]GroupMember, *Response, error) {
 	var apiEndpoint string
 	if options == nil {
 		apiEndpoint = fmt.Sprintf("/rest/api/2/group/member?groupname=%s", url.QueryEscape(name))
@@ -105,7 +99,7 @@ func (s *GroupService) GetWithOptionsWithContext(ctx context.Context, name strin
 			options.IncludeInactiveUsers,
 		)
 	}
-	req, err := s.client.NewRequestWithContext(ctx, "GET", apiEndpoint, nil)
+	req, err := s.client.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -118,21 +112,16 @@ func (s *GroupService) GetWithOptionsWithContext(ctx context.Context, name strin
 	return group.Members, resp, nil
 }
 
-// GetWithOptions wraps GetWithOptionsWithContext using the background context.
-func (s *GroupService) GetWithOptions(name string, options *GroupSearchOptions) ([]GroupMember, *Response, error) {
-	return s.GetWithOptionsWithContext(context.Background(), name, options)
-}
-
-// AddWithContext adds user to group
+// Add adds user to group
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/cloud/#api/2/group-addUserToGroup
-func (s *GroupService) AddWithContext(ctx context.Context, groupname string, username string) (*Group, *Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira/REST/cloud/#api/2/group-addUserToGroup
+func (s *GroupService) Add(groupname string, username string) (*Group, *Response, error) {
 	apiEndpoint := fmt.Sprintf("/rest/api/2/group/user?groupname=%s", groupname)
 	var user struct {
 		Name string `json:"name"`
 	}
 	user.Name = username
-	req, err := s.client.NewRequestWithContext(ctx, "POST", apiEndpoint, &user)
+	req, err := s.client.NewRequest("POST", apiEndpoint, &user)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -147,17 +136,12 @@ func (s *GroupService) AddWithContext(ctx context.Context, groupname string, use
 	return responseGroup, resp, nil
 }
 
-// Add wraps AddWithContext using the background context.
-func (s *GroupService) Add(groupname string, username string) (*Group, *Response, error) {
-	return s.AddWithContext(context.Background(), groupname, username)
-}
-
-// RemoveWithContext removes user from group
+// Remove removes user from group
 //
-// Jira API docs: https://docs.atlassian.com/jira/REST/cloud/#api/2/group-removeUserFromGroup
-func (s *GroupService) RemoveWithContext(ctx context.Context, groupname string, username string) (*Response, error) {
+// JIRA API docs: https://docs.atlassian.com/jira/REST/cloud/#api/2/group-removeUserFromGroup
+func (s *GroupService) Remove(groupname string, username string) (*Response, error) {
 	apiEndpoint := fmt.Sprintf("/rest/api/2/group/user?groupname=%s&username=%s", groupname, username)
-	req, err := s.client.NewRequestWithContext(ctx, "DELETE", apiEndpoint, nil)
+	req, err := s.client.NewRequest("DELETE", apiEndpoint, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -170,8 +154,3 @@ func (s *GroupService) RemoveWithContext(ctx context.Context, groupname string,
 
 	return resp, nil
 }
-
-// Remove wraps RemoveWithContext using the background context.
-func (s *GroupService) Remove(groupname string, username string) (*Response, error) {
-	return s.RemoveWithContext(context.Background(), groupname, username)
-}