Migrate dependent goformation module to a local fork

.golangci.yml

@@ -19,31 +19,36 @@ run:
         - release
         - integration
 
-    # which dirs to skip: they won't be analyzed;
-    # can use regexp here: generated.*, regexp is applied on full path;
-    # default value is empty list, but next dirs are always skipped independently
-    # from this option's value:
-    #   	vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-    skip-dirs:
-        - ^vendor$
-        - ^build$
-        - ^pkg\/eks\/mocks$
-
-    # which files to skip: they will be analyzed, but issues from them
-    # won't be reported. Default value is empty list, but there is
-    # no need to include all autogenerated files, we confidently recognize
-    # autogenerated files. If it's not please let us know.
-    skip-files:
-        #  - ".*\\.my\\.go$"
-        #  - lib/bad.go
-        - ^pkg\/nodebootstrap\/assets.go
-        - .*\/export_test.go
-        - ^pkg\/cfn\/builder\/fakes\/fake_cfn_template.go
-
 # output configuration options
 output:
-    # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number"
-    format: tab
+    # The formats used to render issues.
+    # Formats:
+    # - `colored-line-number`
+    # - `line-number`
+    # - `json`
+    # - `colored-tab`
+    # - `tab`
+    # - `html`
+    # - `checkstyle`
+    # - `code-climate`
+    # - `junit-xml`
+    # - `junit-xml-extended`
+    # - `github-actions`
+    # - `teamcity`
+    # - `sarif`
+    # Output path can be either `stdout`, `stderr` or path to the file to write to.
+    #
+    # For the CLI flag (`--out-format`), multiple formats can be specified by separating them by comma.
+    # The output can be specified for each of them by separating format name and path by colon symbol.
+    # Example: "--out-format=checkstyle:report.xml,json:stdout,colored-line-number"
+    # The CLI flag (`--out-format`) override the configuration file.
+    #
+    # Default:
+    #   formats:
+    #     - format: colored-line-number
+    #       path: stdout
+    formats:
+    - format: tab
 
     # print lines of code with issue, default is true
     print-issued-lines: true
@@ -166,6 +171,31 @@ issues:
         - linters: [golint]
           text: "should not use dot imports|don't use an underscore in package name"
 
+    # Which dirs to exclude: issues from them won't be reported.
+    # Can use regexp here: `generated.*`, regexp is applied on full path,
+    # including the path prefix if one is set.
+    # Default dirs are skipped independently of this option's value (see exclude-dirs-use-default).
+    # "/" will be replaced by current OS file path separator to properly work on Windows.
+    # Default: []
+    exclude-dirs:
+        - ^vendor$
+        - ^build$
+        - ^pkg\/eks\/mocks$
+        - ^goformation$
+
+    # Which files to exclude: they will be analyzed, but issues from them won't be reported.
+    # There is no need to include all autogenerated files,
+    # we confidently recognize autogenerated files.
+    # If it's not, please let us know.
+    # "/" will be replaced by current OS file path separator to properly work on Windows.
+    # Default: []
+    exclude-files:
+        #  - ".*\\.my\\.go$"
+        #  - lib/bad.go
+        - ^pkg\/nodebootstrap\/assets.go
+        - .*\/export_test.go
+        - ^pkg\/cfn\/builder\/fakes\/fake_cfn_template.go
+
 linters:
     disable-all: true
     enable:

ATTRIBUTIONS.md

@@ -80,7 +80,6 @@ License version 2.0, we include the full text of the package's License below.
 * `github.com/tj/assert`
 * `github.com/vburenin/ifacemaker`
 * `github.com/vektra/mockery/v2`
-* `github.com/weaveworks/goformation/v4`
 * `github.com/weaveworks/schemer`
 * `github.com/xgfone/netaddr`
 * `golang.org/x/crypto`
@@ -16962,27 +16961,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-### github.com/weaveworks/goformation/v4
-
-Apache License version 2.0
-
-Subdependencies:
-* `github.com/awslabs/goformation/v4`
-* `github.com/imdario/mergo`
-* `github.com/onsi/ginkgo`
-* `github.com/onsi/gomega`
-* `github.com/sanathkr/go-yaml`
-* `github.com/sanathkr/yaml`
-* `github.com/stretchr/testify`
-* `github.com/xeipuuv/gojsonpointer`
-* `github.com/xeipuuv/gojsonreference`
-* `github.com/xeipuuv/gojsonschema`
-
-#### github.com/awslabs/goformation/v4
-
-Apache License version 2.0
-
-
 
 #### github.com/onsi/ginkgo
 

go.mod

