Skip to content

Commit

Permalink
Merge pull request #613 from overmindtech/remove-docgen
Browse files Browse the repository at this point in the history
Removed static maps and move to go-native mapping
  • Loading branch information
dylanratcliffe authored Oct 14, 2024
2 parents 9d395f7 + 8301fbf commit 5497b5d
Show file tree
Hide file tree
Showing 11 changed files with 355 additions and 1,921 deletions.
34 changes: 0 additions & 34 deletions .github/actions/go_init/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,6 @@ runs:
check-latest: true
cache: ${{ inputs.cache }}

- name: Checkout
uses: actions/checkout@v4
with:
repository: overmindtech/aws-source
path: ./aws-source

- name: Checkout
uses: actions/checkout@v4
with:
repository: overmindtech/k8s-source
path: ./k8s-source

- name: Move sources in place
shell: bash
run: |
rm -rf ../aws-source
rm -rf ../k8s-source
mv -v aws-source ..
mv -v k8s-source ..
- name: Install Docgen
shell: bash
run: go install github.com/overmindtech/docgen@latest

- name: Go Generate for sources
shell: bash
run: |
cd ../aws-source
go generate ./...
cd -
cd ../k8s-source
go generate ./...
cd -
- name: Go Generate
shell: bash
run: |
Expand Down
133 changes: 0 additions & 133 deletions extractmaps.go

This file was deleted.

33 changes: 31 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ require (
github.com/mitchellh/go-homedir v1.1.0
github.com/muesli/reflow v0.3.0
github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257
github.com/overmindtech/aws-source v0.0.0-20241011124832-50dd83357182
github.com/overmindtech/discovery v0.29.1
github.com/overmindtech/aws-source v0.0.0-20241013114238-805a0284616e
github.com/overmindtech/discovery v0.29.2
github.com/overmindtech/k8s-source v0.8.1-0.20241014091924-29f94c7c602c
github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297
github.com/overmindtech/sdp-go v0.96.0
github.com/overmindtech/stdlib-source v0.0.0-20241011092854-dc393bdb00c3
Expand Down Expand Up @@ -104,28 +105,43 @@ require (
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/gookit/color v1.5.4 // indirect
github.com/gorilla/css v1.0.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/lithammer/fuzzysearch v1.1.8 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/micahhausler/aws-iam-policy v0.4.2 // indirect
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
github.com/miekg/dns v1.1.62 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nats-io/jwt/v2 v2.7.2 // indirect
github.com/nats-io/nats.go v1.37.0 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
Expand All @@ -142,6 +158,7 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
github.com/xiam/to v0.0.0-20200126224905-d60d31e03561 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
Expand All @@ -158,10 +175,22 @@ require (
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.66.1 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.31.1 // indirect
k8s.io/apimachinery v0.31.1 // indirect
k8s.io/client-go v0.31.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 5497b5d

Please sign in to comment.