Skip to content

Commit d0e5360

Browse files
bryantbiggsbryantbiggs
authored
Migrate goformation under pkg/ as a local package and remove location re-write (eksctl-io#8153)
* Migrate `goformation` under `pkg/` as a local package and remove location re-write * chore: Fix linkchecker and go version used in CI * fix: Update lint ignore path for `goformation`
1 parent ccdd44c commit d0e5360

File tree

4,000 files changed

+7823
-8005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,000 files changed

+7823
-8005
lines changed

‎.github/workflows/link-checker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Go
2222
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a #v5.2.0
2323
with:
24-
go-version: 1.21.x
24+
go-version: 1.22.x
2525
cache: false
2626

2727
- name: Install doc dependencies
@@ -33,4 +33,4 @@ jobs:
3333
- name: Link Checker
3434
uses: lycheeverse/lychee-action@f796c8b7d468feb9b8c0a46da3fac0af6874d374 #v2.2.0
3535
with:
36-
args: --exclude-all-private --exclude-mail --exclude-file .github/workflows/exclude-file.txt --exclude-path goformation --verbose --no-progress './**/*.md' './**/*.html'
36+
args: --exclude-all-private --exclude-mail --exclude-file .github/workflows/exclude-file.txt --exclude-path pkg/goformation --verbose --no-progress './**/*.md' './**/*.html'

‎.golangci.yml

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,7 @@ run:
1919
- release
2020
- integration
2121

22-
# output configuration options
2322
output:
24-
# The formats used to render issues.
25-
# Formats:
26-
# - `colored-line-number`
27-
# - `line-number`
28-
# - `json`
29-
# - `colored-tab`
30-
# - `tab`
31-
# - `html`
32-
# - `checkstyle`
33-
# - `code-climate`
34-
# - `junit-xml`
35-
# - `junit-xml-extended`
36-
# - `github-actions`
37-
# - `teamcity`
38-
# - `sarif`
39-
# Output path can be either `stdout`, `stderr` or path to the file to write to.
40-
#
41-
# For the CLI flag (`--out-format`), multiple formats can be specified by separating them by comma.
42-
# The output can be specified for each of them by separating format name and path by colon symbol.
43-
# Example: "--out-format=checkstyle:report.xml,json:stdout,colored-line-number"
44-
# The CLI flag (`--out-format`) override the configuration file.
45-
#
46-
# Default:
47-
# formats:
48-
# - format: colored-line-number
49-
# path: stdout
5023
formats:
5124
- format: tab
5225

@@ -181,7 +154,7 @@ issues:
181154
- ^vendor$
182155
- ^build$
183156
- ^pkg\/eks\/mocks$
184-
- ^goformation$
157+
- ^pkg\/goformation*
185158

186159
# Which files to exclude: they will be analyzed, but issues from them won't be reported.
187160
# There is no need to include all autogenerated files,

‎go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ require (
3030
github.com/aws/aws-sdk-go-v2/service/sts v1.33.5
3131
github.com/aws/smithy-go v1.22.1
3232
github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20240508073157-fbfa1bc129f5
33-
github.com/awslabs/goformation/v4 v4.15.5
3433
github.com/benjamintf1/unmarshalledmatchers v1.0.0
3534
github.com/blang/semver v3.5.1+incompatible
3635
github.com/bxcodec/faker v2.0.1+incompatible
@@ -53,12 +52,15 @@ require (
5352
github.com/kubicorn/kubicorn v0.0.0-20180829191017-06f6bce92acc
5453
github.com/lithammer/dedent v1.1.0
5554
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
55+
github.com/onsi/ginkgo v1.16.4
5656
github.com/onsi/ginkgo/v2 v2.17.1
5757
github.com/onsi/gomega v1.31.1
5858
github.com/orcaman/concurrent-map v1.0.0
5959
github.com/otiai10/copy v1.14.0
6060
github.com/pelletier/go-toml v1.9.5
6161
github.com/pkg/errors v0.9.1
62+
github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b
63+
github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522
6264
github.com/sethvargo/go-password v0.2.0
6365
github.com/spf13/afero v1.11.0
6466
github.com/spf13/cobra v1.8.0
@@ -70,6 +72,7 @@ require (
7072
github.com/vburenin/ifacemaker v1.2.1
7173
github.com/vektra/mockery/v2 v2.38.0
7274
github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848
75+
github.com/xeipuuv/gojsonschema v1.2.0
7376
github.com/xgfone/netaddr v0.5.1
7477
golang.org/x/crypto v0.32.0
7578
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
@@ -308,6 +311,7 @@ require (
308311
github.com/nishanths/exhaustive v0.12.0 // indirect
309312
github.com/nishanths/predeclared v0.2.2 // indirect
310313
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
314+
github.com/nxadm/tail v1.4.8 // indirect
311315
github.com/olekukonko/tablewriter v0.0.5 // indirect
312316
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
313317
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -335,8 +339,6 @@ require (
335339
github.com/sagikazarmark/locafero v0.3.0 // indirect
336340
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
337341
github.com/sahilm/fuzzy v0.1.0 // indirect
338-
github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b // indirect
339-
github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 // indirect
340342
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
341343
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
342344
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
@@ -375,7 +377,6 @@ require (
375377
github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
376378
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
377379
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
378-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
379380
github.com/xen0n/gosmopolitan v1.2.2 // indirect
380381
github.com/xlab/treeprint v1.2.0 // indirect
381382
github.com/yagipy/maintidx v1.0.0 // indirect
@@ -408,6 +409,7 @@ require (
408409
gopkg.in/gcfg.v1 v1.2.3 // indirect
409410
gopkg.in/inf.v0 v0.9.1 // indirect
410411
gopkg.in/ini.v1 v1.67.0 // indirect
412+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
411413
gopkg.in/warnings.v0 v0.1.2 // indirect
412414
gopkg.in/yaml.v3 v3.0.1 // indirect
413415
honnef.co/go/tools v0.4.7 // indirect
@@ -464,6 +466,3 @@ replace (
464466

465467
// Ensure k8s dependencies are also pinned accordingly
466468
replace github.com/acomagu/bufpipe => github.com/acomagu/bufpipe v1.0.4
467-
468-
// Use a local fork of goformation
469-
replace github.com/awslabs/goformation/v4 => ./goformation

‎go.sum

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -734,40 +734,24 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 h1:1mOW9zAUMhTSrMDssE
734734
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28/go.mod h1:kGlXVIWDfvt2Ox5zEaNglmq0hXPHgQFNMix33Tw22jA=
735735
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
736736
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
737-
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.6 h1:LGJBolNFEECBP7545NfeNIr6LxCIgYDli4n8vCs/eFI=
738-
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.6/go.mod h1:Zgti4LZawMEhtIBBwY1YijZJncgUOmeZoTO05uP9tIw=
739737
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.7 h1:LDQ3goASec/ylee0tYuHLnvaXej3TkEpGRpRxwSwXhc=
740738
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.7/go.mod h1:Zgti4LZawMEhtIBBwY1YijZJncgUOmeZoTO05uP9tIw=
741-
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.6 h1:YUShdqZUnWDyqygH57oW53E2qFDD+o/AW8nb8QZhBpk=
742-
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.6/go.mod h1:pBGwFeRfyDeLx29/IM6a2SLWpJsyhHARi+WIgXRe3uo=
743739
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.7 h1:TSZ9VocRtgrtZyaAM9BDoCpM/4mbm5BDC7QPXnNQTy8=
744740
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.7/go.mod h1:pBGwFeRfyDeLx29/IM6a2SLWpJsyhHARi+WIgXRe3uo=
745-
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.8 h1:RRK9pbImmTqX1y1d33Jtrw1n2R3B2e3o1LtfUG5QXI8=
746-
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.8/go.mod h1:a94+UYpsBLThABCmb23CFqY8FglQzUgMNIfOJHn/seo=
747741
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.9 h1:5Gf6dTLBxEQ3fDIXDNaKwrJNJX3eS/Aq/umADz5q+w0=
748742
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.46.9/go.mod h1:a94+UYpsBLThABCmb23CFqY8FglQzUgMNIfOJHn/seo=
749-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.5 h1:slYEzDnAoEsSIX7XN6tkXkGsEUbpY6J0K/aAfv/qKdc=
750-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.5/go.mod h1:zZeYjS1D+qvIOiDrCT89Rrm6vSn4m8DNhi0kb3wwzYM=
751743
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.6 h1:2oLCi90fh8JYysC+7mk7g6Zlg/lDvB5wNMC2mGbrhiA=
752744
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.6/go.mod h1:zZeYjS1D+qvIOiDrCT89Rrm6vSn4m8DNhi0kb3wwzYM=
753745
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.48.4 h1:78+PSLTY1QcbesyoPKAnYRG+jFhcuZr17pGAQVxDTWw=
754746
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.48.4/go.mod h1:vPpQlrSaeqEX2s/iM5eqaSFUxVtBrpZFP9SOd25AZuY=
755747
github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0 h1:FDZVMxzXB13cRmHs3t3tH9gme8GhvmjsQXeXFI37OHU=
756748
github.com/aws/aws-sdk-go-v2/service/ec2 v1.166.0/go.mod h1:Wv7N3iFOKVsZNIaw9MOBUmwCkX6VMmQQRFhMrHtNGno=
757-
github.com/aws/aws-sdk-go-v2/service/eks v1.56.4 h1:dYl8n3WbUEBKLGFCoqukvnJcFNXb3VSUL5iTMtPmsV8=
758-
github.com/aws/aws-sdk-go-v2/service/eks v1.56.4/go.mod h1:6gWwo7rT4qfYVHwJnj0nUM4DP+XuURcTO+89H8dCvrM=
759749
github.com/aws/aws-sdk-go-v2/service/eks v1.56.5 h1:AoVtICtIPSSgRJzNhT5A6IAP9kNbah2jJu1MAnBkHtM=
760750
github.com/aws/aws-sdk-go-v2/service/eks v1.56.5/go.mod h1:6gWwo7rT4qfYVHwJnj0nUM4DP+XuURcTO+89H8dCvrM=
761-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.11 h1:vgp7a4NxxLZcT2lASEielbgqcEWVnwoyFvYgWmXI1B0=
762-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.11/go.mod h1:c7uVynXvirEGGCp4ITMF2JvPH7J3v2zomTvOoEdsPLg=
763751
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.12 h1:wwN9089a0gBqBa3DZUuN3zkPXRH+AolDeXSVACmHf1E=
764752
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.12/go.mod h1:c7uVynXvirEGGCp4ITMF2JvPH7J3v2zomTvOoEdsPLg=
765-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.6 h1:1vXGKSmuXZvfiYoVXK/9oYB9Xyw1ic9p59dbRRgGzVM=
766-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.6/go.mod h1:6QynTIHgeX3wwdpwlDhCovlJTwJ3Mb+Km2kVOCh26BA=
767753
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.7 h1:5zMWovjTaEb1efvvFfoRkftUWA+xfEdognn/JZC1/Hg=
768754
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.7/go.mod h1:6QynTIHgeX3wwdpwlDhCovlJTwJ3Mb+Km2kVOCh26BA=
769-
github.com/aws/aws-sdk-go-v2/service/iam v1.38.6 h1:AXwKkfCZEqUr1QuNb0UN44CIg5YN4jqfYwUpkv+dsSk=
770-
github.com/aws/aws-sdk-go-v2/service/iam v1.38.6/go.mod h1:dgsc0h/uKL5OjfHSZz6z7WhkX83BbRQ2ZxYoWYg5LbA=
771755
github.com/aws/aws-sdk-go-v2/service/iam v1.38.7 h1:MLW6hgPcmbg73uoSFPXBcVhn/E6bW1CpSBmZJoLeF4E=
772756
github.com/aws/aws-sdk-go-v2/service/iam v1.38.7/go.mod h1:dgsc0h/uKL5OjfHSZz6z7WhkX83BbRQ2ZxYoWYg5LbA=
773757
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
@@ -776,14 +760,10 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefS
776760
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8/go.mod h1:tPD+VjU3ABTBoEJ3nctu5Nyg4P4yjqSH5bJGGkY4+XE=
777761
github.com/aws/aws-sdk-go-v2/service/kms v1.27.5 h1:7lKTr8zJ2nVaVgyII+7hUayTi7xWedMuANiNVXiD2S8=
778762
github.com/aws/aws-sdk-go-v2/service/kms v1.27.5/go.mod h1:D9FVDkZjkZnnFHymJ3fPVz0zOUlNSd0xcIIVmmrAac8=
779-
github.com/aws/aws-sdk-go-v2/service/outposts v1.48.2 h1:ZB/pxaacdQNXlYSMEi8M89IZ5Uy2d49NBKJgN+ubuH8=
780-
github.com/aws/aws-sdk-go-v2/service/outposts v1.48.2/go.mod h1:zd3BLQ8bJ3q0Hfvq6lfPQ7ZgbJi/jMDKTHuognrvl4Q=
781763
github.com/aws/aws-sdk-go-v2/service/outposts v1.48.3 h1:6fT4sNBD7VeLUwCVjitfBfzTTeUkjxGP+SOmU7va0/w=
782764
github.com/aws/aws-sdk-go-v2/service/outposts v1.48.3/go.mod h1:zd3BLQ8bJ3q0Hfvq6lfPQ7ZgbJi/jMDKTHuognrvl4Q=
783765
github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0 h1:RQOMvPwte2H4ZqsiZmrla1crhBWDFnW8bZynkec5cGU=
784766
github.com/aws/aws-sdk-go-v2/service/pricing v1.17.0/go.mod h1:LJyh9figH3ZpSiVjR5umzbl6V3EpQdZR4Se1ayoUtfI=
785-
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.6 h1:MVtHLOXm24FJxqyXg4Jq9Ca/tBIK/pHuCkpGHvhOyVA=
786-
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.6/go.mod h1:8HjMkoX1B6HEsxGMPLu6hnx3135hwxpi6eI9aErNTAg=
787767
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.7 h1:vv7lah/6QrqHry4gcYPCcy7ByAmBAtGNjPfTf4HTH/s=
788768
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.7/go.mod h1:8HjMkoX1B6HEsxGMPLu6hnx3135hwxpi6eI9aErNTAg=
789769
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=

‎goformation/go.mod

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)