@@ -68,9 +68,9 @@ require (
 	github.com/tj/assert v0.0.3
 	github.com/vburenin/ifacemaker v1.2.1
 	github.com/vektra/mockery/v2 v2.38.0
-	github.com/weaveworks/goformation/v4 v4.10.2-0.20241201182214-a53d427b2c56
 	github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848
 	github.com/xgfone/netaddr v0.5.1
+	goformation/v4 v4.0.0
 	golang.org/x/crypto v0.22.0
 	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
 	golang.org/x/oauth2 v0.18.0
@@ -465,3 +465,6 @@ replace (
 
 // Ensure k8s dependencies are also pinned accordingly
 replace github.com/acomagu/bufpipe => github.com/acomagu/bufpipe v1.0.4
+
+// Use a local fork of goformation
+replace goformation/v4 => ./goformation

go.sum

@@ -1813,8 +1813,6 @@ github.com/vektra/mockery/v2 v2.38.0 h1:I0LBuUzZHqAU4d1DknW0DTFBPO6n8TaD38WL2KJf
 github.com/vektra/mockery/v2 v2.38.0/go.mod h1:diB13hxXG6QrTR0ol2Rk8s2dRMftzvExSvPDKr+IYKk=
 github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 h1:txplJASvd6b/hrE0s/Ixfpp2cuwH9IO9oZBAN9iYa4A=
 github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2/go.mod h1:DGCIhurYgnLz8J9ga1fMV/fbLDyUvTyrWXVWUIyJon4=
-github.com/weaveworks/goformation/v4 v4.10.2-0.20241201182214-a53d427b2c56 h1:9iBSXXEXMvH9doiIOETQiV6138915L2XFJD64pJcSKA=
-github.com/weaveworks/goformation/v4 v4.10.2-0.20241201182214-a53d427b2c56/go.mod h1:3c2tyJmoge5qTS4PXS0niVJxR0YzroIBsts3dQI3EdI=
 github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848 h1:I7S+IHZIU49skVgTNArf9bIdy07mCn1Z0zv1r07ROws=
 github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848/go.mod h1:y8Luzq6JDsYVoIV0QAlnvIiq8bSaap0myMjWKyzVFTY=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

goformation/.gitignore

@@ -0,0 +1,4 @@
+.idea
+.vscode
+debug
+debug.test

goformation/AUTHORS.md

@@ -0,0 +1,35 @@
+# Authors
+
+This list is sorted by the number of commits per contributor in _descending_ order.
+
+Avatar|Contributor|Contributions
+:-:|---|:-:
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/4678446?v=4' width='36' height='36' alt='@PaulMaddox'>|[@PaulMaddox](https://github.com/PaulMaddox)|274
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/31303332?v=4' width='36' height='36' alt='@goformation'>|[@goformation](https://github.com/goformation)|40
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/331436?v=4' width='36' height='36' alt='@grahamjenson'>|[@grahamjenson](https://github.com/grahamjenson)|18
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/32174276?v=4' width='36' height='36' alt='@semantic-release-bot'>|[@semantic-release-bot](https://github.com/semantic-release-bot)|15
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/339849?v=4' width='36' height='36' alt='@pesama'>|[@pesama](https://github.com/pesama)|12
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/432692?v=4' width='36' height='36' alt='@parsnips'>|[@parsnips](https://github.com/parsnips)|8
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/484245?v=4' width='36' height='36' alt='@clareliguori'>|[@clareliguori](https://github.com/clareliguori)|7
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/22755571?v=4' width='36' height='36' alt='@sanathkr'>|[@sanathkr](https://github.com/sanathkr)|7
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3868295?v=4' width='36' height='36' alt='@resios'>|[@resios](https://github.com/resios)|7
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/508179?v=4' width='36' height='36' alt='@neoandroid'>|[@neoandroid](https://github.com/neoandroid)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/482239?v=4' width='36' height='36' alt='@stilvoid'>|[@stilvoid](https://github.com/stilvoid)|3
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7834613?v=4' width='36' height='36' alt='@evantorrie'>|[@evantorrie](https://github.com/evantorrie)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/41612521?v=4' width='36' height='36' alt='@aws-goformation'>|[@aws-goformation](https://github.com/aws-goformation)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/142510?v=4' width='36' height='36' alt='@majasb'>|[@majasb](https://github.com/majasb)|2
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/38672686?v=4' width='36' height='36' alt='@sam-goodwin'>|[@sam-goodwin](https://github.com/sam-goodwin)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/857609?v=4' width='36' height='36' alt='@adamchainz'>|[@adamchainz](https://github.com/adamchainz)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/2552323?v=4' width='36' height='36' alt='@billyshambrook'>|[@billyshambrook](https://github.com/billyshambrook)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/983?v=4' width='36' height='36' alt='@statik'>|[@statik](https://github.com/statik)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/801084?v=4' width='36' height='36' alt='@lsuss'>|[@lsuss](https://github.com/lsuss)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/85195?v=4' width='36' height='36' alt='@michaelansel'>|[@michaelansel](https://github.com/michaelansel)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/16217941?v=4' width='36' height='36' alt='@nija-at'>|[@nija-at](https://github.com/nija-at)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/9825?v=4' width='36' height='36' alt='@pedrofaria'>|[@pedrofaria](https://github.com/pedrofaria)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3982807?v=4' width='36' height='36' alt='@rjlohan'>|[@rjlohan](https://github.com/rjlohan)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/35301479?v=4' width='36' height='36' alt='@manuel-trejo-rico'>|[@manuel-trejo-rico](https://github.com/manuel-trejo-rico)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/29075662?v=4' width='36' height='36' alt='@rtim75'>|[@rtim75](https://github.com/rtim75)|1
+
+---
+
+Auto-generated by [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-27.