cleanup

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,14 +11,14 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 **To Reproduce**
-Steps to reproduce the behavior:
+Steps to reproduce the behaviour:
 
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+**Expected behaviour**
 A clear and concise description of what you expected to happen.
 
 **Screenshots**

.github/workflows/codeql-analysis.yml

@@ -1,7 +1,7 @@
-# For most projects, this workflow file will not need changing; you simply need
+# For most projects, this workflow file will not need changing; you need
 # to commit it to your repository.
 #
-# You may wish to alter this file to override the set of languages analyzed,
+# You may wish to alter this file to override the set of languages analysed,
 # or to provide custom queries or build logic.
 #
 # ******** NOTE ********

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-#file: noinspection SpellCheckingInspection,SpellCheckingInspection
+#file: noinspection SpellCheckingInspection, SpellCheckingInspection
 ---
 # yamllint disable rule:line-length
 default_language_version:
@@ -53,16 +53,16 @@ repos:
       - id: go-mod-tidy
       - id: go-generate
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.59.1
+    rev: v1.60.1
     hooks:
       - id: golangci-lint
   - repo: https://github.com/bridgecrewio/checkov
-    rev: 3.2.205
+    rev: 3.2.232
     hooks:
       - id: checkov
         language_version: python3.11
   - repo: https://github.com/jameswoolfenden/ghat
-    rev: v0.1.5
+    rev: v0.1.6
     hooks:
       - id: ghat-go
         name: ghat

.run/test sato parse.run.xml

@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="test sato parse" type="GoApplicationRunConfiguration" factoryName="Go Application">
-    <module name="sato" />
-    <working_directory value="$PROJECT_DIR$" />
-    <parameters value="parse -f $USER_HOME$/test/cf/kinesis.yaml" />
-    <kind value="PACKAGE" />
-    <package value="sato" />
-    <directory value="$PROJECT_DIR$" />
-    <filePath value="$PROJECT_DIR$/main.go" />
-    <method v="2" />
-  </configuration>
+    <configuration default="false" name="test sato parse" type="GoApplicationRunConfiguration"
+                   factoryName="Go Application">
+        <module name="sato"/>
+        <working_directory value="$PROJECT_DIR$"/>
+        <parameters value="parse -f $USER_HOME$/test/cf/kinesis.yaml"/>
+        <kind value="PACKAGE"/>
+        <package value="sato"/>
+        <directory value="$PROJECT_DIR$"/>
+        <filePath value="$PROJECT_DIR$/main.go"/>
+        <method v="2"/>
+    </configuration>
 </component>

CONTRIBUTING.md

@@ -7,7 +7,7 @@ James
 
 ## adding resource support
 
-This is my set-up there are others but this one is mine.
+This is my set-up there are others, but this one is mine.
 
 Set-up IDE/Goland to debug target cfn, this config might help:
 

Makefile

@@ -67,7 +67,7 @@ psbump:
 update:
 	go get -u
 	go mod tidy
-	go vendor
+	go mod vendor
 	pre-commit autoupdate
 
 lint:

README.md

@@ -15,6 +15,7 @@ Converts CloudFormation (and now also ARM) into Terraform. In Go, but quickerly.
 ## Table of Contents
 
 <!--toc:start-->
