Skip to content

Commit 1b3c3c8

Browse files
authored
Merge pull request #35 from carolynvs/bump-deps
Update porter to v1.0.9
2 parents c407298 + 3598bcf commit 1b3c3c8

File tree

3 files changed

+206
-254
lines changed

3 files changed

+206
-254
lines changed

cmd/skeletor/main.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ func main() {
1717
run := func() int {
1818
ctx := context.Background()
1919
m := skeletor.New()
20-
if err := m.ConfigureLogging(ctx); err != nil {
20+
ctx, err := m.ConfigureLogging(ctx)
21+
if err != nil {
2122
fmt.Println(err)
2223
os.Exit(cli.ExitCodeErr)
2324
}

go.mod

+60-58
Original file line numberDiff line numberDiff line change
@@ -9,127 +9,129 @@ go 1.19
99
replace github.com/spf13/viper => github.com/getporter/viper v1.7.1-porter.2.0.20210514172839-3ea827168363
1010

1111
require (
12-
get.porter.sh/magefiles v0.3.2
13-
get.porter.sh/porter v1.0.1
12+
get.porter.sh/magefiles v0.5.0
13+
get.porter.sh/porter v1.0.9
1414
github.com/ghodss/yaml v1.0.0
15-
github.com/spf13/cobra v1.5.0
16-
github.com/stretchr/testify v1.7.1
15+
github.com/spf13/cobra v1.6.1
16+
github.com/stretchr/testify v1.8.1
1717
github.com/xeipuuv/gojsonschema v1.2.0
18-
go.opentelemetry.io/otel v1.10.0
18+
go.opentelemetry.io/otel v1.13.0
1919
gopkg.in/yaml.v2 v2.4.0
2020
)
2121

2222
require (
2323
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2424
github.com/Masterminds/semver v1.5.0 // indirect
25-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
25+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2626
github.com/PaesslerAG/gval v1.0.0 // indirect
2727
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
28-
github.com/PuerkitoBio/goquery v1.5.0 // indirect
28+
github.com/PuerkitoBio/goquery v1.8.0 // indirect
2929
github.com/andybalholm/brotli v1.0.1 // indirect
30-
github.com/andybalholm/cascadia v1.0.0 // indirect
30+
github.com/andybalholm/cascadia v1.3.1 // indirect
3131
github.com/beorn7/perks v1.0.1 // indirect
3232
github.com/carolynvs/aferox v0.3.0 // indirect
3333
github.com/carolynvs/magex v0.9.0 // indirect
3434
github.com/cbroglie/mustache v1.4.0 // indirect
35-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
36-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
37-
github.com/cnabio/cnab-go v0.24.0 // indirect
38-
github.com/cnabio/cnab-to-oci v0.3.7 // indirect
39-
github.com/containerd/stargz-snapshotter/estargz v0.11.2 // indirect
40-
github.com/cyberphone/json-canonicalization v0.0.0-20220216171627-b6721b06b4ef // indirect
35+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
36+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
37+
github.com/cnabio/cnab-go v0.25.1 // indirect
38+
github.com/cnabio/cnab-to-oci v0.4.0 // indirect
39+
github.com/containerd/stargz-snapshotter/estargz v0.13.0 // indirect
40+
github.com/cyberphone/json-canonicalization v0.0.0-20220623050100-57a0ce2678a7 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/docker/cli v20.10.17+incompatible // indirect
42+
github.com/docker/cli v23.0.1+incompatible // indirect
4343
github.com/docker/distribution v2.8.1+incompatible // indirect
44-
github.com/docker/docker v20.10.17+incompatible // indirect
45-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
44+
github.com/docker/docker v23.0.1+incompatible // indirect
45+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
4646
github.com/docker/go-connections v0.4.0 // indirect
4747
github.com/docker/go-metrics v0.0.1 // indirect
48-
github.com/docker/go-units v0.4.0 // indirect
48+
github.com/docker/go-units v0.5.0 // indirect
4949
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
50-
github.com/fatih/color v1.9.0 // indirect
50+
github.com/fatih/color v1.13.0 // indirect
5151
github.com/fsnotify/fsnotify v1.4.9 // indirect
5252
github.com/go-logr/logr v1.2.3 // indirect
5353
github.com/go-logr/stdr v1.2.2 // indirect
5454
github.com/goccy/go-yaml v1.8.1 // indirect
5555
github.com/gogo/protobuf v1.3.2 // indirect
5656
github.com/golang/protobuf v1.5.2 // indirect
5757
github.com/golang/snappy v0.0.4-0.20210608040537-544b4180ac70 // indirect
58-
github.com/google/go-containerregistry v0.5.1 // indirect
58+
github.com/google/go-containerregistry v0.13.0 // indirect
5959
github.com/gorilla/mux v1.8.0 // indirect
6060
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
6161
github.com/hashicorp/errwrap v1.1.0 // indirect
62-
github.com/hashicorp/go-hclog v0.14.1 // indirect
62+
github.com/hashicorp/go-hclog v1.4.0 // indirect
6363
github.com/hashicorp/go-multierror v1.1.1 // indirect
6464
github.com/hashicorp/hcl v1.0.0 // indirect
65-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
65+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
6666
github.com/jeremywohl/flatten v1.0.1 // indirect
67-
github.com/klauspost/compress v1.15.1 // indirect
67+
github.com/klauspost/compress v1.15.12 // indirect
6868
github.com/klauspost/pgzip v1.2.5 // indirect
69-
github.com/kr/pretty v0.2.1 // indirect
69+
github.com/kr/pretty v0.3.0 // indirect
7070
github.com/magefile/mage v1.14.0 // indirect
7171
github.com/magiconair/properties v1.8.1 // indirect
72-
github.com/mattn/go-colorable v0.1.7 // indirect
73-
github.com/mattn/go-isatty v0.0.16 // indirect
72+
github.com/mattn/go-colorable v0.1.13 // indirect
73+
github.com/mattn/go-isatty v0.0.17 // indirect
7474
github.com/mattn/go-runewidth v0.0.9 // indirect
75-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
75+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
7676
github.com/mholt/archiver/v3 v3.5.1 // indirect
7777
github.com/mikefarah/yq/v3 v3.0.0-20201020025845-ccb718cd0f59 // indirect
78-
github.com/mitchellh/mapstructure v1.4.2 // indirect
79-
github.com/mmcdole/gofeed v1.0.0-beta2 // indirect
80-
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
81-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
78+
github.com/mitchellh/go-homedir v1.1.0 // indirect
79+
github.com/mitchellh/mapstructure v1.5.0 // indirect
80+
github.com/mmcdole/gofeed v1.2.0 // indirect
81+
github.com/mmcdole/goxpp v0.0.0-20200921145534-2f3784f67354 // indirect
82+
github.com/moby/term v0.0.0-20221120202655-abb19827d345 // indirect
8283
github.com/morikuni/aec v1.0.0 // indirect
8384
github.com/nwaples/rardecode v1.1.0 // indirect
8485
github.com/oklog/ulid v1.3.1 // indirect
85-
github.com/olekukonko/tablewriter v0.0.4 // indirect
86+
github.com/olekukonko/tablewriter v0.0.5 // indirect
8687
github.com/opencontainers/go-digest v1.0.0 // indirect
87-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
88+
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
8889
github.com/osteele/liquid v1.3.0 // indirect
8990
github.com/osteele/tuesday v1.0.3 // indirect
90-
github.com/pelletier/go-toml v1.9.4 // indirect
91+
github.com/pelletier/go-toml v1.9.5 // indirect
9192
github.com/pierrec/lz4/v4 v4.1.2 // indirect
9293
github.com/pkg/errors v0.9.1 // indirect
9394
github.com/pmezard/go-difflib v1.0.0 // indirect
94-
github.com/prometheus/client_golang v1.12.1 // indirect
95-
github.com/prometheus/client_model v0.2.0 // indirect
96-
github.com/prometheus/common v0.32.1 // indirect
97-
github.com/prometheus/procfs v0.7.3 // indirect
95+
github.com/prometheus/client_golang v1.14.0 // indirect
96+
github.com/prometheus/client_model v0.3.0 // indirect
97+
github.com/prometheus/common v0.37.0 // indirect
98+
github.com/prometheus/procfs v0.8.0 // indirect
9899
github.com/qri-io/jsonpointer v0.1.1 // indirect
99100
github.com/qri-io/jsonschema v0.2.2-0.20210831022256-780655b2ba0e // indirect
100-
github.com/sirupsen/logrus v1.8.1 // indirect
101+
github.com/rogpeppe/go-internal v1.8.1 // indirect
102+
github.com/sirupsen/logrus v1.9.0 // indirect
101103
github.com/smartystreets/assertions v1.0.0 // indirect
102-
github.com/spf13/afero v1.9.2 // indirect
104+
github.com/spf13/afero v1.9.3 // indirect
103105
github.com/spf13/cast v1.3.1 // indirect
104106
github.com/spf13/jwalterweatherman v1.1.0 // indirect
105107
github.com/spf13/pflag v1.0.5 // indirect
106-
github.com/spf13/viper v1.10.0 // indirect
108+
github.com/spf13/viper v1.14.0 // indirect
107109
github.com/subosito/gotenv v1.2.0 // indirect
108110
github.com/ulikunitz/xz v0.5.10 // indirect
109111
github.com/vbatts/tar-split v0.11.2 // indirect
110112
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
111113
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
112114
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
113-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
114-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
115-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
116-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.10.0 // indirect
117-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.10.0 // indirect
118-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
119-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
115+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect
116+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 // indirect
117+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 // indirect
118+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.13.0 // indirect
119+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0 // indirect
120+
go.opentelemetry.io/otel/sdk v1.13.0 // indirect
121+
go.opentelemetry.io/otel/trace v1.13.0 // indirect
120122
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
121123
go.uber.org/atomic v1.7.0 // indirect
122124
go.uber.org/multierr v1.6.0 // indirect
123-
go.uber.org/zap v1.17.0 // indirect
124-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
125-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
126-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
127-
golang.org/x/text v0.3.8 // indirect
128-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
129-
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
130-
google.golang.org/grpc v1.50.0 // indirect
131-
google.golang.org/protobuf v1.28.0 // indirect
125+
go.uber.org/zap v1.24.0 // indirect
126+
golang.org/x/net v0.7.0 // indirect
127+
golang.org/x/sync v0.1.0 // indirect
128+
golang.org/x/sys v0.5.0 // indirect
129+
golang.org/x/text v0.7.0 // indirect
130+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
131+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
132+
google.golang.org/grpc v1.53.0 // indirect
133+
google.golang.org/protobuf v1.28.1 // indirect
132134
gopkg.in/ini.v1 v1.56.0 // indirect
133135
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
134-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
136+
gopkg.in/yaml.v3 v3.0.1 // indirect
135137
)

0 commit comments

Comments
 (0)