Updated CHANGELOG and other versions to 0.1.7

threatcl · Feb 29, 2024 · 3b9bb04 · 3b9bb04
1 parent 474a2f3
commit 3b9bb04
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.1.7
+### Feb 29, 2024
+
+CHANGES:
+
+* Updating to Go 1.20
+* Added `export` sub-command
+* Added OTM support to the `export` sub-command
+* Support for remote file inclusion with `go-getter`
+
 ## 0.1.6
 ### Mar 21, 2023
 

diff --git a/cmd/hcltm/testdata/tm1.hcl b/cmd/hcltm/testdata/tm1.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
  threatmodel "tm1 one" {
    description = <<EOT

diff --git a/cmd/hcltm/testdata/tm1.json b/cmd/hcltm/testdata/tm1.json
@@ -1,5 +1,5 @@
 {
-  "spec_version": "0.1.6",
+  "spec_version": "0.1.7",
 
   "threatmodel": {
     "Tower of London": {

diff --git a/cmd/hcltm/testdata/tm2.hcl b/cmd/hcltm/testdata/tm2.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
  threatmodel "tm2 one" {
    description = "This is some arbitrary text"

diff --git a/cmd/hcltm/testdata/tm3.hcl b/cmd/hcltm/testdata/tm3.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
  threatmodel "tm2 one" {
    description = "This is some arbitrary text"

diff --git a/cmd/hcltm/testdata/tm4.hcl b/cmd/hcltm/testdata/tm4.hcl
@@ -1,2 +1,2 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
diff --git a/cmd/hcltm/testdata/tm5.hcl b/cmd/hcltm/testdata/tm5.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
  threatmodel "tm2 one" {
    description = "This is some arbitrary text"

diff --git a/examples/MITRE_ATTACK_controls.hcl b/examples/MITRE_ATTACK_controls.hcl
@@ -1,6 +1,6 @@
 //controls listed for MITRE ATT&CK
 
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 component "control" "Account_Use_Policies" {
   description = "[M1036](https://attack.mitre.org/mitigations/M1036/) - Configure features related to account use like login attempt lockouts, specific login times, etc."

diff --git a/examples/aws-security-checklist.hcl b/examples/aws-security-checklist.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 // These are from https://d1.awsstatic.com/whitepapers/Security/AWS_Security_Checklist.pdf
 

diff --git a/examples/control-library/othercontrols.hcl b/examples/control-library/othercontrols.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 component "control" "control_name" {
   description = "SOMETHING HUGELY IMPORTANT HERE IN ANOTHER FOLDER"
 }

diff --git a/examples/including-example/corp-app-remote.hcl b/examples/including-example/corp-app-remote.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
   author = "@xntrik"

diff --git a/examples/including-example/corp-app.hcl b/examples/including-example/corp-app.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
 

diff --git a/examples/including-example/shared/tower.hcl b/examples/including-example/shared/tower.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/examples/owasp-proactive-controls.hcl b/examples/owasp-proactive-controls.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 // These are from https://github.com/OWASP/www-project-proactive-controls/tree/7622bebed900a6a5d7b7b9b01fb3fe2b0e695545/v3/en
 

diff --git a/examples/tm1.hcl b/examples/tm1.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/examples/tm1.json b/examples/tm1.json
@@ -1,5 +1,5 @@
 {
-  "spec_version": "0.1.6",
+  "spec_version": "0.1.7",
 
   "threatmodel": {
     "Tower of London": {

diff --git a/examples/tm2.hcl b/examples/tm2.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
  threatmodel "Modelly model" {
    imports = ["control-library/othercontrols.hcl"]

diff --git a/examples/tm2.json b/examples/tm2.json
@@ -1,5 +1,5 @@
 {
-  "spec_version": "0.1.6",
+  "spec_version": "0.1.7",
 
  "threatmodel": {
    "Modelly model": {

diff --git a/examples/tm3.hcl b/examples/tm3.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
  threatmodel "Modelly model" {
    imports = ["https://raw.githubusercontent.com/xntrik/hcltm/main/examples/aws-security-checklist.hcl", "https://raw.githubusercontent.com/xntrik/hcltm/main/examples/owasp-proactive-controls.hcl"]

diff --git a/examples/tm4.hcl b/examples/tm4.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Sumpidy" {
   author = "@xntrik"

diff --git a/pkg/spec/testdata/including/corp-app-remote.hcl b/pkg/spec/testdata/including/corp-app-remote.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
   author = "@xntrik"

diff --git a/pkg/spec/testdata/including/corp-app-remote2.hcl b/pkg/spec/testdata/including/corp-app-remote2.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
   author = "@xntrik"

diff --git a/pkg/spec/testdata/including/corp-app.hcl b/pkg/spec/testdata/including/corp-app.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
 

diff --git a/pkg/spec/testdata/including/corp-app2.hcl b/pkg/spec/testdata/including/corp-app2.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
 

diff --git a/pkg/spec/testdata/including/shared/tower.hcl b/pkg/spec/testdata/including/shared/tower.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/pkg/spec/testdata/including/shared/tower2.hcl b/pkg/spec/testdata/including/shared/tower2.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/pkg/spec/testdata/tm-constraint-multidfd.hcl b/pkg/spec/testdata/tm-constraint-multidfd.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.6"
+ spec_version = "0.1.7"
 
  threatmodel "tm1 one" {
    description = <<EOT

diff --git a/spec.hcl b/spec.hcl
@@ -1,5 +1,5 @@
 // To cater for multiple spec versions we specify this in our HCL files
-spec_version = "0.1.6"
+spec_version = "0.1.7"
 
 // You can include variables outside your threatmodel blocks
 
@@ -205,7 +205,7 @@ threatmodel "threatmodel name" {
 
   // An example of what may be in controls.hcl:
   //
-  // spec_version = "0.1.6"
+  // spec_version = "0.1.7"
   // component "control" "control_name" {
   //   description = "A control that can be used in multiple places"
   // }

diff --git a/version/version.go b/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const (
-	Version string = "0.1.6"
+	Version string = "0.1.7"
 )
 
 func GetVersion() string {