+
 - [Sato](#sato)
   - [Table of Contents](#table-of-contents)
   - [Install](#install)
@@ -27,7 +28,7 @@ Converts CloudFormation (and now also ARM) into Terraform. In Go, but quickerly.
     - [Parse](#parse)
     - [See](#see)
     - [Version](#version)
-  - [Help](#help)
+    - [Help](#help)
 
 <!--toc:end-->
 
@@ -310,7 +311,7 @@ If you use my other tool, Pike you can now apply that and get the policy require
 
 ## Valid CloudFormation
 
-Ditch it all, OK, OK but some older samples can play fast and lose with the CloudFormation schema and data types.
+Ditch it all, OK, but some older samples can play fast and lose with the CloudFormation schema and data types.
 The Go-formation parser is less accommodating, you may need to be stricter on your typing.
 
 - Booleans are true or false and not "false"

SECURITY.md

@@ -6,4 +6,4 @@ I'm only supporting the latest version, and required changes will be releases AS
 
 ## Reporting a Vulnerability
 
-Contact me James Woolfenden at gmail dot com.
+Contact James Woolfenden at gmail dot com.

examples/arm/microsoft.compute/vm-simple-windows/README.md

@@ -43,6 +43,6 @@ If you're new to Azure virtual machines, see:
 If you're new to template deployment, see:
 
 - [Azure Resource Manager documentation](https://docs.microsoft.com/azure/azure-resource-manager/)
-- [Quickstart: Create a Windows virtual machine using an ARM template](https://docs.microsoft.com/azure/virtual-machines/windows/quick-create-template)
+- [Quickstart: Creates a Windows virtual machine using an ARM template](https://docs.microsoft.com/azure/virtual-machines/windows/quick-create-template)
 
 `Tags: Microsoft.Storage/storageAccounts, Microsoft.Network/publicIPAddresses, Microsoft.Network/networkSecurityGroups, Microsoft.Network/virtualNetworks, Microsoft.Network/networkInterfaces, Microsoft.Compute/virtualMachines`

examples/aws-vpc.template-variables.yaml

@@ -496,18 +496,18 @@ Resources:
           Value: Private subnet 1A
         - !If
           - PrivateSubnetATag1Condition
-          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetATag1  ]  ]
-            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetATag1  ]  ]
+          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetATag1 ] ]
+            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetATag1 ] ]
           - !Ref AWS::NoValue
         - !If
           - PrivateSubnetATag2Condition
-          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetATag2  ]  ]
-            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetATag2  ]  ]
+          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetATag2 ] ]
+            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetATag2 ] ]
           - !Ref AWS::NoValue
         - !If
           - PrivateSubnetATag3Condition
-          - Key: !Select [  0, !Split [  '=', !Ref PrivateSubnetATag3  ]  ]
-            Value: !Select [  1, !Split [  '=', !Ref PrivateSubnetATag3  ]  ]
+          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetATag3 ] ]
+            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetATag3 ] ]
           - !Ref AWS::NoValue
   PrivateSubnet1B:
     Condition: AdditionalPrivateSubnetsCondition
@@ -521,18 +521,18 @@ Resources:
           Value: Private subnet 1B
         - !If
           - PrivateSubnetBTag1Condition
-          - Key: !Select [  0, !Split [  '=', !Ref PrivateSubnetBTag1  ]  ]
-            Value: !Select [  1, !Split [  '=', !Ref PrivateSubnetBTag1  ]  ]
+          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetBTag1 ] ]
+            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetBTag1 ] ]
           - !Ref AWS::NoValue
         - !If
           - PrivateSubnetBTag2Condition
-          - Key: !Select [  0, !Split [  '=', !Ref PrivateSubnetBTag2  ]  ]
-            Value: !Select [  1, !Split [  '=', !Ref PrivateSubnetBTag2  ]  ]
+          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetBTag2 ] ]
+            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetBTag2 ] ]
           - !Ref AWS::NoValue
         - !If
           - PrivateSubnetBTag3Condition
-          - Key: !Select [  0, !Split [  '=', !Ref PrivateSubnetBTag3  ]  ]
-            Value: !Select [  1, !Split [  '=', !Ref PrivateSubnetBTag3  ]  ]
+          - Key: !Select [ 0, !Split [ '=', !Ref PrivateSubnetBTag3 ] ]
+            Value: !Select [ 1, !Split [ '=', !Ref PrivateSubnetBTag3 ] ]
           - !Ref AWS::NoValue
   PrivateSubnet2A:
     Condition: PrivateSubnetsCondition